updated Uzbek files; checked various po files against latest *.pot

7 files changed, 61949 insertions, 42258 deletions

diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index 98b3ae68f..642e51463 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -1,16 +1,17 @@
 # translation of DrakX-fr.po to Français
 # translation of DrakX-fr.po to french
-# Translation file of Mandrake graphic install
+# Translation file of Mandrakelinux graphic install
 # Copyright (C) 1999 Mandrakesoft
-# David BAUDENS <baudens@mandrakesoft.com>, 1999-2004
-# David ODIN <odin@mandrakesoft.com>, 2000
-# Pablo Saratxaga <pablo@mandrakesoft.com>, 2001
-# KAtiOS <katios@nolabel.net>, 2001
-# Guillaume Cottenceau <gc@mandrakesoft.com>, 2001-2002
-# Thierry Vignaud <tvignaud@mandrakesoft.com>, 2001-2003
-# Christophe Combelles <ccomb@free.fr>, 2002,2003
+# David BAUDENS <baudens@mandrakesoft.com>, 1999-2004.
+# David ODIN <odin@mandrakesoft.com>, 2000.
+# Pablo Saratxaga <pablo@mandrakesoft.com>, 2001.
+# KAtiOS <katios@nolabel.net>, 2001.
+# Guillaume Cottenceau <gc@mandrakesoft.com>, 2001-2002.
+# Thierry Vignaud <tvignaud@mandrakesoft.com>, 2001-2004.
+# Christophe Combelles <ccomb@free.fr>, 2002,2003.
 # Stéphane T <steletch@steletch.org>
-# Adrien REZER <monsieurdidi@free.fr>, 2003
+# Adrien REZER <monsieurdidi@free.fr>, 2003.
+# RICHARD Nicolas <richardnicolas22@yahoo.fr>, 2004.
 #
 # Veuillez ne pas mettre à jour ce fichier à moins d'être
 # certain tant de vos traductions que de votre grammaire et
@@ -42,8 +43,8 @@
 # insécable est le caractère 0xA0. Sous Emacs en utilisant le po mode
 # livré avec gettext >= 0.10.40-4mdk vous pouvez voir celui-ci avec un
 # fond de couleur spécial. Sous Vi celui-ci est normalement affiché
-# précédé du caractère pipe "|". Pour le tapper sous la plupart des
-# éditeurs, vous pouvez utiliser la touche "Compose" puis en tappant
+# précédé du caractère pipe "|". Pour le taper sous la plupart des
+# éditeurs, vous pouvez utiliser la touche "Compose" puis en tapant
 # deux espaces. Si vous n'avez pas de touche compose, vous pouvez
 # donner cette fonction à la touche "Windows" droite de votre clavier
 # avec la commande suivante :
@@ -51,7 +52,7 @@
 #
 # Les guillemets françaises sont « et » et non ". La guillemet ouvrante
 # « est suivie d'un espace insécable et la guillemet fermante » est
-# précédée du même type d'espace. Pour le tapper, vous pouvez utiliser
+# précédée du même type d'espace. Pour le taper, vous pouvez utiliser
 # la combinaison Compose < <, et Compose > > (ou alt-z et alt-x).
 #
 # Enfin, traduisez INTELLIGEMMENT et non mot à mot. Certaines traductions
@@ -65,16 +66,86 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fr\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-21 09:28+0200\n"
-"Last-Translator: David Baudens <baudens@mandrakesoft.com>\n"
-"Language-Team: Français <fr@li.org>\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-09-22 18:38+0200\n"
+"Last-Translator: RICHARD Nicolas <richardnicolas22@yahoo.fr>\n"
+"Language-Team: Français\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Quelle clé USB souhaitez-vous formater ?"
+
+#: ../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 ""
+"La clé USB « %s » va être formatée. Cela entrainera la dispartition de "
+"toutes les données qui y sont stockées.\n"
+"Veuillez vérifier que le périphérique sélectionné est bien la clé USB que "
+"vous désirez formater.\n"
+"Nous vous conseillons de débrancher les autres périphériques de stockage USB "
+"pendant cette opération."
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "La clé n'est pas accessible en écriture"
+
+#: ../move/move.pm:450
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+"La clé USB semble être protégée en écriture. Veuillez la\n"
+"déconnecter, enlever la protection en écriture, puis la\n"
+"connecter à nouveau."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Réessayer"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Continuer sans clé USB"
+
+#: ../move/move.pm:462
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"La clé USB semble être protégée en écriture, mais nous\n"
+"ne pouvons pas la déconnecter de manière sûre maintenant.\n"
+"\n"
+"\n"
+"Cliquez le bouton pour redémarrer l'ordinateur,\n"
+"déconnectez la clé, enlevez la protection en écriture,\n"
+"connectez la clé à nouveau, et relancez Mandrake Move."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Redémarrage"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -98,9 +169,9 @@ msgstr ""
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
 "toujours utiliser Mandrake Move comme un système\n"
-"d'exploitation Mandrake sur CDROM."
+"d'exploitation Mandrakelinux sur CDROM."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -127,153 +198,105 @@ msgstr ""
 "\n"
 "Vous pouvez aussi continuer sans clé USB - vous pourrez\n"
 "toujours utiliser Mandrake Move comme un système\n"
-"d'exploitation Mandrake sur CDROM."
+"d'exploitation Mandrakelinux sur CDROM."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "Il faut une clé pour sauvegarder vos données"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Détecter à nouveau la clé USB"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Continuer sans clé USB"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "La clé n'est pas accessible en écriture"
-
-#: ../move/move.pm:439
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
-msgstr ""
-"La clé USB semble être protégée en écriture, mais nous\n"
-"ne pouvons pas la déconnecter de manière sûre maintenant.\n"
-"\n"
-"\n"
-"Cliquez le bouton pour redémarrer l'ordinateur,\n"
-"déconnectez la clé, enlevez la protection en écriture,\n"
-"connectez la clé à nouveau, et relancez Mandrake Move."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Redémarrage"
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"La clé USB semble être protégée en écriture. Veuillez la\n"
-"déconnecter, enlever la protection en écriture, puis la\n"
-"connecter à nouveau."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Réessayer"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "Installation de la clé USB"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr ""
 "Veuillez patienter, installation des fichiers de configuration système sur "
 "la clé USB..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 "Entrez vos informations utilisateurs, le mot de passe sera utilisé pour "
 "l'économiseur d'écran"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Configuration automatique"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Veuillez patienter, détection et configuration des périphériques..."
 
-#: ../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 "Erreur"
 
-#: ../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"
@@ -282,12 +305,12 @@ msgstr ""
 "Une erreur est survenue et semble difficile à résoudre correctement.\n"
 "Vous pouvez continuer, mais à vos risques et périls."
 
-#: ../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 "Une erreur est survenue"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -323,32 +346,39 @@ msgstr ""
 "les consoles #3 et #4 pour essayer de deviner ce qui s'est\n"
 "passé."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Supprimer les fichiers de config."
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Seulement redémarrer"
 
-#: ../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 "Vous ne pouvez continuer que sans support de CDROM"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Fermer ces programmes"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Pas de support du 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 "MISE EN GARDE !"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -408,22 +438,22 @@ msgstr "32 Mo"
 msgid "64 MB or more"
 msgstr "64 Mo ou plus"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
-msgstr "serveur XFree"
+msgstr "serveur Xorg"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
-msgstr "Choisissez un serveur d'affichage (serveur XFree)"
+msgstr "Choisissez un serveur d'affichage (serveur Xorg)"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuration multi-écrans"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -432,84 +462,84 @@ msgstr ""
 "Votre système peut utiliser simultanément plusieurs écrans.\n"
 "Que souhaitez-vous faire ?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Impossible d'installer le paquetage XFree : %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Impossible d'installer le paquetage Xorg : %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr ""
 "Veuillez préciser la quantité de mémoire vidéo de votre carte graphique"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Configuration d'XFree"
+msgid "Xorg configuration"
+msgstr "Configuration d'Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Quelle configuration d'XFree désirez-vous utiliser ?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Quelle configuration d'Xorg désirez-vous utiliser ?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurer les écrans séparément"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Répartir l'affichage sur plusieurs écrans (Xinerama)"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurer seulement la carte « %s » %s"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s avec accélération 3D matérielle"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s avec accélération 3D matérielle"
 
-#: 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 ""
-"Votre carte vidéo peut utiliser l'accélération 3D matérielle avec XFree %s."
+"Votre carte vidéo peut utiliser l'accélération 3D matérielle avec Xorg %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s avec support EXPÉRIMENTAL de l'accélération 3D matérielle"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s avec support EXPÉRIMENTAL de l'accélération 3D matérielle"
 
-#: 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 ""
 "Votre carte vidéo peut utiliser l'accélération 3D matérielle en utilisant\n"
-"XFree %s.\n"
+"Xorg %s.\n"
 "Veuillez noter que ce support est EXPÉRIMENTAL et qu'il peut BLOQUER VOTRE\n"
 "ORDINATEUR."
 
-#: 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 "Personnalisé"
 
-#: 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 "Quitter"
@@ -519,12 +549,12 @@ msgstr "Quitter"
 msgid "Graphic Card"
 msgstr "Carte graphique"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Moniteur"
 
-#: 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 "Résolution"
@@ -534,14 +564,19 @@ msgstr "Résolution"
 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 "Options"
 
-#: 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"
@@ -554,38 +589,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Choisissez un moniteur pour l'écran n°%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Choisissez un moniteur"
 
-#: 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 "Générique"
 
-#: 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 "Vendeur"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Échec de l'interrogation « Plug'n Play ». Veuillez choisir un moniteur"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -610,12 +645,12 @@ msgstr ""
 "En cas de doute, choisissez un réglage moins performant mais\n"
 "sans risque pour votre matériel."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Fréquence horizontale"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Fréquence verticale"
@@ -640,58 +675,60 @@ msgstr "65 mille couleurs (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millions de couleurs (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Résolutions"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Choix de la résolution et du nombre de couleurs"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Carte graphique : %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: 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 "Aide"
@@ -784,8 +821,8 @@ msgstr "Résolution : %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Pilote XFree86 : %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Pilote Xorg : %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -796,8 +833,8 @@ msgstr "Interface graphique lors du démarrage"
 #, 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 ""
 "Souhaitez-vous que l'interface graphique soit\n"
 "automatiquement lancée lors du démarrage ?"
@@ -828,20 +865,57 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Quelle norme utilise votre téléviseur ?"
 
-#: 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 "Veuillez patienter"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Installation du programme d'amorçage en cours"
 
-#: 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 ""
+"L'installation du programme d'amorçage a échoué pour la raison suivante :"
+
+#: 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 ""
+"Vous aurez peut-être besoin de changer le périphérique d'amorçage\n"
+"de l'OpenFirmware pour activer le programme d'amorçage. Si vous\n"
+"ne voyez pas apparaître l'invite du programme d'amorçage lorsque\n"
+"vous redémarrerez, appuyez sur Command-Option-O-F au démarrage et\n"
+"entrez :\n"
+"setenv boot-device %s,\\\\:tbxi\n"
+"Puis tapez : shut-down\n"
+"Au prochain démarrage vous devriez voir apparaître l'invite du\n"
+"programme d'amorçage."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -856,277 +930,262 @@ msgstr ""
 "\n"
 "Quel est le disque de démarrage ?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Premier secteur du disque (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Premier secteur de la partition racine"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "sur disquette"
 
-#: 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 "Passer"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Installation de SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Installation de LILO ou Grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Où désirez-vous installer le programme d'amorçage ?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Premier secteur de la partition d'amorçage"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Configuration du style de démarrage"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Principales options du programme d'amorçage"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Indiquez la quantité de mémoire en Mo"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "L'option ``Restrict command line options'' est inutile sans mot de passe"
 
-#: 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 mots de passe ne sont pas identiques"
 
-#: 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 "Veuillez réessayer"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Programme d'amorçage à utiliser"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Installation du programme d'amorçage"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Périphérique d'amorçage"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Délai avant l'activation du choix par défaut"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Activer l'ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Forcer sans APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Forcer sans 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 "Mot de passe"
 
-#: 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 "Mot de passe (vérif)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Protéger par mot de passe les options"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "protection"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Vider le dossier /tmp à chaque démarrage"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 "Précisez la taille mémoire si nécessaire\n"
 "(%d Mo trouvés)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Autoriser plusieurs profils"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Message de démarrage"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Délai de l'Open Firmware"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Délai d'amorçage du noyau"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Autoriser le démarrage sur CD ?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Autoriser le démarrage sur l'OF ?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Système d'exploitation par défaut ?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Image"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Partition racine"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Options passées au noyau"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Mode vidéo"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Fichier RamDisk"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Profile réseau"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: 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 "Choix par défaut"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Taille du RamDisk"
 
-#: 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 "Un label vide n'est pas autorisé"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Vous devez spécifier l'image noyau désirée"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Vous devez spécifier une partition racine"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Ce label est déjà utilisé"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Quel type de système souhaitez-vous ajouter ?"
 
-#: 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 "Autres systèmes (SunOS, etc.)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Autres systèmes (MacOS, etc.)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Autres systèmes (Windows, etc.)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1135,52 +1194,52 @@ msgstr ""
 "Voici les différentes entrées.\n"
 "Vous pouvez en ajouter de nouvelles ou modifier les entrées existantes."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "accès aux programmes graphiques"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "accès aux outils rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "autoriser « su »"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "accès aux fichiers d'administration"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "accès aux outils réseaux"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "accès aux outils de compilation"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "Utilisateur(s) existant(s) : %s"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Ce mot de passe est trop simple"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Veuillez taper un nom d'utilisateur"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1188,22 +1247,22 @@ msgstr ""
 "Le nom d'utilisateur ne peut contenir que des lettres minuscules,\n"
 "des nombres, ainsi que les caractères « - » et « _ »"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Ce nom d'utilisateur est trop long"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Ce nom d'utilisateur est déjà utilisé"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1212,75 +1271,79 @@ msgstr ""
 "Créer un compte utilisateur\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 "Terminer"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Accepter"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Nom et prénom"
 
-#: 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'utilisateur"
+msgid "Login name"
+msgstr "Identifiant de connexion"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Interpréteur"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Icône"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Connexion automatique"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "À la fin du démarrage, une session peut être ouverte automatiquement pour un "
 "utilisateur."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Voulez-vous utiliser cette fonctionnalité ?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Choisissez l'utilisateur par défaut :"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Choisissez l'environnement graphique :"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Choisissez la langue :"
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Choix de la langue"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1290,48 +1353,57 @@ msgstr ""
 "Vous pouvez choisir d'autres langues.\n"
 "Elles seront disponibles après l'installation."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Utiliser l'Unicode par défaut"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Toutes les langues"
 
-#: 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 "Pays / Région"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Veuillez choisir votre pays."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Voici la liste complète des pays disponibles"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
 #, c-format
-msgid "More"
-msgstr "Davantage"
+msgid "Other Countries"
+msgstr "Autres Pays"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Méthode d'entrée :"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Aucun"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Pas de partage"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Autoriser tous les utilisateurs"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1342,38 +1414,52 @@ msgid ""
 msgstr ""
 "Souhaitez-vous permettre aux utilisateurs de partager certains sous-"
 "répertoires de leur dossier personnel (/home) ?\n"
-"De cette façon, les utilisateurs pourront simplement cliquer sur « Partager » "
-"dans Konqueror (kde) et Nautilus (gnome).\n"
+"De cette façon, les utilisateurs pourront simplement cliquer sur "
+"« Partager » dans Konqueror (kde) et Nautilus (gnome).\n"
 "\n"
 "« Personnalisée » permet d'autoriser le partage pour certains utilisateurs.\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 : le système de partage de fichiers traditionnel d'UNIX, moins supporté sur les Mac et sous Windows."
+msgstr ""
+"NFS : le système de partage de fichiers traditionnel d'UNIX, moins supporté "
+"sur les Mac et sous 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 système de partage de fichiers utilisé par Windows, Mac OS X et de nombreux systèmes Linux modernes."
+msgstr ""
+"SMB : un système de partage de fichiers utilisé par Windows, Mac OS X et de "
+"nombreux systèmes Linux modernes."
 
-#: 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 ""
 "Souhaitez-vous exporter par NFS (protocole Unix) ou SMB (protocole Windows) ?"
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Lancer 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 "Fermer"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1383,92 +1469,201 @@ msgstr ""
 "cet utilisateur dans le groupe « fileshare ».\n"
 "Ceci peut se faire grâce au programme « Userdrake »."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Fichiers locaux"
+msgid "Local file"
+msgstr "Fichier 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 "Domaine Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "Active Directory avec SFU"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Active Directory avec Winbind"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Fichier local :"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Utilise les données du système local pour toute l'authentification et la "
+"recherche des informations sur les utilisateurs"
+
+#: 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 ""
+"Utilise LDAP pour tout ou partie de l'authentification. LDAP permet de "
+"centraliser certaines informations dans votre organisation."
+
+#: 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 ""
+"Ceci vous permet de partager les même fichiers password et group parmi un "
+"groupe d'ordinateurs dans le même domaine NIS (Network Information Service)."
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Domaine Windows :"
+
+#: authentication.pm:33
 #, c-format
-msgid "Active Directory"
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
 msgstr ""
+"Winbind autorise votre système à rapatrier les informations et "
+"authentification utilisateur dans un domaine windows"
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory avec SFU :"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+"Kerberos est un système sécurisé qui fournit des services d'authentification "
+"réseau."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory avec Winbind :"
 
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Authentification LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "Racine (dn) LDAP"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "simple"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr "SSL"
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr "infrastructure de sécurité (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "Méthode d'authentification"
+msgstr "Authentification Active Directory"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domaine"
 
-#: 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 "Serveur"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
 msgstr "Base de données des utilisateurs LDAP"
 
-#: authentication.pm:54
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Utilise BIND anonyme"
+
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "Utilisateur LDAP autorisé à parcourir l'Active Directory"
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Mot de passe de l'utilisateur"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Chiffrage"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Authentification NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Domaine NIS"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "Serveur 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 "
@@ -1489,32 +1684,42 @@ msgstr ""
 "lancer : C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" "
 "everyone /add et de redémarrer le serveur.\n"
 "Vous aurez aussi besoin du nom utilisateur et du mot de passe d'un "
-"administrateur de domaine pour joindre la machine au domaine Windows(tm).\n"
+"administrateur de domaine pour joindre la machine au domaine Windows™.\n"
 "Si le réseau n'est pas encore activé, le domaine sera joint après l'étape de "
 "configuration du réseau.\n"
 "Si cette étape échoue pour quelque raison que ce soit et que "
-"l'authentification de domaine ne fonctionne pas, lancez 'smbpasswd -j DOMAIN "
-"-U USER%%PASSWORD' en utilisant votre domaine Windows(tm), et vos nom "
-"d'administrateur et mot de passe, après le démarrage du système.\n"
-"La commande 'wbinfo -t' permet de tester la validité de votre "
+"l'authentification de domaine ne fonctionne pas, lancez « smbpasswd -j "
+"DOMAINE -U UTILISATEUR%%MOTDEPASSE » en utilisant votre domaine Windows™, et "
+"vos nom d'administrateur et mot de passe, après le démarrage du système.\n"
+"La commande « wbinfo -t » permet de tester la validité de votre "
 "authentification."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Authentification au Domaine Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nom d'administrateur de domaine"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Mot de passe d'administration de domaine"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Utiliser Idmap pour stocker les UID/SID"
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Idmap par défaut"
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "On ne peut pas utiliser l'option broadcast sans domaine NIS"
@@ -1525,7 +1730,7 @@ msgstr "On ne peut pas utiliser l'option broadcast sans domaine NIS"
 # 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"
@@ -1534,50 +1739,45 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Bienvenue dans le chargeur de systèmes d'exploitation.\n"
+"Bienvenue dans le chargeur de systemes d'exploitation.\n"
 "\n"
-"Choisissez un système d'exploitation dans la liste ci-dessus\n"
-"ou attendez le démarrage par défaut.\n"
+"Choisissez un systeme d'exploitation dans la liste ci-dessus\n"
+"ou attendez le demarrage par defaut.\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 en mode graphique"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO en mode texte"
 
-#: 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 "il n'y a pas assez de place dans le dossier /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr ""
 "Vous ne pouvez pas installer le programme d'amorçage\n"
 "sur une partition %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1586,16 +1786,16 @@ msgstr ""
 "La configuration de votre programme d'amorçage doit être mise à jour car les "
 "partitions ont été renumérotées"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
-"Le programme d'amorçage ne peut pas être installé.  Vous devez démarrer le "
-"CD d'installation avec l'option « rescue » et choisir « %s »"
+"Le programme d'amorçage ne peut pas être installé. Vous devez démarrer le CD "
+"d'installation avec l'option « rescue » et choisir « %s »"
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Réinstaller le programme d'amorçage"
@@ -1655,76 +1855,79 @@ msgstr "le programme « kdesu » est introuvable"
 msgid "consolehelper missing"
 msgstr "le programme « consolehelper » est introuvable"
 
-#: 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 "France"
 
-#: 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 "Belgique"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: 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 "Allemagne"
 
-#: 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èce"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Norvège"
 
-#: 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ède"
 
-#: 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 "Pays-Bas"
 
-#: 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 "Italie"
 
-#: 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 "Autriche"
 
-#: 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 "États-Unis"
 
-#: 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"
@@ -1739,68 +1942,62 @@ msgstr ""
 "ajouter\n"
 "des points de montage WebDAV choisissez « Nouveau »."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Nouveau"
 
-#: 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 "Démonter"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Monter"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Entrez l'adresse du serveur WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "L'URL doit commencer par http:// ou https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Serveur : "
 
-#: 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 "Point de montage : "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Options : %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "MISE EN GARDE !"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr ""
 "Avant d'utiliser un logiciel de partitionnement de disques,\n"
 "il est prudent de faire une copie de sauvegarde de vos données !!"
 
-#: 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 "
@@ -1810,17 +2007,17 @@ msgstr ""
 "Si vous voulez utiliser « aboot », vous devez réserver\n"
 "un espace libre (d'au moins 2048 secteurs) au début du disque."
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Assistant"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Choisissez une action"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1831,181 +2028,187 @@ msgstr ""
 "Vous devriez la réduire pour pouvoir créer d'autres partitions :\n"
 "cliquez sur la partition puis sur « Redimensionner »."
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Veuillez cliquer sur une partition"
 
-#: 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 "Détails"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Aucun disque dur trouvé"
 
-#: 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 "SF journalisé"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: 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 "Autre"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Vide"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Types des systèmes de fichiers :"
 
-#: 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 "Utilisez plutôt « %s »"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "Type"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Créer"
 
 #. -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 "Supprimer"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Cliquez d'abord sur « Démonter »"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Choisissez une autre partition"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Choisissez une partition"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Quitter"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "État précédent"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Passer en mode normal"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Passer en mode expert"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Désirez-vous tout de même continuer ?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Quitter sans sauvegarder"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Désirez-vous réellement quitter sans écrire la table des partitions ?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Désirez-vous sauvegarder les modifications de /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 ""
 "Vous devez redémarrer pour que les modifications apportées à la\n"
 "table des partitions soient prises en compte"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Supprimer toutes les partitions"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Partitionnement automatique"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Davantage"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Informations sur les disques durs"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Toutes les partitions primaires sont utilisées"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Impossible d'ajouter une partition"
 
-#: 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 "
@@ -2014,37 +2217,37 @@ msgstr ""
 "Pour pouvoir utiliser plus de partitions, vous devez d'abord en supprimer "
 "une pour la remplacer par une partition étendue."
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Sauvegarder la table des partitions..."
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Charger une table des partitions..."
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Deviner automatiquement la table des partitions"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Relire la table des partitions"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Auto-montage des périphériques amovibles"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Sélectionnez un fichier"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2054,23 +2257,23 @@ msgstr ""
 "n'a pas la même taille que le disque.\n"
 "Désirez-vous tout de même continuer ?"
 
-#: 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 "Attention"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -2079,92 +2282,92 @@ msgstr ""
 "Insérez une disquette dans le lecteur.\n"
 "Toutes les données présentes sur cette disquette seront perdues."
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Tentative de lecture de l'organisation des partitions..."
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Informations détaillées"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Déplacer"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formater"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Ajouter au RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Ajouter au LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Supprimer du RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Supprimer du LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifier le RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Utiliser pour le bouclage"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Créer une nouvelle partition"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Secteur de début : "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Taille en Mo : "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Type du système de fichiers : "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Préférence : "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Nom du volume logique"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2175,12 +2378,12 @@ msgstr ""
 "(vous avez atteint le nombre maximum de partitions primaires).\n"
 "Retirez d'abord une partition primaire et créez une partition étendue."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Supprimer le fichier de boucle ?"
 
-#: 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"
@@ -2188,32 +2391,32 @@ msgstr ""
 "Après avoir modifié le type de la partition %s, toutes les données\n"
 "présentes sur cette partition seront perdues."
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Changement du type de partition"
 
-#: 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 "Quel système de fichiers désirez-vous utiliser ?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Passage de ext2 à ext3"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Où désirez-vous monter le fichier de bouclage %s ?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Où désirez-vous monter la partition %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"
@@ -2222,52 +2425,52 @@ msgstr ""
 "Il est impossible de désélectionner ce point de montage car il est\n"
 "utilisé pour du bouclage. Veuillez supprimer ce dernier d'abord."
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Où désirez-vous monter %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 "Redimensionnement"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Calcul des limites du système de fichiers FAT..."
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Cette partition ne peut pas être redimensionnée"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr ""
 "Toutes les données présentes sur cette partition\n"
 "devraient avoir été sauvegardées."
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Après avoir redimensionné la partition %s, toutes les données présentes\n"
 "sur cette partition seront perdues"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Choisissez la nouvelle taille"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Nouvelle taille en Mo : "
 
-#: 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"
@@ -2278,153 +2481,148 @@ msgstr ""
 "une vérification du système de fichier sera réalisé au prochain démarrage de "
 "Windows(TM)"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Sur quel disque souhaitez-vous la déplacer ?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Secteur"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Sur quel secteur souhaitez-vous la déplacer ?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Déplacement"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Déplacement de la partition..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Choisissez un RAID existant"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "Nouveau"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Choisissez un LVM existant"
 
-#: 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 "Cette partition ne peut pas être utilisée pour du bouclage"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Bouclage"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Nom du fichier de bouclage :"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Donnez un nom de fichier"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
 "Ce fichier est déjà utilisé par un bouclage.\n"
 "Veuillez en choisir un autre."
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Le fichier existe déjà. Faut-il l'utiliser ?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Options de montage"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Divers"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "périphérique"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "Niveau de RAID"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "Taille de bloc"
+msgid "chunk size in KiB"
+msgstr "taille de bloc en KiO"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Soyez prudent : cette opération est dangereuse."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Quel type de partitionnement ?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Le paquetage %s est requis. Souhaitez-vous l'installer ?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 "Vous devez redémarrer pour que les modifications soient prises en compte"
 
-#: 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 table des partitions de %s va maintenant être écrite sur le disque !"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Après avoir formaté la partition %s, toutes les données présentes\n"
 "sur cette partition seront perdues."
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Déplacer les fichiers sur la nouvelle partition"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Cacher les fichiers"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2433,53 +2631,53 @@ msgstr ""
 "Le dossier %s contient déjà des données\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Déplacement des fichiers sur la nouvelle partition..."
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "Copie de %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "la partition %s est maintenant connue comme %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Périphérique : "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Nom Devfs : "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr "Nom du volume :"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "Lettre de lecteur DOS supposée : %s:\n"
+msgstr "Lettre de lecteur DOS supposée : %s\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "Type : "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nom : "
@@ -2526,8 +2724,8 @@ msgstr "Montée\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "Appartient au RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "Appartient au RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2554,8 +2752,8 @@ msgstr "RAID de niveau %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Taille de bloc %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Taille de bloc %d KiO\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2628,38 +2826,38 @@ msgstr "Table des partitions de type : %s\n"
 msgid "on channel %d id %d\n"
 msgstr "sur canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Clef de chiffrement du système de fichiers"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Choisissez la clef de chiffrement du système de fichiers"
 
-#: 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 "Cette clef de chiffrement est trop courte (minimum %d caractères)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Les clefs de chiffrement ne correspondent pas"
 
-#: 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 "Clef de chiffrement"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Clef de chiffrement (confirmation)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Changer le type"
@@ -2692,7 +2890,7 @@ msgstr ""
 "Veuillez entrer vos nom d'utilisateur, mot de passe et nom de domaine pour "
 "accéder à ce serveur"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -2707,27 +2905,72 @@ msgstr "Rechercher les serveurs"
 msgid "Search new servers"
 msgstr "Rechercher les nouveaux serveurs"
 
-#: 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 "Le paquetage %s doit être installé. Souhaitez-vous l'installer ?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Le paquetage %s, requis, est manquant"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Installation des paquetages..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
-msgstr "Suppression des packages ..."
+msgstr "Suppression des paquetages ..."
+
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Montage de la partition %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "le montage de la partition %s dans le dossier %s a échoué"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Vérification de %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "Le démontage de %s a échoué : %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Activer la partition d'échange %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatage de la partition %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Création et formatage du fichier %s"
 
-#: fs.pm:416
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Impossible de formater %s au format %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "le formatage au format %s de %s a échoué"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2737,7 +2980,7 @@ msgstr ""
 "(par exemple, afin d'avoir d'accélérer un serveur de nouvelles via un accès "
 "plus rapide aux à ces dernières)"
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2746,14 +2989,14 @@ msgstr ""
 "Ne peut être monté qu'explicitement (ie.,\n"
 "l'option -a ne montera pas le système de fichier)."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "Ignorer les fichiers spéciaux de type caractère ou bloc sur le système de "
 "fichier."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2761,7 +3004,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr " "
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2771,17 +3014,17 @@ msgstr ""
 "Empêche les bits SUID ou SGID d'être actifs. (Cela semble sûr, sauf si "
 "suidperl(1) est installé.)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Monter le système de fichier en lecture seule."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "Toutes les E/S sur ce système de fichier sont asynchrones."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2798,65 +3041,25 @@ msgstr ""
 "désactivée par les options suivantes comme dans l'exemple suivant :\n"
 "« user,exec,dev,suid »)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Donner l'accès en écriture aux utilisateurs ordinaires"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Donner l'accès en lecture aux utilisateurs ordinaires"
 
-#: 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 "le formatage au format %s de %s a échoué"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Impossible de formater %s au format %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatage de la partition %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Création et formatage du fichier %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Montage de la partition %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "le montage de la partition %s dans le dossier %s a échoué"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "Vérification de %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "Le démontage de %s a échoué : %s"
-
-#: fs.pm:824
+#: fs/type.pm:364
 #, c-format
-msgid "Enabling swap partition %s"
-msgstr "Activer la partition d'échange %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Les partitions JFS doivent faire au moins 16 Mo."
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "simple"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Les partitions ReiserFS doivent faire au moins 32 Mo."
 
 #: fsedit.pm:25
 #, c-format
@@ -2868,7 +3071,7 @@ msgstr "avec /usr"
 msgid "server"
 msgstr "serveur"
 
-#: 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"
@@ -2885,33 +3088,23 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour perdre toutes les partitions de ce disque ?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Les partitions JFS doivent faire au moins 16 Mo."
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Les partitions ReiserFS doivent faire au moins 32 Mo."
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Les points de montage doivent commencer par /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr ""
 "Les points de montage ne doivent contenir que des caractères alphanumériques"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Le point de montage %s est déjà utilisé\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2922,14 +3115,14 @@ msgstr ""
 "racine (/). Pour que votre système puisse démarrer, vous devez ajouter\n"
 "une partition non RAID, spécifique pour le dossier /boot."
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 "Vous ne pouvez pas utiliser une partition logique LVM pour le point de "
 "montage %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2941,7 +3134,7 @@ msgstr ""
 "Pour que votre système puisse démarrer, vous devez ajouter\n"
 "une partition non LVM, spécifique pour le dossier /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 "
@@ -2950,12 +3143,12 @@ msgstr ""
 "Vous risquez de ne pas être en mesure d'installer lilo (car lilo ne supporte "
 "pas un LV sur plusieurs PVs)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Ce dossier doit rester dans la partition racine"
 
-#: 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 "
@@ -2964,135 +3157,129 @@ msgstr ""
 "Vous avez besoin d'un vrai système de fichiers (ext2/ext3, reiserfs, xfs, ou "
 "jfs) pour ce point de montage\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr ""
 "Vous ne pouvez pas utiliser de système de fichiers crypté pour le point de "
 "montage %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Pas assez d'espace libre pour le partitionnement automatique"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Rien à faire"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erreur lors de l'ouverture de %s en écriture : %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Lecteur de disquette"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Lecteurs Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Disques"
 
-#: 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 "Graveurs CD/DVD"
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, c-format
 msgid "Tape"
 msgstr "Bande"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Carte vidéo"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Carte TV"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Autre périphériques multimédia"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Carte son"
 
-#: 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 "Processeurs"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Cartes RNIS"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Carte ethernet"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "Modems ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Contrôleurs AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Ponts et contrôleurs système"
 
-#: 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 "Imprimante"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Souris"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -3115,50 +3302,72 @@ msgstr "Contrôleurs Firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Contrôleurs PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Contrôleurs SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Contrôleurs USB"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "Ports USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Contrôleurs SMB"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Clavier"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Souris"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Scanner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Inconnus/Autres"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "processeur n°"
 
-#: 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 "Veuillez patienter... Mise en place de la configuration"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Pas de pilote alternatif"
 
-#: 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 "
@@ -3167,12 +3376,12 @@ msgstr ""
 "Il n'existe pas de pilote alternatif OSS ou ALSA connu pour votre carte son "
 "(%s) qui actuellement utilise « %s »"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Configuration du son"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3181,7 +3390,7 @@ msgstr ""
 "Vous pouvez sélectionner ici un pilote alternatif (OSS ou ALSA) pour votre "
 "carte son (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3194,7 +3403,7 @@ msgstr ""
 "Votre carte utilise actuellement le pilote %s « %s » (le pilote par défaut "
 "étant « %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 "
@@ -3213,8 +3422,8 @@ msgid ""
 "- the new ALSA api that provides many enhanced features but requires using "
 "the ALSA library.\n"
 msgstr ""
-"OSS (Open Sound System) fut la première API sonore. Elle est multi plate-"
-"formes (disponible sur la majorité des systèmes UNIX(tm)) mais est limitée "
+"OSS (Open Sound System) fut la première API sonore. Elle est multi "
+"plateformes (disponible sur la majorité des systèmes UNIX™) mais est limitée "
 "et très basique.\n"
 "De ce fait, tous les pilotes OSS doivent réinventer la roue.\n"
 "\n"
@@ -3228,24 +3437,24 @@ msgstr ""
 "- la nouvelle API ALSA qui fournit un grand nombre de possibilités avancées "
 "mais nécessite la bibliothèque 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 "Pilote :"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Résolution de problème"
 
-#: 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'ancien pilote « %s » est sur liste noire.\n"
 "\n"
@@ -3254,12 +3463,12 @@ msgstr ""
 "\n"
 "Le nouveau pilote « %s » ne sera utilisé qu'au prochain démarrage."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Pas de pilote open-source"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3268,33 +3477,34 @@ msgstr ""
 "Il n'existe pas de pilote libre pour votre carte son (%s), mais il en existe "
 "un propriétaire à « %s »"
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Aucun pilote connu"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Il n'y a pas de pilote connu pour votre carte son (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Pilote inconnu"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr ""
 "Erreur : le pilote « %s » pour votre carte son n'est pas dans la liste."
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Résolution d'un problème de son"
 
-#: 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"
@@ -3332,22 +3542,24 @@ msgstr ""
 "vous diront si les services « sound » et « alsa » sont configurés pour\n"
 "être démarrés dès le niveau d'exécution 3 (init runlevel 3)\n"
 "\n"
-"- « aumix -q » vous chuchotera peut-être que le volume est coupé...\n"
+"- « aumix -q » vous permettra de voir si le volume sonore est coupé ou "
+"non...\n"
 "\n"
 "- « /sbin/fuser -v /dev/dsp » dénoncera quel programme est en train\n"
 "d'utiliser ou de bloquer la carte son.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Choix d'un pilote"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Choix arbitraire d'un pilote..."
 
-#: 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 "
@@ -3430,15 +3642,13 @@ msgstr "Support de la radio :"
 msgid "enable radio support"
 msgstr "activer le support de la radio"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:11
 #, 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 ""
 "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"
 "les termes et conditions d'utilisation de la licence. Celle-ci régit\n"
@@ -3446,58 +3656,54 @@ msgstr ""
 "termes, cochez la case « %s », sinon, cliquez sur le bouton « %s » pour\n"
 "redémarrer votre ordinateur."
 
-#: 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 "Accepter"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux est un système multi-utilisateurs, ce qui signifie généralement\n"
 "que chaque utilisateur peut avoir des préférences différentes, ses propres\n"
-"fichiers, etc. Pour plus d'informations, consultez le « Guide de\n"
-"démarrage ». Contrairement à « root » qui a tous les droits, les\n"
+"fichiers, etc. Contrairement à « root » qui a tous les droits, les\n"
 "utilisateurs que vous ajouterez ici n'auront que des permissions pour agir\n"
 "sur leurs propres fichiers exclusivement. L'utilisateur / administrateur\n"
 "devrait également se créer un compte « normal ». C'est à travers cet\n"
@@ -3530,25 +3736,28 @@ msgstr ""
 "gestionnaire de fenêtres, puis cliquez sur « %s ». Si cela ne vous\n"
 "intéresse pas, décochez la case « %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'utilisateur"
+
+#: 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 "Suivant"
 
-#: 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 "Avancé"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3584,10 +3793,10 @@ msgstr ""
 "La liste présentée plus haut identifie les partitions GNU/Linux détectées\n"
 "sur votre système. Vous pouvez accepter les choix proposés par l'assistant,\n"
 "qui s'avèrent bon dans la grande majorité des cas. Si vous faites un\n"
-"changement, vous devez au moins avoir une partition racine (« / »).\n"
-"Prenez garde de vous réserver suffisamment d'espace pour\n"
-"installer tous les programmes qui vous intéressent. Vous devrez\n"
-"également créer une partition « /home ». Ceci s'avère exclusivement\n"
+"changement, vous devez au moins avoir une partition root (« / »).\n"
+"Prenez garde de vous réserver suffisamment d'espace pour installer\n"
+"toutes les applications qui vous intéressent. Vous devrez\n"
+"également créer une partition «  /home ». Ceci s'avère exclusivement\n"
 "possible lorsque vous avez déjà au moins une partition GNU/Linux de\n"
 "configurée.\n"
 "\n"
@@ -3616,41 +3825,49 @@ msgstr ""
 "Avec les disques SCSI, le « a » indique le plus petit SCSI ID, et « b » le\n"
 "« deuxième plus petit ID », etc."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Les paquetages requis à l'installation de Mandrakelinux sont distribués\n"
-"sur plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
+"Les paquetages requis à l'installation de Mandrakelinux sont distribués sur\n"
+"plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
 "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"
-"CD-ROM approprié."
+"CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"
+"simplement sur « %s », et les paquetages correspondants ne seront pas\n"
+"installés."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:91
-#, fuzzy, c-format
+#: 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"
@@ -3660,9 +3877,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"
@@ -3672,33 +3899,31 @@ 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 ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
 "sur votre système. Sachez que Mandrakelinux contient plusieurs milliers de\n"
-"paquetages à installer, et qu'il n'est pas nécessaire de tous les connaître\n"
-"par cœur.\n"
+"paquetages à installer, et ces paquetages ont été rangés par groupes chacun\n"
+"correspondant à un usage particulier de l'ordinateur.\n"
 "\n"
-"Les paquetages sont regroupés en groupes chacun correspondant à une usage\n"
-"particulier de l'ordinateur. Mandrakelinux range ces groupes en quatre\n"
-"catégories. Vous pouvez mélanger des groupes de plusieurs catégories de\n"
-"sorte qu'une station de travail peut toujours proposer des programmes\n"
-"pour le « %s ».\n"
+"Mandrakelinux range ces groupes en quatre catégories. Vous pouvez mélanger\n"
+"des groupes de plusieurs catégories de sorte qu'« une station de travail »\n"
+"peut toujours proposer des applications pour la catégorie « Serveur ».\n"
 "\n"
 " * « %s » : si vous comptez utiliser votre machine ainsi, sélectionner un\n"
 "ou plusieurs groupes y correspondant.\n"
 "\n"
 " * « %s » : si votre système doit être utilisé pour la programmation,\n"
-"choisissez les groupes désirés.\n"
+"choisissez les groupes désirés. Le groupe spécial « LSB » configurera votre\n"
+"système de manière à ce qu'il corresponde le plus possible avec la Linux\n"
+"Standard Base.\n"
+"\n"
+"   Si vous choisissez le groupe « LSB », cela installera aussi les séries\n"
+"de noyau « 2.4 » au lieu de celles par défaut « 2.6 ». Ceci afin d'assurer\n"
+"une compatibilité LSB maximale. Cependant, si vous ne sélectionnez pas ce\n"
+"groupe « LSB » vous aurez quand même un système presque entièrement\n"
+"compatible LSB.\n"
 "\n"
 " * « %s » : enfin, si votre système doit fonctionner en tant que serveur,\n"
 "vous pourrez sélectionner les services que vous voulez installer.\n"
@@ -3707,22 +3932,8 @@ msgstr ""
 "graphique vous voulez avoir sur votre système. Évidemment, il vous en faut\n"
 "au moins un pour utiliser votre station en mode graphique.\n"
 "\n"
-"En plaçant votre souris au dessus d'un nom de groupe, vous verrez\n"
-"apparaître une courte description de ce groupe. Si vous désélectionnez tous\n"
-"les groupes lors d'une installation standard (par opposition à une mise à\n"
-"jour), un dialogue apparaîtra proposant différentes options pour une\n"
-"installation minimale :\n"
-"\n"
-" * « %s » : installe le moins de paquetages possible pour avoir un\n"
-"environnement de travail graphique ;\n"
-"\n"
-" * « %s » : installe le système de base plus certains utilitaires de base\n"
-"et leur documentation. Cette installation est utilisable comme base pour\n"
-"monter un serveur ;\n"
-"\n"
-" * « %s » : installera le strict minimum nécessaire pour obtenir un système\n"
-"GNU/Linux fonctionnel, en ligne de commande. Cette installation prend à peu\n"
-"près 65 Mo.\n"
+"En plaçant votre souris au-dessus d'un nom de groupe, vous verrez\n"
+"apparaître une courte description de ce groupe.\n"
 "\n"
 "Vous pouvez enfin cocher l'option « %s ». Cette option est à utiliser si\n"
 "vous connaissez exactement le paquetage désiré ou si vous voulez avoir le\n"
@@ -3731,245 +3942,191 @@ msgstr ""
 "Si vous avez démarré l'installation en mode « %s », vous pouvez\n"
 "« désélectionner » tous les groupes afin d'éviter l'installation de\n"
 "nouveaux programmes. Cette option est très utile pour restaurer un système\n"
-"défectueux."
+"défectueux ou le mettre à jour.\n"
+"\n"
+"Si vous désélectionnez tous les groupes lors d'une installation standard\n"
+"(en opposition à une mise à jour), une boîte de dialogue apparaîtra et vous\n"
+"proposera différentes options pour une installation minimale :\n"
+"\n"
+" * « %s » : installe le moins de paquetages possible pour avoir un\n"
+"environnement de travail graphique;\n"
+"\n"
+" * « %s » : installe le système de base plus certains utilitaires de base\n"
+"et leur documentation. Cette installation est utilisable comme base pour\n"
+"monter un serveur;\n"
+"\n"
+" * « %s » : installera le strict minimum nécessaire pour obtenir un système\n"
+"GNU/Linux fonctionnel, en ligne de commande. Cette installation prend à peu\n"
+"près 65 Mo."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Station de travail"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Développement"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Environnement graphique"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Sélection individuelle des paquetages"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Mise à jour"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Avec X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Avec la documentation de base"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Installation réellement minimale"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Sélection individuelle des paquetages"
-
-#: help.pm:137 help.pm:602
+#: help.pm:149
 #, c-format
-msgid "Upgrade"
-msgstr "Mise à jour"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:140
-#, 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 ""
 "Enfin, si vous avez choisi de sélectionner individuellement les paquetages\n"
 "à installer, DrakX vous présentera un arbre contenant tous les paquetages,\n"
-"classés par groupes et sous-groupes. En naviguant à travers l'arbre, vous\n"
+"classés par groupes et sous-groupes. En navigant à travers l'arbre, vous\n"
 "pouvez sélectionner des groupes, des sous-groupes ou des paquetages\n"
 "individuels.\n"
 "\n"
 "Dès que vous sélectionnez un paquetage dans l'arbre, une description\n"
-"apparaît à droite. Une fois votre sélection terminée, cliquez sur « %s »\n"
-"pour lancer le processus. Soyez patient, car en fonction du type\n"
-"d'installation choisi ou du nombre de paquetages sélectionnés, le temps\n"
-"requis peut être substantiellement différent. Une estimation du temps\n"
-"requis est présentée sur l'écran en cours d'opération afin de vous\n"
-"permettre d'évaluer de combien de temps vous disposez pour prendre votre\n"
-"déjeuner.\n"
-"\n"
-"!! Si un logiciel serveur a été sélectionné, vous devrez confirmer que vous\n"
-"voulez vraiment que celui-ci soit installé. Sous Mandrake, par défaut, tous\n"
-"les serveurs installés sont lancés au démarrage. Malgré tous les efforts\n"
-"investis pour vous livrer une distribution Linux sécurisée, il est possible\n"
-"que certaines failles de sécurité affectent les serveurs installés au-delà\n"
-"de la date de publication. Si vous ne savez pas précisément à quoi sert un\n"
-"serveur en particulier ou pourquoi il est installé, cliquez sur « %s ». En\n"
-"cliquant sur « %s », le serveur sera installé et le service rendu\n"
-"disponible au démarrage. !!\n"
+"apparaît à droite.\n"
+"\n"
+"!! Si un paquetage serveur a été sélectionné, vous devrez confirmer que\n"
+"vous voulez vraiment que celui-ci soit installé. Sous Mandrakelinux , par\n"
+"défaut, tous les services installés sont lancés au démarrage. Malgré tous\n"
+"les efforts investis pour vous livrer une distribution Linux sécurisée, il\n"
+"est possible que certaines failles de sécurité affectent les serveurs\n"
+"installés au-delà de la date de publication. Si vous ne savez pas\n"
+"précisément à quoi sert un service en particulier ou pourquoi il est\n"
+"installé, cliquez sur « %s ». En cliquant sur « %s », le serveur sera\n"
+"installé et le service rendu disponible au démarrage. !!\n"
 "\n"
 "L'option « %s » désactive les avertissements qui apparaissent à chaque fois\n"
-"que l'installeur sélectionne un nouveau paquetage. Ces avertissements\n"
-"surviennent parce que DrakX a déterminé que pour qu'un paquetage soit\n"
-"fonctionnel, il lui en faut un autre dont il est dépendant.\n"
+"que l'installeur sélectionne un nouveau paquetage. Parfois, pour qu'un\n"
+"paquetage soit fonctionnel, il faut en installer un autre dont il est\n"
+"dépendant. DrakX détermine ces dépendances entre paquetages pour une\n"
+"installation complète.\n"
 "\n"
 "La petite icône de disquette qui apparaît au bas de la liste permet de\n"
 "récupérer une liste de paquetages sélectionnés durant une autre\n"
 "installation. En cliquant dessus, on vous demandera d'insérer la disquette\n"
-"créée lors d'une installation précédente. Voir la deuxième note de la\n"
+"créée lors d'une installation précédente. Voir la deuxième astuce de la\n"
 "dernière étape afin de savoir comment créer une telle disquette."
 
-#: 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 "Non"
 
-#: 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 "Oui"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Dépendances automatiques"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-"Si vous désirez connecter votre système à un réseau ou à Internet, cliquez\n"
-"sur « %s ». L'auto-détection des périphériques réseau et modem sera alors\n"
-"lancée. Si cette détection échoue, décochez la case « %s ». Vous pouvez\n"
-"aussi choisir de ne pas configurer le réseau, ou de le faire plus tard.\n"
-"Dans ce cas, cliquez simplement sur « %s ».\n"
-"\n"
-"Les types de connexion supportées sont : modem téléphonique, Winmodem,\n"
-"modem ISDN, connexion ADSL, modem câble ou simplement LAN (réseau\n"
-"Ethernet).\n"
-"\n"
-"Nous ne détaillerons pas ici chacune des configurations possibles.\n"
-"Assurez-vous seulement que vous avez toutes les informations de votre\n"
-"fournisseur de service Internet à portée de main.\n"
-"\n"
-"À propos des Winmodems Les Winmodems sont des modems de bas de gamme\n"
-"généralement intégrés à la carte mère de l'ordinateur qui ont besoin d'un\n"
-"logiciel additionnel pour fonctionner par rapport aux modems standards.\n"
-"Certains de ces modems fonctionnent avec Mandrakelinux, d'autres non. Vous\n"
-"pouvez consulter la liste des modems pris en charge chez LinModems.\n"
-"\n"
-"Vous pouvez consulter le chapitre du « Guide de démarrage » concernant les\n"
-"connexions à Internet pour plus de détails à propos des configurations\n"
-"spécifiques de chaque type de connexion. Vous pouvez également configurer\n"
-"votre connexion à Internet une fois l'installation terminée."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Utiliser la détection automatique"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:200
+#: help.pm:183
 #, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"manual is similar to the one used during installation."
 msgstr ""
 "« %s » : en cliquant sur « %s », l'outil de configuration d'impression sera\n"
 "démarré. Consultez le chapitre correspondant du « Guide de démarrage » pour\n"
 "plus de renseignements. L'interface qui y est documentée est similaire à\n"
 "celle rencontrée lors de l'installation."
 
-#: 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 "Configurer"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 "Vous pouvez maintenant choisir les services disponibles au démarrage de\n"
 "votre système.\n"
@@ -3984,11 +4141,12 @@ msgstr ""
 "\n"
 "!! À cette étape, soyez particulièrement attentif dans le cas d'un système\n"
 "destiné à agir comme serveur. Dans ce cas, vous voudrez probablement\n"
-"permettre exclusivement les services nécessaires. !!"
+"permettre exclusivement les services nécessaires. Souvenez-vous que\n"
+"certains services peuvent s'avérer dangereux s'il sont activés sur un\n"
+"serveur. En général, n'installez que les services dont vous avez absolument\n"
+"besoin. !!"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3996,98 +4154,97 @@ 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 manipule l'heure au format GMT (« Greenwich Mean Time ») et la\n"
 "convertit en temps local selon le fuseau horaire choisi. Il est néanmoins\n"
 "possible de désactiver cela en désélectionnant « %s » de façon à ce que\n"
-"l'horloge matérielle soit la même que celle du système. Cela est\n"
-"particulièrement utile si la machine accueille un autre système\n"
-"d'exploitation tel que Windows.\n"
+"GNU/Linux sache que l'horloge matérielle est la même que celle du système.\n"
+"Cela est particulièrement utile si la machine accueille un autre système\n"
+"d'exploitation.\n"
 "\n"
 "La « %s » permet de régler l'heure automatiquement en se connectant à un\n"
 "serveur de temps sur Internet. Dans la liste qui est alors présentée,\n"
-"choisissez un serveur géographiquement proche de vous. Vous devez avoir une\n"
-"connexion Internet pour que cela fonctionne bien entendu. Cela installera\n"
-"en fait sur votre machine un serveur de temps local qui pourra, en option,\n"
-"être lui-même utilisé par d'autres machines de votre réseau local."
+"choisissez un serveur géographiquement proche de vous. Vous devez bien\n"
+"entendu avoir une connexion Internet pour que cela fonctionne. Cela\n"
+"installera en fait sur votre machine un serveur de temps local qui pourra,\n"
+"en option, être lui-même utilisé par d'autres machines de votre réseau\n"
+"local."
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Horloge système réglée sur le Temps Universel (GMT)"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Synchronisation automatique de l'horloge"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:238
+#: help.pm:220
 #, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
 "Carte graphique\n"
 "\n"
-"   Le programme d'installation détecte et configure automatiquement les\n"
-"cartes graphiques présentes sur votre machine. Si ce n'est pas le cas, vous\n"
+"   Le programme d'installation détecte et configure automatiquement la\n"
+"carte graphique présente sur votre machine. Si ce n'est pas le cas, vous\n"
 "pouvez choisir dans cette liste la carte que vous utilisez effectivement.\n"
 "\n"
 "   Dans le cas où différents serveurs seraient disponibles pour votre\n"
 "carte, avec ou sans accélération 3D, il vous est alors proposé de choisir\n"
 "le serveur qui vous conviendra le mieux."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -4096,31 +4253,33 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
-"X (pour le système X Window) est le cœur de votre interface graphique sous\n"
+"X (pour le système X Window) est le coeur de votre interface graphique sous\n"
 "GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"
 "etc.) présents sur Mandrakelinux dépendent de X.\n"
 "\n"
 "Il vous sera présenté une liste de divers paramètres à changer pour obtenir\n"
-"un affichage optimal : Carte graphique\n"
+"un affichage optimal :\n"
 "\n"
-"   Le programme d'installation détecte et configure automatiquement les\n"
-"cartes graphiques présentes sur votre machine. Si ce n'est pas le cas, vous\n"
+"Carte graphique\n"
+"\n"
+"   Le programme d'installation détecte et configure automatiquement la\n"
+"carte graphique présente sur votre machine. Si ce n'est pas le cas, vous\n"
 "pouvez choisir dans cette liste la carte que vous utilisez effectivement.\n"
 "\n"
 "   Dans le cas où différents serveurs seraient disponibles pour votre\n"
@@ -4168,16 +4327,14 @@ msgstr ""
 "en train d'installer un serveur, ou si vous n'avez pas réussi à configurer\n"
 "l'écran correctement."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 "Moniteur\n"
 "\n"
@@ -4186,16 +4343,14 @@ msgstr ""
 "pouvez choisir dans cette liste le moniteur que vous utilisez\n"
 "effectivement."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:311
+#: help.pm:295
 #, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 "Résolution\n"
@@ -4206,30 +4361,26 @@ msgstr ""
 "l'installation). Un échantillon de la configuration choisie apparaît dans\n"
 "le dessin du moniteur."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:319
+#: help.pm:303
 #, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
 "Dans le cas où différents serveurs seraient disponibles pour votre carte,\n"
 "avec ou sans accélération 3D, il vous est alors proposé de choisir le\n"
 "serveur qui vous conviendra le mieux."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Options\n"
 "\n"
@@ -4238,64 +4389,63 @@ msgstr ""
 "en train d'installer un serveur, ou si vous n'avez pas réussi à configurer\n"
 "l'écran correctement."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -4311,20 +4461,21 @@ msgstr ""
 "Comme les effets du partitionnement sont irréversibles (l'ensemble du\n"
 "disque est effacé), le partitionnement est généralement intimidant et\n"
 "stressant pour un utilisateur inexpérimenté. Heureusement, un assistant a\n"
-"été prévu à cet effet. Avant de commencer, révisez vos manuels et surtout,\n"
-"prenez votre temps.\n"
+"été prévu à cet effet. Avant de commencer, lisez le reste de ce document et\n"
+"surtout, prenez votre temps.\n"
+"\n"
+"Selon la configuration de votre disque, plusieurs options sont "
+"disponibles :\n"
 "\n"
-"Selon la configuration de votre disque, plusieurs options sont disponibles\n"
-":\n"
 "\n"
 " * « %s » : cette option tentera simplement de partitionner automatiquement\n"
 "l'espace inutilisé sur votre disque. Il n'y aura pas d'autre question.\n"
 "\n"
-" * « %s » : l' assistant a détecté une ou plusieurs partitions existant sur\n"
-"votre disque. Si vous voulez les utiliser, choisissez cette option. Il vous\n"
-"sera alors demandé de choisir les points de montage associés à chacune des\n"
-"partitions. Les anciens points de montage sont sélectionnés par défaut, et\n"
-"vous devriez généralement les garder.\n"
+" * « %s » : l'assistant a détecté une ou plusieurs partitions Linux\n"
+"existant sur votre disque. Si vous voulez les utiliser, choisissez cette\n"
+"option. Il vous sera alors demandé de choisir les points de montage\n"
+"associés à chacune des partitions. Les anciens points de montage sont\n"
+"sélectionnés par défaut, et vous devriez généralement les garder.\n"
 "\n"
 " * « %s » : si Microsoft Windows est installé sur votre disque et en prend\n"
 "toute la place vous devez faire de la place pour votre installation\n"
@@ -4333,85 +4484,86 @@ msgstr ""
 "Le redimensionnement peut être effectué sans pertes de données, à condition\n"
 "que vous ayez préalablement défragmenté la partition Windows. Une\n"
 "sauvegarde de vos données ne fera pas de mal non plus. Cette solution est\n"
-"recommandée pour faire cohabiter Mandrakelinux and Microsoft Windows sur\n"
-"le même ordinateur.\n"
+"recommandée pour faire cohabiter Mandrakelinux et Microsoft Windows sur le\n"
+"même ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'après cette\n"
 "procédure l'espace disponible pour Windows sera réduit. Vous aurez moins\n"
 "d'espace pour installer des logiciels ou sauvegarder de l'information avec\n"
 "Windows.\n"
 "\n"
-" * « %s » : si vous voulez effacer toutes les données et les programmes\n"
+" * « %s » : si vous voulez effacer toutes les données et les applications\n"
 "installées sur votre système et les remplacer par votre nouveau système\n"
 "Mandrakelinux, choisissez cette option. Soyez prudent, car ce choix est\n"
 "irréversible et permanent. Il vous sera impossible de retrouver vos données\n"
 "effacées.\n"
 "\n"
-"   !! En choisissant cette option, l'ensemble du contenu de votre disque\n"
+"   !! En choisissant cette option, l'ensemble du contenu de votre disque\n"
 "sera détruit. !!\n"
 "\n"
-" * « %s » : ce choix effacera tout simplement ce que contient le disque et\n"
-"recommencera à zéro. Toutes les données et les programmes présents sur le\n"
-"disque seront effacés.\n"
+" * « %s » : ce choix apparaît lorsque l'intégralité du disque dur est "
+"occupé\n"
+"par Microsoft Windows. Choisir cette option effacera tout simplement ce que\n"
+"contient le disque et recommencera à zéro. Toutes les données et les\n"
+"programmes présents sur le disque seront effacés.\n"
 "\n"
-"   !! En choisissant cette option, l'ensemble de votre disque sera effacé\n"
+"   !! En choisissant cette option, l'ensemble de votre disque sera effacé\n"
 "!!\n"
 "\n"
 " * « %s » : permet de partitionner manuellement votre disque. Soyez\n"
 "prudent, car bien que plus puissante, cette option est dangereuse. Vous\n"
 "pouvez facilement perdre l'ensemble du contenu d'un disque. Donc, ne\n"
 "choisissez pas cette option si vous ne savez pas exactement ce que vous\n"
-"devez faire. Pour en savoir plus sur DiskDrake, référez vous à « Gérer ses\n"
+"devez faire. Pour en savoir plus sur DiskDrake, référez-vous à « Gérer ses\n"
 "partitions » du « Guide de démarrage »."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Utiliser l'espace libre"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Utiliser une partition existante"
 
-#: 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 "Utiliser l'espace libre sur la partition Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Effacer tout le disque"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Supprimer Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Partitionnement personnalisé"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4419,13 +4571,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 ""
 "Votre installation de Mandrakelinux est maintenant terminée et votre\n"
 "système est prêt à être utilisé. Cliquez sur « %s » pour redémarrer votre\n"
@@ -4434,7 +4591,7 @@ msgstr ""
 "ait fait ses propres tests matériels est le menu de démarrage, permettant\n"
 "de démarrer tous les systèmes présents sur votre machine.\n"
 "\n"
-"Le bouton « %s » (en mode Expert uniquement) permet deux autres options :\n"
+"Le bouton « %s » permet deux autres options :\n"
 "\n"
 " * « %s » : Pour créer une disquette d'installation qui permettra de\n"
 "reproduire l'installation que vous venez de réaliser sans l'aide d'un\n"
@@ -4449,70 +4606,65 @@ msgstr ""
 "    * « %s ». Complètement automatique, cette installation reformate le\n"
 "disque au complet.\n"
 "\n"
-"   Cette fonctionnalité est particulièrement pratique pour l'installation\n"
-"de multiples systèmes. Voir la section Auto install de notre site Internet.\n"
+"   Cette fonctionnalité est pratique pour l'installation de multiples\n"
+"systèmes. Voir la section Auto install de notre site Internet.\n"
+"\n"
+" * « %s » (*) sauvegarde la sélection des paquetages installés. Puis,\n"
+"lorsque vous ferez une autre installation, insérez la disquette dans le\n"
+"lecteur et accédez au menu d'aide en tapant [F1], entrez la commande\n"
+"suivante : « linux defcfg=\"floppy\" »et appuyez sur la touche [Entrée].\n"
 "\n"
-" * « %s » sauvegarde la sélection des paquetages installés. Puis, lorsque\n"
-"vous ferez une autre installation, insérez la disquette dans le lecteur et\n"
-"accédez au menu d'aide en tapant [F1], et entrez la commande suivante :\n"
-"« linux defcfg=\"floppy\" »."
+"(*) Vous avez besoin d'une disquette formatée avec FAT (pour la créer sous\n"
+"Linux, tapez « mformat a: » ou « fdformat /dev/fd0 » suivi de « mkfs.vfat\n"
+"/dev/fd0 »)"
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Créer une disquette d'installation automatique"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Rejouer"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automatisée"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Sauvegarder la sélection des paquetages"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Les partitions ayant été nouvellement définies doivent être formatées (ce\n"
-"qui implique la création d'un système de fichiers).\n"
-"\n"
-"Lors de cette étape, vous pouvez reformater des partitions existantes pour\n"
-"effacer les données présentes. Vous devrez alors également les\n"
-"sélectionner.\n"
+"Si vous choisissez de réutiliser des partitions GNU/Linux existantes, vous\n"
+"pouvez en reformater quelques unes et effacer les données présentes. Vous\n"
+"devrez alors les sélectionner.\n"
 "\n"
 "Sachez qu'il n'est pas nécessaire de reformater toutes les partitions\n"
 "existantes. Vous devez formater les partitions contenant le système\n"
@@ -4524,96 +4676,92 @@ msgstr ""
 "\n"
 "Cliquez sur « %s » lorsque vous êtes prêt à formater les partitions.\n"
 "\n"
-"Cliquez sur « %s » pour ajouter ou enlever une partition à formater.\n"
+"Cliquez sur « %s » pour choisir une autre partition où installer votre\n"
+"nouveau système d'exploitation Mandrakelinux.\n"
 "\n"
-"Cliquer sur « %s » si vous désirez sélectionner des partitions pour une\n"
+"Cliquez sur « %s » si vous désirez sélectionner des partitions pour une\n"
 "vérification des secteurs défectueux (« Bad Blocks »)."
 
-#: 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 "Précédent"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Au moment où vous êtes en train d'installer Mandrakelinux, il est possible\n"
-"que certains paquetages aient été mis à jour depuis la sortie du produit.\n"
-"Des bogues ont pu être corrigés, et des problèmes de sécurité résolus. Pour\n"
-"vous permettre de bénéficier de ces mises à jour, il vous est maintenant\n"
-"proposé de les télécharger depuis Internet. Choisissez « %s » si vous avez\n"
-"une connexion Internet, ou « %s » si vous préférez installer les mises à\n"
-"jour plus tard.\n"
+"Au moment où vous installez Mandrakelinux, il est possible que certains\n"
+"paquetages aient été mis à jour depuis la sortie du produit. Des bogues ont\n"
+"pu être corrigés, et des problèmes de sécurité résolus. Pour vous permettre\n"
+"de bénéficier de ces mises à jour, il vous est maintenant proposé de les\n"
+"télécharger depuis Internet. Choisissez « %s » si vous avez une connexion\n"
+"Internet, ou « %s » si vous préférez installer les mises à jour plus tard.\n"
 "\n"
 "En choisissant « %s », la liste des sites depuis lesquels les mises à jour\n"
-"peuvent être téléchargées est affichée. Choisissez le site le plus proche.\n"
-"Puis un arbre de choix des paquetages apparaît : vérifiez la sélection,\n"
-"puis cliquez sur « %s » pour télécharger et installer les mises à jour\n"
-"sélectionnées, ou « %s » pour abandonner."
+"peuvent être téléchargées est affichée. Choisissez le site le plus proche\n"
+"de chez vous. Puis un arbre de choix des paquetages apparaît : vérifiez la\n"
+"sélection, puis cliquez sur « %s » pour télécharger et installer les mises\n"
+"à jour sélectionnées, ou « %s » pour abandonner."
 
-#: 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 "Installation"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
-"À cette étape, vous devrez déterminer le niveau de sécurité requis par\n"
-"votre système. Le niveau de sécurité requis se détermine en fonction de\n"
-"l'exposition du système à d'autres utilisateurs (s'il est connecté\n"
-"directement sur Internet par exemple) et selon le niveau de sensibilité de\n"
-"l'information contenue dans le système. Sachez que, de manière générale,\n"
-"plus la sécurité d'un système est élevée, plus il est complexe à utiliser.\n"
+"À cette étape, DrakX vous permettra de déterminer le niveau de sécurité\n"
+"requis par votre système. Il se détermine en fonction de l'exposition du\n"
+"système à d'autres utilisateurs (s'il est connecté directement sur\n"
+"Internet, par exemple) et selon le niveau de sensibilité de l'information\n"
+"contenue dans le système. Sachez toutefois que plus la sécurité d'un\n"
+"système est élevée, plus il est complexe à utiliser.\n"
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
+"Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
+"dans le Mandrakelinux Control Center\n"
 "\n"
-"Le champ « %s » sert à indiquer l'utilisateur sur le système qui sera\n"
-"responsable de la sécurité. Les messages de sécurité lui seront adressés."
+"Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
+"sera responsable de la sécurité. Les messages de sécurité lui seront\n"
+"adressés."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Administrateur sécurité"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:475
+#: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -4688,10 +4836,9 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit\n"
-"par une autre installation GNU/Linux ou par un autre outil de\n"
-"partitionnement, vous pourrez les utiliser. Sinon, les partitions devront\n"
-"être créées.\n"
+"votre système Mandrakelinux. Si votre disque est déjà partitionné, soit par\n"
+"une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
+"vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
 "\n"
 "Pour créer une partition, vous devez d'abord sélectionner le disque à\n"
 "utiliser. Vous pouvez le sélectionner en cliquant sur « hda » pour le\n"
@@ -4743,7 +4890,7 @@ msgstr ""
 "précisément la taille de celle-ci en utilisant les Flèches de votre\n"
 "clavier.\n"
 "\n"
-"Note: vous pouvez atteindre toutes les options en utilisant le clavier.\n"
+"Note : vous pouvez atteindre toutes les options en utilisant le clavier.\n"
 "Naviguer avec les flèches et [Tab].\n"
 "\n"
 "Une fois la partition sélectionnée, vous pouvez utiliser :\n"
@@ -4756,27 +4903,25 @@ msgstr ""
 " * Ctrl-m pour définir le « mount point »\n"
 "\n"
 "Pour obtenir plus d'information sur les systèmes de fichiers, veuillez lire\n"
-"sur le système de fichier ext2FS dans « Manuel de référence ».\n"
+"sur le système de fichier ext2FS dans « Manuel de Référence ».\n"
 "\n"
 "Si vous installez sur un poste PPC, vous devrez créer une petite partition\n"
-"HFS « bootstrap » d'au moins 1 Mo qui sera utilisée par le chargeur de\n"
+"HFS « bootstrap » d'au moins 1 Mo qui sera utilisée par le chargeur de\n"
 "démarrage (« bootloader ») yaboot. Si vous optez pour une partition plus\n"
 "grande, disons 50Mo, vous trouverez utile d'y placer des noyaux et des\n"
 "images « ramdisk » accessibles en cas de problème."
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Auto-montage des périphériques amovibles"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Basculer entre les modes expert et normal"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4813,7 +4958,8 @@ msgstr ""
 "choisir celle que vous choisissez pour votre nouvelle installation de\n"
 "Mandrakelinux.\n"
 "\n"
-"Chaque partition est identifiée comme suit: « Nom linux », « Nom Windows »,\n"
+"Chaque partition est identifiée comme suit : « Nom linux », « Nom "
+"Windows »,\n"
 "« Capacité ».\n"
 "\n"
 "Le « Nom » est structuré ainsi : « type de disque dur », « numéro du disque\n"
@@ -4837,134 +4983,129 @@ msgstr ""
 "Avec les disques SCSI, le « a » indique le plus petit SCSI ID, et ainsi de\n"
 "suite.\n"
 "\n"
-"« Nom Windows » c'est la lettre assignée à votre disque, (le premier\n"
+"« Windows name » c'est la lettre assignée à votre disque, (le premier\n"
 "disque ou partition « C: »)"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
-"« %s » : vérifiez la section du pays. Si vous ne vous trouvez pas dans ce\n"
+"« %s » : vérifiez la sélection du pays. Si vous ne vous trouvez pas dans ce\n"
 "pays, cliquez sur le bouton « %s » et choisissez le bon. Si votre pays ne\n"
 "se trouve pas dans la première liste, cliquez sur « %s » pour avoir la\n"
 "liste complète."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:584
-#, fuzzy, c-format
+#: help.pm:569
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
-"Cette étape ne s'affiche que si une partition GNU/Linux a été détectée sur\n"
-"votre disque dur.\n"
+"Cette étape ne s'affichera que si une partition GNU/Linux a été détectée\n"
+"sur votre disque dur.\n"
 "\n"
-"DrakX doit maintenant savoir quel type d'installation vous désirez\n"
-"réaliser. Deux types d'installation sont proposés : Par défaut (« %s »),\n"
-"qui limite le nombre de questions à l'utilisateur au minimum ou « %s » qui\n"
-"vous permet de sélectionner individuellement chacune des composantes à\n"
-"installer. Il vous est également proposé de faire une « %s » ou une « %s »\n"
-"d'un système Mandrakelinux déjà installé :\n"
+"DrakX doit maintenant savoir si vous désirez lancer une « Installation » ou "
+"une\n"
+"« Mise à jour » d'un système Mandrakelinux déjà installé :\n"
 "\n"
-" * « %s » : Remplace l'ancien système. En fait, selon ce que votre machine\n"
-"comporte, vous pourrez garder intactes certaines des anciennes partitions\n"
-"(Linux ou autres) ;\n"
+" * « %s » : remplace l'ancien système. Cependant, selon votre table de\n"
+"partition, vous pourrez éviter l'effacement de vos données existantes\n"
+"(notamment les répertoires « home »). Si vous souhaitez changer le\n"
+"partitionnement de vos disques durs, ou changer votre système de fichiers,\n"
+"vous devriez utiliser cette option.\n"
 "\n"
-" * « %s » : cette classe d'installation permet de mettre à jour seulement\n"
-"les paquetages qui composent votre système Mandrakelinux. Elle conserve\n"
-"les partitions existantes, ainsi que la configuration des utilisateurs. La\n"
-"plupart des autres étapes d'une installation classique sont accessibles.\n"
+" * « %s » : cette classe d'installation vous permet de mettre à jour\n"
+"seulement les paquetages qui composent votre système Mandrakelinux. Elle\n"
+"conserve les partitions existantes, ainsi que la configuration des\n"
+"utilisateurs. La plupart des autres étapes d'une installation classique\n"
+"sont accessibles.\n"
 "\n"
-"La mise à jour devrait fonctionner correctement pour les systèmes Mandrake\n"
-"Linux à partir de la version « 8.1 ». Essayer de lancer une mise à jour sur\n"
-"les versions antérieures à « 8.1 » n'est pas recommandé."
+"La mise à jour devrait fonctionner correctement pour les systèmes\n"
+"Mandrakelinux à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
+"jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"Selon la langue principale que vous avez choisie à l'étape , DrakX\n"
-"sélectionne le clavier approprié. Vérifiez que cela correspond\n"
+"Selon la langue principale que vous avez choisie précédemment (), DrakX\n"
+"sélectionnera le clavier approprié. Vérifiez que cela correspond\n"
 "effectivement à votre configuration de clavier ou choisissez une autre\n"
 "configuration dans la liste.\n"
 "\n"
 "Cela dit, il est possible que vous ayez un clavier ne correspondant pas\n"
 "exactement à votre langue d'utilisation. Par exemple, si vous habitez le\n"
 "Québec et parlez le français et l'anglais, vous pouvez vous trouver dans la\n"
-"situation où votre langage et votre configuration de clavier ne sont pas\n"
-"les même. Dans ces cas, cette étape vous permet de sélectionner un autre\n"
+"situation où votre langue et votre configuration de clavier ne sont pas les\n"
+"mêmes. Dans ces cas, cette étape vous permet de sélectionner un autre\n"
 "clavier à partir de la liste.\n"
 "\n"
 "Cliquez sur « %s » pour voir toutes les options proposées.\n"
 "\n"
-"Si vous choisissez un clavier basé sur un alphabet non-latin, on vous\n"
-"demandera au prochain écran de choisir la combinaison de touches permettant\n"
-"d'alterner entre ceux-ci."
+"Si vous choisissez un clavier basé sur un alphabet non-latin, il vous sera\n"
+"demandé de choisir la combinaison de touches permettant d'alterner entre\n"
+"ceux-ci au prochain écran."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4973,45 +5114,45 @@ 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 ""
 "La première étape consiste à choisir votre langue.\n"
 "\n"
-"Le choix de la langue sera appliqué à la documentation, l'installation et\n"
-"le système en général. Commencez par choisir la région où vous vous situez,\n"
-"puis la langue que vous parlez.\n"
+"Le choix de la langue sera appliqué au programme d'installation, à la\n"
+"documentation et au système en général. Commencez par choisir la région où\n"
+"vous vous situez, puis la langue que vous parlez.\n"
 "\n"
 "En cliquant sur « %s », le programme vous proposera également des langues\n"
-"complémentaires pouvant être installées sur votre station de travail. En\n"
+"complémentaires pouvant être installées sur votre poste de travail. En\n"
 "choisissant des langues supplémentaires, le programme vous installera toute\n"
-"la documentation et les programmes nécessaires à l'utilisation de ces\n"
+"la documentation et les applications nécessaires à l'utilisation de ces\n"
 "langues. Par exemple, si vous prévoyez d'accueillir des utilisateurs\n"
 "d'Espagne sur votre machine, choisissez le français comme langue principale\n"
 "dans l'arborescence, et « %s », dans la section avancée.\n"
 "\n"
-"À propos de l'encodage UTF-8 (unicode): Unicode est un nouveau système\n"
-"d'encodage des caractères censé couvrir tous les langages existants.\n"
+"À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"
+"d'encodage des caractères censé couvrir tous les langues existantes.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
 "raison, Mandrakelinux l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
-"(langages associés à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
-"Grec, Turc, et la plupart des langages « iso-8859-2 »), l'encodage\n"
+"(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
+"Grec, Turc, et la plupart des langues « iso-8859-2 »), l'encodage\n"
 "historique sera utilisé;\n"
 "\n"
-" * Les autres langages entraîneront l'utilisation d'unicode par défaut;\n"
+" * Les autres langues entraîneront l'utilisation d'unicode par défaut;\n"
 "\n"
 " * Si vous demandez l'installation de plus d'une langue, et que ces langues\n"
 "n'utilisent pas le même encodage, alors unicode sera utilisé pour tout le\n"
@@ -5027,99 +5168,113 @@ msgstr ""
 "\n"
 "Pour passer d'une langue à l'autre, vous pouvez lancer l'utilitaire\n"
 "« /usr/sbin/localedrake » en tant que « root » pour changer la langue\n"
-"utilisée dans tout le système ; connectez-vous en simple utilisateur pour\n"
+"utilisée dans tout le système; connectez-vous en simple utilisateur pour\n"
 "ne changer que la langue de cet utilisateur."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Espagnol"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:663
-#, fuzzy, c-format
+#: help.pm:650
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 "DrakX détecte généralement le nombre de boutons de votre souris. Sinon, il\n"
 "prend pour acquis que vous avez une souris à deux boutons et configurera\n"
-"l'émulation du troisième bouton. De plus, DrakX saura automatiquement si\n"
-"vous avez une souris PS/2, série ou USB.\n"
+"l'émulation du troisième bouton. Le troisième bouton correspond aux clics\n"
+"simultanés du bouton gauche et du bouton droit de la souris. De plus, DrakX\n"
+"saura automatiquement si vous avez une souris PS/2, série ou USB.\n"
+"\n"
+"Si vous avez une souris à trois boutons sans molette, vous pouvez choisir\n"
+"une souris « %s ». DrakX configurera alors la souris de manière à simuler\n"
+"une molette : pour ce faire, cliquez sur le bouton du milieu et faites\n"
+"bouger votre souris de haut en bas.\n"
 "\n"
 "Si vous désirez installer une souris différente, veuillez la sélectionner à\n"
 "partir de la liste qui vous est proposée.\n"
 "\n"
+"Vous pouvez sélectionner une souris « %s » qu'elle soit PS/2 ou USB pour\n"
+"choisir un type de souris générique qui fonctionne avec presque tout.\n"
+"\n"
 "Si vous sélectionnez une souris différente de celle choisie par défaut,\n"
 "DrakX vous présentera un écran de test. Utilisez les boutons et la molette\n"
 "pour vous assurer que tout fonctionne correctement. Si votre souris ne\n"
-"fonctionne pas normalement, appuyez sur la barre d'espacement ou la touche\n"
+"fonctionne pas normalement, appuyez sur la barre d'espace ou la touche\n"
 "[Entrée] pour annuler le test et retourner à la liste de choix de la\n"
 "souris.\n"
 "\n"
-"Parfois, les souris à roulette ne sont pas détectées. Vous devrez alors\n"
-"sélectionner manuellement une souris dans la liste. Assurez vous de choisir\n"
-"celle qui correspond à votre modèle et au bon port de connexion. Après\n"
-"avoir pressé le bouton « %s », une image de souris apparaît. Vous devez\n"
-"alors faire tourner la molette afin de l'activer correctement. Testez alors\n"
-"que tous les mouvements et boutons fonctionnent correctement."
+"Parfois, les souris à molette ne sont pas détectées automatiquement, vous\n"
+"devrez alors sélectionner manuellement une souris dans la liste. Assurez\n"
+"vous de choisir celle qui correspond au bon port de connexion. Après avoir\n"
+"sélectionné la souris et pressé le bouton « %s », une image de souris\n"
+"apparaît. Vous devez alors faire tourner la molette afin de l'activer\n"
+"correctement. Après activation, vous verrez la molette de l'écran bouger.\n"
+"Testez alors que tous les mouvements et boutons fonctionnent correctement."
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "avec émulation de la molette"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Universelle | N'importe quelle souris PS/2 ou USB"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"Sélectionnez le bon port. Par exemple: l'équivalent du port « COM1 » sur\n"
+"Sélectionnez le bon port. Par exemple : l'équivalent du port « COM1 » sur\n"
 "Windows, se nomme « ttyS0 » sous GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:698
-#, fuzzy, c-format
+#: help.pm:688
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -5128,254 +5283,100 @@ 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 ""
 "Vous devez prendre ici une décision cruciale pour la sécurité de votre\n"
-"système. L'utilisateur « root » est l'administrateur du système qui a tous\n"
-"les droits d'accès aux fichiers de configuration, etc. Il est donc\n"
-"impératif de choisir un mot de passe difficile à deviner (pensez aux\n"
-"systèmes prévus à cet effet qui anticipent les combinaisons communes des\n"
-"utilisateurs). DrakX vous avertira si le mot de passe entré est trop facile\n"
-"à deviner. Comme vous pouvez le voir, il est également possible de ne pas\n"
-"entrer de mot de passe. Nous déconseillons fortement cette pratique. Comme\n"
-"l'erreur est humaine, un utilisateur avec tous les droits peut tout\n"
-"détruire sur votre système, c'est pourquoi le mot de passe doit agir comme\n"
-"barrière à l'entrée.\n"
+"système GNU/Linux : vous devez entrer un mot de passe « root ».\n"
+"L'utilisateur « root » est l'administrateur du système qui a tous les\n"
+"droits d'accès aux fichiers de configuration, etc. Il est donc impératif de\n"
+"choisir un mot de passe difficile à deviner (pensez aux systèmes prévus à\n"
+"cet effet qui anticipent les combinaisons communes des utilisateurs). DrakX\n"
+"vous avertira si le mot de passe entré est trop facile à deviner. Comme\n"
+"vous pouvez le voir, il est également possible de ne pas entrer de mot de\n"
+"passe. Nous déconseillons fortement cette pratique. Comme l'erreur est\n"
+"humaine, un utilisateur avec tous les droits peut tout détruire sur votre\n"
+"système, c'est pourquoi le mot de passe doit agir comme barrière à\n"
+"l'entrée.\n"
 "\n"
 "Le mot de passe choisi devrait contenir au moins 8 caractères\n"
-"alphanumériques. Ne jamais écrire un mot de passe, forcez-vous à vous en\n"
-"souvenir par cœur. Il faut donc ménager accessibilité et mémoire, donc un\n"
-"mot de passe de 30 caractères est presque impossible à mémoriser.\n"
+"alphanumériques. Ne jamais écrire le mot de passe « root », forcez-vous à\n"
+"vous en souvenir par coeur.\n"
+"\n"
+"Ne choisissez pas de mot de passe trop long ou trop compliqué, ménagez\n"
+"accessibilité et mémoire : un mot de passe de 30 caractères est presque\n"
+"impossible à mémoriser.\n"
 "\n"
 "Afin d'éviter les regards indiscrets, le mot de passe n'apparaîtra pas à\n"
 "l'écran. Il vous faudra donc l'inscrire deux fois afin d'éviter les erreurs\n"
 "de frappe. Évidemment, si vous faites deux fois la même erreur, celle-ci\n"
 "sera sauvegardée et vous devrez la reproduire afin d'accéder à votre\n"
-"système pour la première fois.\n"
-"\n"
-"En mode expert, on vous demandera si vous comptez vous connecter sur un\n"
-"serveur d'authentification, tel que NIS ou LDAP. Si votre réseau utilise un\n"
-"de ces protocoles, il faut le sélectionner. Si vous n'en avez aucune idée,\n"
-"demandez à votre administrateur réseau.\n"
+"système pour la première fois en tant qu'administrateur.\n"
 "\n"
 "Si vous souhaitez que l'accès à cette machine soit contrôlé par un serveur\n"
 "d'authentification, cliquez sur le bouton « %s ».\n"
 "\n"
 "Si votre réseau utilise soit LDAP, NIS, ou un PDC Windows, choisissez-le\n"
-"comme protocole d'authentification. En cas de doute, demandez à votre\n"
+"comme protocole d'%s. En cas de doute, demandez à votre\n"
 "administrateur réseau.\n"
 "\n"
 "Si vous avez des problèmes à vous souvenir de vos mots de passe, vous\n"
 "pouvez choisir « %s », si votre ordinateur ne sera pas connecté à Internet,\n"
 "et si vous avez confiance en tous ceux qui auront accès à cette machine."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "authentification"
 
 #. -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 "Aucun"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:736
-#, c-format
-msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-"Ce dialogue permet de contrôler finement le chargeur de démarrage :\n"
-"\n"
-" * « %s » vous propose trois choix :\n"
-"\n"
-"    * « %s » : si vous préférez GRUB (menu texte).\n"
-"\n"
-"    * « %s » : si vous préférez la version texte de LILO.\n"
-"\n"
-"    * « %s » : si vous préférez l'interface graphique.\n"
-"\n"
-" * « %s » : dans la plupart des cas, vous n'aurez pas à changer le disque\n"
-"par défaut (« %s », mais si vous le désirez, le programme d'amorce peut\n"
-"être installé sur un second disque, « %s », ou même sur une disquette,\n"
-"« %s ».\n"
-"\n"
-" * « %s » : au redémarrage de l'ordinateur, il s'agit du temps accordé à\n"
-"l'utilisateur pour démarrer un autre système d'exploitation.\n"
-"\n"
-" * « %s » : l'ACPI est un nouveau standard (apparu courant 2002) pour la\n"
-"gestion d'énergie, surtout pour les portables. Si vous savez que votre\n"
-"matériel est compatible ACPI cochez cette case.\n"
-"\n"
-" * « %s » : Si vous avez remarqué auparavant des problèmes matériels sur\n"
-"votre machine (conflits IRQ, instabilités, blocages machine, ...) vous\n"
-"pouvez essayer de désactiver l'APIC en cochant cette case.\n"
-"\n"
-"!! Prenez garde, si vous décidez de ne pas installer de programme d'amorce\n"
-"(en cliquant sur « %s »), vous devez vous assurer d'avoir une méthode pour\n"
-"démarrer le système. Aussi, assurez-vous de bien savoir ce que vous faites\n"
-"si vous modifiez les options. !!\n"
-"\n"
-"En cliquant sur « %s », vous aurez accès à plusieurs autres options de\n"
-"configuration. Sachez que celles-ci sont réservées aux experts en la\n"
-"matière."
-
-#: 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 "Délai avant l'activation du choix par défaut"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:771
-#, c-format
-msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-"Après avoir configuré les paramètres généraux de LILO ou GRUB la liste des\n"
-"options de démarrage sera rendue disponible au démarrage.\n"
-"\n"
-"Si d'autres systèmes d'exploitation sont détectés, il seront\n"
-"automatiquement ajoutés au menu démarrage. Vous pouvez ici affiner votre\n"
-"configuration. Cliquez sur « %s » pour créer une nouvelle entrée ;\n"
-"Choisissez une entrée et cliquez « %s » pour l'éditer, ou « %s » pour\n"
-"l'enlever. « %s » validera vos changements.\n"
-"\n"
-"Il est possible que vous vouliez limiter l'accès à ce système\n"
-"d'exploitation. Il vous suffit de retirer l'entrée dans les options de\n"
-"démarrage et démarrer ce système avec une disquette."
-
-#: 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 "Ajouter"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Modifier"
-
-#: 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 "Enlever"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:787
+#: help.pm:725
 #, c-format
 msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
-"LILO et GRUB sont deux programmes d'amorce pour GNU/Linux. Cette étape est\n"
-"normalement complètement automatique. En fait, DrakX analyse le secteur de\n"
-"démarrage (« master boot record ») et agit en fonction de ce qu'il peut y\n"
-"lire :\n"
+"Un programme d'amorce est un petit programme qui est lancé par le machine\n"
+"au démarrage. Il est en charge du démarrage du sytème. Normalement,\n"
+"l'installation d'un programme d'amorce est complètement automatique. DrakX\n"
+"analyse le secteur de démarrage (« master boot record ») et agit en\n"
+"fonction de ce qu'il peut y lire :\n"
 "\n"
 " * si un secteur de démarrage Windows est détecté, il sera remplacé par\n"
 "GRUB/LILO. Donc, vous serez capable de démarrer GNU/Linux ou tout autre\n"
@@ -5389,71 +5390,75 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:803
+#: 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 ""
 "Il faut choisir ici un système d'impression pour votre ordinateur. D'autres\n"
-"OSs en offrent un, Mandrakelinux en propose deux.\n"
+"OS en offrent un, Mandrakelinux en propose deux. Chaque système\n"
+"d'impression convient le mieux à certains types de configuration.\n"
 "\n"
 " * « %s » - qui veut dire « print, don't queue », (ou, impression sans\n"
 "passer par la file d'attente) est un bon choix si votre imprimante est\n"
 "branchée directement sur votre poste et que vous voulez pouvoir arrêter\n"
 "l'impression directement en cas de problème et que vous n'avez pas\n"
-"d'imprimantes réseau. Il prendra en charge de simples cas en réseau, mais\n"
-"les performances sont plutôt mauvaises dans ces cas. Choisissez\n"
-"drakx-misc-params-sect1.xml pdq si vous débutez sous Linux. Vous pourrez\n"
-"toujours changer de système plus tard avec PrinterDrake à partir du Centre\n"
-"de contrôle Mandrake en cliquant sur « %s ».\n"
+"d'imprimante réseau. Il prendra en charge de simples cas en réseau, mais\n"
+"les performances sont plutôt mauvaises dans ces cas. Choisissez pdq si vous\n"
+"débutez sous Linux.\n"
 "\n"
 " * « %s » - « Common Unix Printing System », est fabuleux autant pour une\n"
 "imprimante locale que pour imprimer à l'autre bout du monde. C'est simple\n"
 "et il peut agir comme un serveur ou un client avec l'ancien système\n"
-"d'impression « lpd ». Il s'agit d'un outil très puissant, mais les\n"
-"configurations de bases sont aussi simples que pdq. Pour émuler un serveur\n"
-"lpq, lancez le démon (« daemon ») cups-lpq. Enfin, cups offre une interface\n"
-"simple pour imprimer et choisir les imprimantes.\n"
+"d'impression « lpd ». Il s'agit d'un outil très puissant et les\n"
+"configurations de base sont aussi simples que « pdq ». Pour émuler un\n"
+"serveur « lpd », lancez le démon (« daemon ») « cups-lpq ». Enfin, « %s »\n"
+"offre une interface simple pour imprimer et choisir les imprimantes.\n"
 "\n"
-"Vous pourrez changer ultérieurement de système d'impression en lançant\n"
-"PrinterDrake depuis le Centre de Contrôle Mandrakelinux."
+"Si vous choisissez votre système d'impression maintenant et que par la\n"
+"suite vous n'en seriez pas convaincu, vous pourrez le changer\n"
+"ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
+"Mandrakelinux puis en cliquant sur le bouton « %s »."
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: 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"
@@ -5491,254 +5496,77 @@ msgstr ""
 "Il peut arriver que DrakX soit incapable de vérifier les options\n"
 "nécessaires. Dans ce cas, vous devrez les déterminer manuellement."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:847
+#: help.pm:786
 #, c-format
 msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-"Vous pouvez ajouter des entrées supplémentaires au menu yaboot, soit pour\n"
-"d'autres systèmes d'exploitation, des noyaux alternatifs, ou pour des\n"
-"images de démarrage en cas de problème.\n"
-"\n"
-"Pour les autres OS, l'entrée n'est constituée que d'une étiquette et d'une\n"
-"partition « root ».\n"
-"\n"
-"Pour Linux, quelques options sont disponibles :\n"
-"\n"
-" * Étiquette : c'est simplement le nom que vous devrez taper lors de\n"
-"l'invite yaboot pour choisir cette option de démarrage ;\n"
-"\n"
-" * Image : c'est le nom de l'image noyau à démarrer. Généralement, on\n"
-"utilise vmlinux ou une variante de vmlinux avec une extension ;\n"
-"\n"
-" * Root : le périphérique « root » ou « / » pour votre installation Linux ;\n"
-"\n"
-" * Adjonction (« Append ») : sur le matériel Apple, l'option d'adjonction\n"
-"noyau est utilisée assez souvent afin d'aider à l'initialisation de\n"
-"matériel vidéo ou pour permettre l'émulation de la souris clavier, vu que\n"
-"les souris Apple n'ont souvent qu'un bouton. Voici quelques exemples :\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"
-"   \t \n"
-"\n"
-" * Initrd : cette option peut être utilisée pour charger des modules\n"
-"initiaux avant que le périphérique de démarrage ne soit disponible, ou pour\n"
-"charger une image de disque virtuel (« ramdisk ») dans le cas où une\n"
-"situation de démarrage d'urgence surviendrait ;\n"
-"\n"
-" * Initrd-size : la taille par défaut de l'image de disque virtuel est\n"
-"normalement 4 096 octets. Si vous avez besoin d'un grand espace de disque\n"
-"virtuel, cette option peut être utilisée ;\n"
-"\n"
-" * Lecture-écriture : normalement, la partition « root » est montée en\n"
-"« lecture seulement » pour permettre une vérification du système de\n"
-"fichiers avant que le système ne soit « live ». Vous pouvez changer ces\n"
-"options dans cette section ;\n"
-"\n"
-" * NoVideo : si le matériel vidéo Apple devait très mal fonctionner, vous\n"
-"pouvez sélectionner cette option pour démarrer en mode « novideo », avec\n"
-"une prise en charge native de la mémoire d'image (« frame buffer ») ;\n"
-"\n"
-" * Défaut : sélectionne cette entrée en tant que choix Linux par défaut. En\n"
-"tapant sur ENTRÉE lors de l'invite de yaboot, vous y accéderez\n"
-"automatiquement. Cette entrée sera mise en évidence par le biais d'une\n"
-"astérisque (« * ») et si vous cliquez sur la touche [Tab], vous verrez\n"
-"toutes les sélections de démarrage possibles."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:894
-#, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-"Yaboot est un chargeur de démarrage pour les équipements NewWorld\n"
-"MacIntosh. Il est capable de démarrer soit GNU/Linux, MacOS ou MacOSX,\n"
-"s'ils sont présents sur votre ordinateur bien entendu. Normalement, ces\n"
-"systèmes d'exploitation sont correctement détectés et installés. Si ce\n"
-"n'est pas le cas, vous pouvez maintenant ajouter une entrée à la main.\n"
-"Soyez prudent et choisissez les bons paramètres.\n"
-"\n"
-"Les options principales de Yaboot sont :\n"
-"\n"
-" * Message Init : un message texte apparaît l'invite de démarrage ;\n"
-"\n"
-" * Périphérique de démarrage (« Boot ») : indique où vous voulez placer\n"
-"l'information nécessaire pour démarrer GNU/Linux. Généralement, il est\n"
-"préférable de créer une partition bootstrap avant l'installation pour\n"
-"contenir cette information ;\n"
-"\n"
-" * Délai Open Firmware : contrairement à LILO, deux délais sont disponibles\n"
-"pour yaboot. Le premier se mesure en secondes et à cette étape, vous pouvez\n"
-"choisir entre le CD, l'amorçage OF (Open Firmware), MacOS ou Linux ;\n"
-"\n"
-" * Expiration du démarrage du noyau (« Kernel Boot Timeout » : cette\n"
-"expiration de temps est similaire au délai de démarrage de LILO. Après\n"
-"avoir choisi Linux, il y aura un délai de 0,1 secondes avant que le noyau\n"
-"par défaut soit choisi ;\n"
-"\n"
-" * Activer le démarrage via un CD ? : en cochant cette option, vous pourrez\n"
-"choisir l'option « C » pour démarrer avec un CD lors de la première invite\n"
-"de démarrage ;\n"
-"\n"
-" * Activer le démarrage OF ? : en choisissant cette option, vous pourrez\n"
-"sélectionner la touche « N » pour activer Open Firmware lors de la première\n"
-"invite de démarrage ;\n"
-"\n"
-" * OS par défaut : vous pouvez choisir le système d'exploitation qui\n"
-"démarrera par défaut lorsque le délai de temps attribué à Open Firmware\n"
-"expire."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:926
-#, c-format
-msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 "« %s » : si une carte son a été détectée, elle apparaîtra ici. Si vous\n"
 "remarquez que la carte configurée n'est pas celle qui se trouve\n"
-"effectivement sur votre système, vous pouvez cliquer sur le bouton pour en\n"
-"choisir une autre."
+"effectivement sur votre système, vous pouvez cliquer sur le bouton pour\n"
+"choisir un pilote différent ."
 
-#: 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 "Carte son"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:932
+#: 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"
@@ -5748,28 +5576,31 @@ 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 ""
 "On vous présente ici diverses informations sur la configuration actuelle.\n"
 "Selon le matériel installé, certaines entrées seront présentes et d'autres\n"
-"pas. Chaque paramètre est constitué du nom de la configuration, suivi d'un\n"
+"pas. Chaque paramètre est constitué du nom du matériel installé, suivi d'un\n"
 "cours résumé de la configuration actuelle. Cliquez sur le bouton « %s »\n"
-"correspondant pour changer cela.\n"
+"correspondant pour effectuer un changement.\n"
 "\n"
 " * « %s » : vérifiez la configuration choisie pour le clavier.\n"
 "\n"
-" * « %s » : vérifiez la section du pays. Si vous ne vous trouvez pas dans\n"
+" * « %s » : vérifiez la sélection du pays. Si vous ne vous trouvez pas dans\n"
 "ce pays, cliquez sur le bouton « %s » et choisissez le bon. Si votre pays\n"
 "ne se trouve pas dans la première liste, cliquez sur « %s » pour avoir la\n"
 "liste complète.\n"
 "\n"
 " * « %s » : DrakX, par défaut, configure le fuseau horaire selon le pays\n"
-"dans lequel vous vous trouvez.\n"
+"dans lequel vous vous trouvez. Cliquez sur le bouton « %s » si ce n'est pas\n"
+"le bon.\n"
 "\n"
 " * « %s » : pour vérifier la configuration actuelle de la souris. Cliquez\n"
 "sur le bouton pour modifier les options.\n"
@@ -5781,23 +5612,29 @@ msgstr ""
 "\n"
 " * « %s » : si une carte son a été détectée, elle apparaîtra ici. Si vous\n"
 "remarquez que la carte configurée n'est pas celle qui se trouve\n"
-"effectivement sur votre système, vous pouvez cliquer sur le bouton pour en\n"
-"choisir une autre.\n"
-"\n"
-" * « %s » : par défaut, DrakX configure votre interface graphique avec une\n"
-"résolution de « 800x600 » ou « 1024x768 ». Si cela ne vous convient pas,\n"
-"cliquez sur « %s » pour changer la configuration de votre interface\n"
-"graphique.\n"
+"effectivement sur votre système, vous pouvez cliquer sur le bouton pour\n"
+"choisir un pilote différent .\n"
 "\n"
 " * « %s » : si une carte d'entrée/sortie vidéo (carte TV) a été détectée,\n"
 "elle apparaîtra ici. Si vous avez une carte TV et qu'elle n'a pas été\n"
 "détectée, cliquez sur ce bouton pour la configurer à la main.\n"
 "\n"
 " * « %s » : si une carte RNIS (ISDN) est détectée, elle apparaîtra ici.\n"
-"Vous pouvez cliquer sur le bouton pour en modifier les paramètres.\n"
+"Vous pouvez cliquer sur le bouton « %s » pour en modifier les paramètres si\n"
+"vous estimez que la configuration actuelle est inexacte.\n"
+"\n"
+" * « %s » : par défaut, DrakX configure votre interface graphique avec une\n"
+"résolution de « 800x600 » ou « 1024x768 ». Si cela ne vous convient pas,\n"
+"cliquez sur « %s » pour changer la configuration de votre interface\n"
+"graphique.\n"
 "\n"
 " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
-"local dès maintenant.\n"
+"local dès maintenant. Lisez la documentation fournie ou éxécutez\n"
+"Mandrakelinux Control Center après l'installation pour avoir droit à une\n"
+"aide complète en ligne.\n"
+"\n"
+" * « %s » : permet de configurer les adresses proxy HTTP et FTP si la\n"
+"machine que vous installez se trouve derrière un serveur proxy.\n"
 "\n"
 " * « %s » : il vous est ici proposé de redéfinir votre niveau de sécurité\n"
 "tel que défini dans une étape précédente ().\n"
@@ -5808,66 +5645,65 @@ msgstr ""
 "pour plus de renseignements.\n"
 "\n"
 " * « %s » : si vous souhaitez changer la configuration par défaut de votre\n"
-"chargeur de démarrage. À réserver aux utilisateurs expérimentés.\n"
+"chargeur de démarrage. À réserver aux utilisateurs expérimentés. Lisez la\n"
+"documentation fournie ou l'aide en ligne sur la configuration de chargeur\n"
+"de démarrage présente dans Mandrakelinux Control Center.\n"
 "\n"
 " * « %s » : vous pourrez ici contrôler finement les services disponibles\n"
 "sur votre machine. Si vous envisagez de monter un serveur, c'est une bonne\n"
 "idée de vérifier cette configuration."
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Clavier"
-
-#: 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 "Fuseau horaire"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Interface graphique"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Carte TV"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Carte RNIS"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Interface graphique"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Réseau"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Proxys"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Niveau de sécurité"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Pare Feu"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Programme d'amorçage"
 
-#: 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 "Services"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5878,9 +5714,7 @@ msgstr ""
 "GNU/Linux. Soyez prudent, toute l'information stockée sur le disque sera\n"
 "détruite."
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5898,7 +5732,17 @@ msgstr ""
 "\n"
 "Cliquez sur « %s » pour renoncer à cette opération sans perdre de données."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Suivant ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Précédent"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5910,12 +5754,86 @@ msgstr ""
 "n'est plus à jour par rapport à votre périphérique d'installation (veuillez "
 "créer une disquette d'amorçage plus récente)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Vous devez aussi formater %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 ""
+"Les média d'installation suivants ont été trouvés.\n"
+"Si vous ne désirez pas utiliser certains d'entre eux, vous pouvez les "
+"déselectionner maintenant."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Possédez-vous d'autres média supplémentaires ?"
+
+#. -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 ""
+"Les média suivants ont été trouvés et seront utilisés durant "
+"l'installation : %s.\n"
+"\n"
+"\n"
+"Possédez-vous un média supplémentaire d'installation à configurer ?"
+
+#: 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 "Réseau (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Réseau (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Aucun périphérique trouvé"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Insérez le CD"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Insérez le CD 1 à nouveau"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "URL du miroir ?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Ne peut trouver le fichier hdlist sur ce miroir"
+
+#. -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"
@@ -5937,9 +5855,10 @@ msgstr ""
 "vous devrez effectuer une mise à jour le plus rapidement possible.\n"
 "\n"
 "\n"
-"Confirmez vous l'installation de ces serveurs ?\n"
+"Confirmez-vous l'installation de ces serveurs ?\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"
@@ -5953,17 +5872,17 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement les désinstaller ?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Insérez une disquette formatée en FAT (format DOS/Windows) %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Cette disquette n'est pas au format DOS/Windows"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5972,12 +5891,17 @@ msgstr ""
 "Pour utiliser cette sauvegarde de sélection des paquetages, veuillez "
 "redémarrer l'installation avec la commande « 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 "Erreur lors de la lecture du fichier %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 "
@@ -5986,12 +5910,12 @@ msgstr ""
 "Une erreur est survenue : aucun périphérique valide n'a été trouvé pour\n"
 "créer de nouvelles partitions. Veuillez vérifier votre matériel."
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Installation du système"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Configuration du système"
@@ -6028,7 +5952,7 @@ msgstr ""
 "\n"
 "Désirez-vous tout de même continuer ?"
 
-#: 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 "Vous devez disposer d'une partition FAT montée en /boot/efi"
@@ -6089,7 +6013,7 @@ msgstr "Quelle partition désirez-vous redimensionner ?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "Le programme de redimensionnement des partitions FAT ne peut gérer votre\n"
 "partition. L'erreur suivante est survenue : %s"
@@ -6110,7 +6034,8 @@ msgstr ""
 "et lancez le programme de défragmentation « defrag »,\n"
 "puis relancez l'installation de 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"
@@ -6131,63 +6056,63 @@ msgstr ""
 "fait, vous devriez tout d'abord quitter l'installation, lancer\n"
 "« chkdsk c: » depuis la ligne de commande sous Windows (attention, le\n"
 "programme graphique « scandisk » n'est pas suffisant, utilisez\n"
-"réellement « chkdsk » depuis la ligne de commande!), éventuellement\n"
+"réellement « chkdsk » depuis la ligne de commande ! ), éventuellement\n"
 "exécutez defrag, puis recommencez l'installation. Vous devriez\n"
 "également sauvegarder vos données.\n"
 "Si vous êtes sûr de vous, cliquez sur OK."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Quelle taille désirez-vous allouer à Windows sur la"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partition %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Calcul des limites du système de fichiers de Windows en cours"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Le redimensionnement de la partition FAT a échoué : %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 ""
 "Il n'y a aucune partition FAT à redimensionner (ou trop peu d'espace est "
 "disponible)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Supprimer Microsoft 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 ""
 "Vous possédez plus d'un disque dur.\n"
-"Sur lequel désirez vous installer Linux ?"
+"Sur lequel désirez-vous installer 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 ""
 "TOUTES les partitions et les données présentes sur le disque %s seront "
 "perdues"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Utiliser fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -6198,32 +6123,33 @@ msgstr ""
 "Lorsque vous aurez terminé, n'oubliez pas d'enregistrer vos\n"
 "modifications en appuyant sur la touche « w »."
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Pas de place disponible pour l'installation"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "L'assistant de partitionnement a trouvé les solutions suivantes :"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Le partitionnement a échoué : %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Démarrage de l'interface réseau..."
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Arrêt de l'interface réseau..."
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -6241,7 +6167,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 "
@@ -6263,7 +6189,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"
@@ -6271,14 +6197,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"
@@ -6308,10 +6234,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"
@@ -6322,11 +6248,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"
@@ -6342,7 +6268,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
@@ -6358,7 +6284,7 @@ msgstr ""
 "\n"
 "Veuillez lire attentivement le présent document. Ce document constitue \n"
 "un contrat de licence entre vous (personne physique ou personne morale) et \n"
-"MandrakeSoft S.A. portant sur les Logiciels.\n"
+"Mandrakesoft S.A. portant sur les Logiciels.\n"
 "Le fait d'installer, de reproduire ou d'utiliser les Logiciels de quelque \n"
 "manière que ce soit indique que vous reconnaissez avoir préalablement eu \n"
 "connaissance et que vous acceptez de vous conformer aux termes et "
@@ -6380,7 +6306,7 @@ msgstr ""
 "\n"
 "Les Logiciels et la documentation qui les accompagne sont fournis en "
 "l'état \n"
-"et sans aucune garantie. MandrakeSoft S.A. décline toute responsabilité \n"
+"et sans aucune garantie. Mandrakesoft S.A. décline toute responsabilité \n"
 "découlant d'un dommage direct, spécial, indirect ou accessoire, de quelque \n"
 "nature que ce soit, en relation avec l'utilisation des Logiciels, "
 "notamment \n"
@@ -6388,13 +6314,13 @@ msgstr ""
 "bénéfices, interruptions d'activité, pertes d'informations commerciales ou \n"
 "autres pertes pécuniaires, ainsi que des éventuelles condamnations et \n"
 "indemnités devant être versées par suite d'une décision de justice, et ce \n"
-"même si MandrakeSoft S.A. a été informée de la survenue ou de \n"
+"même si Mandrakesoft S.A. a été informée de la survenue ou de \n"
 "l'éventualité de tels dommages.\n"
 "\n"
 "AVERTISSEMENT QUANT À LA DÉTENTION OU L'UTILISATION DE LOGICIELS \n"
 "PROHIBÉS DANS CERTAINS PAYS \n"
 "\n"
-"En aucun cas, ni MandrakeSoft S.A. ni ses fournisseurs ne pourront être \n"
+"En aucun cas, ni Mandrakesoft S.A. ni ses fournisseurs ne pourront être \n"
 "tenus responsable à raison d'un préjudice spécial, direct, indirect ou \n"
 "accessoire, de quelque nature que ce soit (notamment et de façon non \n"
 "limitative les pertes de bénéfices, interruptions d'activité, pertes \n"
@@ -6418,9 +6344,9 @@ msgstr ""
 "régissent. Veuillez lire et agréer les termes et conditions des licences \n"
 "accompagnant chacun d'entre eux avant de les utiliser. Toute question \n"
 "concernant la licence d'un Logiciel est à soumettre à l'auteur (ou à ses\n"
-"représentants) du Logiciel et non à MandrakeSoft. \n"
-"Les programmes conçus par MandrakeSoft sont régis par la licence GPL. \n"
-"La documentation rédigée par MandrakeSoft fait l'objet d'une licence \n"
+"représentants) du Logiciel et non à Mandrakesoft. \n"
+"Les programmes conçus par Mandrakesoft sont régis par la licence GPL. \n"
+"La documentation rédigée par Mandrakesoft fait l'objet d'une licence \n"
 "spécifique. Veuillez vous référez à la documentation pour obtenir plus \n"
 "de précisions.\n"
 "\n"
@@ -6432,7 +6358,7 @@ msgstr ""
 "des droits de propriété intellectuelle et de copyright applicables aux "
 "Logiciels.\n"
 "Les marques « Mandrake » et « Mandrakelinux » ainsi que les \n"
-"logotypes associés sont déposés par MandrakeSoft S.A. \n"
+"logotypes associés sont déposés par Mandrakesoft S.A. \n"
 "\n"
 "\n"
 "5. Dispositions diverses\n"
@@ -6443,11 +6369,11 @@ msgstr ""
 "dispositions, qui recevront leurs pleins effets. Le contrat de licence \n"
 "est soumis à la Loi française. Toute contestation relative aux présentes \n"
 "dispositions sera réglée préalablement par voie amiable. A défaut d'accord\n"
-"avec MandrakeSoft S.A., les tribunaux compétents de Paris seront saisis du \n"
+"avec Mandrakesoft S.A., les tribunaux compétents de Paris seront saisis du \n"
 "litige. Pour toute question relative au présent document, veuillez \n"
-"contacter MandrakeSoft S.A.\n"
+"contacter 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"
@@ -6458,7 +6384,7 @@ msgid ""
 "patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
-"Attention: les logiciels libres ne sont pas forcément exempts de licence et "
+"Attention : les logiciels libres ne sont pas forcément exempts de licence et "
 "certains\n"
 "logiciels libres peuvent être couverts par des brevets dans votre pays. Par "
 "exemple, les\n"
@@ -6468,7 +6394,8 @@ msgstr ""
 "une licence\n"
 "peut vous être demandés, vérifiez les lois en vigueurs dans votre pays."
 
-#: 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"
@@ -6533,7 +6460,7 @@ msgstr ""
 "droits de propriété intellectuelle et de copyright applicables aux "
 "logiciels.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6565,32 +6492,32 @@ msgstr ""
 "Des informations sur la configuration de votre système sont \n"
 "disponibles dans le Guide de l'Utilisateur de 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 "Point de montage en double : %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 ""
 "Quelques paquetages importants n'ont pas été correctement installés. Il se\n"
 "peut que le lecteur de CD-Rom ou le CD-Rom lui-même soit défectueux. Vous\n"
 "pouvez vous assurer du bon état de ce dernier en exécutant la commande "
 "suivante\n"
-"sur un ordinateur fonctionnant correctement : « rpm -qpl Mandrake/RPMS/*."
-"rpm »\n"
+"sur un ordinateur fonctionnant correctement : « rpm -qpl media/main/*.rpm »\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Aucun lecteur de disquette disponible"
@@ -6600,7 +6527,7 @@ msgstr "Aucun lecteur de disquette disponible"
 msgid "Entering step `%s'\n"
 msgstr "Démarrage de l'étape « %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"
@@ -6613,93 +6540,93 @@ msgstr ""
 "essayer de procéder à une installation en mode texte. Pour cela, appuyez\n"
 "sur la touche « F1 » après l'amorçage sur CD-Rom puis entrez « 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 "Sélection des groupes de paquetages"
 
-#: 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 "Taille totale : %d / %d Mo"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Mauvais paquetage"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Version :"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Taille : "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Ko\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Importance : "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Vous ne pouvez pas sélectionner/désélectionner ce paquetage"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "parce que %s manque"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "car %s n'est pas résolu"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "Tentative de promouvoir %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "afin de conserver %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"
 msgstr "Il n'y a pas assez de place pour installer ce paquetage"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Les paquetages suivants vont être installés"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Les paquetages suivants vont être désinstallés"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ce paquetage est nécessaire, vous ne pouvez pas le désélectionner"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Vous ne pouvez pas désélectionner ce paquetage. Il est déjà installé"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6708,223 +6635,225 @@ msgstr ""
 "Ce paquetage doit être mis à jour.\n"
 "Êtes-vous certain de vouloir le désélectionner ?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 "Vous ne pouvez pas désélectionner ce paquetage, il doit être mis à jour."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Montrer les paquetages sélectionnés automatiquement"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Charger/Sauver sur disquette"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Mise à jour de la sélection des paquetages"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Installation minimale"
 
-#: 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 "Choisissez les paquetages que vous voulez installer"
 
-#: 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 "Installation"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Pas de détails"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Estimation en cours"
 
-#: 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 "Veuillez patienter, préparation de l'installation..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Pas de détails"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d paquetages"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Installation du paquetage %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 "Refuser"
 
-#: 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 ""
-"--Changement de CD-Rom--\n"
-"\n"
-"Veuillez insérer le CD-Rom nommé « %s »,\n"
-"puis cliquez sur « OK ».\n"
-"\n"
+"Changez de CD-Rom !\n"
+"Veuillez insérer le CD-Rom nommé « %s » dans votre lecteur puis cliquez sur "
+"« OK ».\n"
 "Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien "
 "installer à partir de ce 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 "Erreur lors du tri des paquetages :"
 
-#: 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 "Souhaitez-vous tout de même continuer ?"
 
-#: 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 "Erreur lors de l'installation des paquetages :"
 
-#: 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 "non configuré"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
-msgstr "Désirez-vous restaurer votre système?"
+msgstr "Désirez-vous restaurer votre système ?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Licence"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Notes de version"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Veuillez choisir votre type de clavier."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Voici la liste complète des claviers disponibles"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installation/Mise à jour"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Désirez-vous faire une installation ou une mise à jour ?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clef de chiffrement pour %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Veuillez choisir le type de votre souris."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Port souris"
 
-#: 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 "Veuillez choisir le port série sur lequel votre souris est connectée."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Émulation des boutons"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Émulation du bouton n° 2"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Émulation du bouton n° 3"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "Configuration des cartes 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 "Configuration 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 "Aucune partition disponible"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Examen des partitions afin d'identifier les points de montage"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Choix des points de montage"
 
-#: 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 "
@@ -6936,17 +6865,17 @@ msgstr ""
 "de\n"
 "créer la partition d'amorçage avec DiskDrake."
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Sélectionnez les partitions que vous souhaitez formater"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Vérifier la présence de secteurs endommagés ?"
 
-#: 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, "
@@ -6955,36 +6884,49 @@ msgstr ""
 "Erreur à la vérification du système de fichiers %s. Souhaitez-vous corriger "
 "les erreurs ? (attention, vous pouvez perdre des données)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 "La partition d'échange (swap) est insuffisante pour achever l'installation, "
 "veuillez en ajouter."
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "Recherche des paquetages disponibles et reconstruction de la base de données "
 "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 "Recherche des paquetages disponibles..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Recherche des paquetages déjà installés..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Recherche des paquetages à mettre à jour..."
 
-#: 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 ""
+"Connexion au site Web de Mandrakelinux pour obtenir la liste des serveurs "
+"miroirs disponibles..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Choisissez un serveur miroir d'où télécharger les paquetages"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6993,7 +6935,7 @@ msgstr ""
 "Votre système ne dispose pas d'assez d'espace libre pour l'installation ou "
 "la mise à jour (%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"
@@ -7006,42 +6948,42 @@ msgstr ""
 "Le format est le même que celui des disquettes générées pour l'installation "
 "automatisée."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Charger à partir d'une disquette..."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Sauvegarder sur disquette..."
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Sélection des paquetages"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Chargement depuis la disquette..."
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Insérez une disquette contenant une sélection de paquetages."
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La taille sélectionnée est plus importante que la place disponible"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Type d'installation"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -7050,22 +6992,22 @@ msgstr ""
 "Vous n'avez sélectionné aucun groupe de paquetages.\n"
 "Veuillez choisir l'installation minimale désirée :"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Avec la documentation de base (recommandé !)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installation vraiment minimale (et en particulier pas d'urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Tout"
 
-#: 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"
@@ -7076,17 +7018,17 @@ msgstr ""
 "Si vous n'en possédez aucun, cliquez sur « Annuler ».\n"
 "Sinon, désélectionnez ceux que vous n'avez pas, puis cliquez sur « OK »."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-Rom « %s »"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Préparation de l'installation"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -7095,19 +7037,17 @@ msgstr ""
 "Installation du paquetage %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuration post-installation"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Insérez la disquette de mise à jour de modules dans le lecteur %s"
 
-# I added an example (install on a networked machine, and the server is connected to the Internet).
-# / J'ai rajouté un exemple (voir texte) car cela me semble plus clair comme çà.
-#: 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"
@@ -7117,7 +7057,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 ""
 "Vous avez maintenant la possibilité de télécharger les mises à jour\n"
 "créées depuis la sortie de cette distribution. Il peut y avoir des "
@@ -7128,85 +7068,72 @@ msgstr ""
 "\n"
 "Souhaitez-vous installer les mises à jour ?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Connexion au site Web de Mandrakelinux pour obtenir la liste des serveurs "
-"miroirs disponibles..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Choisissez un serveur miroir d'où télécharger les paquetages"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Téléchargement de la liste des paquetages disponibles..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Impossible d'accéder au miroir %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Désirez-vous essayer à nouveau ?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Quelle est votre fuseau horaire ?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Synchronisation automatique de l'horloge (via NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "Serveur NTP"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Résumé"
 
-#: 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 "Système"
 
-#: 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 "Matériel"
 
-#: 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 "Serveur CUPS distant"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Pas d'imprimante"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Possédez-vous une carte son ISA ?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7215,99 +7142,94 @@ msgstr ""
 "Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la "
 "carte son"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Aucune carte son détectée. Essayez avec « harddrake » après l'installation"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface graphique"
 
-#: 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 "Réseau et Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Proxys"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "configuré"
 
-#: 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 "Sécurité"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "activé"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "désactivé"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Partition de démarrage"
 
 #. -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 sur %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 "Services : %d activés sur %d enregistrés"
 
-#: 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 ""
-"Vous n'avez pas configuré le serveur d'affichage (XFree86). Êtes-vous sûr de "
-"ce que vous faites ?"
+"Vous n'avez pas configuré le serveur d'affichage (X11). Êtes-vous sûr de ce "
+"que vous faites ?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 "Paramétrez le mot de passe root et les méthodes authentification réseau"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Mot de passe 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 "Ce mot de passe est trop court (minimum %d caractères)"
 
-#: 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 "Authentification"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Préparation du programme d'amorçage..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7321,12 +7243,12 @@ msgstr ""
 "L'installation va continuer, mais vous aurez besoin de « BootX » ou\n"
 "d'une autre méthode pour démarrer votre machine."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Désirez-vous utiliser « aboot » ?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7336,38 +7258,7 @@ msgstr ""
 "Désirez-vous forcer l'installation au risque de détruire la\n"
 "première partition du disque ?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Installation du programme d'amorçage..."
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"L'installation du programme d'amorçage a échoué pour la raison suivante :"
-
-#: 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 ""
-"Vous aurez peut-être besoin de changer le périphérique d'amorçage\n"
-"de l'OpenFirmware pour activer le programme d'amorçage. Si vous\n"
-"ne voyez pas apparaître l'invite du programme d'amorçage lorsque\n"
-"vous redémarrerez, appuyez sur Command-Option-O-F au démarrage et\n"
-"entrez :\n"
-"setenv boot-device %s,\\\\:tbxi\n"
-"Puis tapez : shut-down\n"
-"Au prochain démarrage vous devriez voir apparaître l'invite du\n"
-"programme d'amorçage."
-
-#: 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 "
@@ -7376,22 +7267,22 @@ msgstr ""
 "A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera "
 "restreint à l'administrateur."
 
-#: 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 "Insérez une disquette vierge dans le lecteur %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Insérez une autre disquette, pour la disquette des pilotes"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Création de la disquette d'auto-installation..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7402,12 +7293,12 @@ msgstr ""
 "\n"
 "Souhaitez-vous vraiment quitter maintenant ?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Créer une disquette d'auto-installation"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7427,7 +7318,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Installation de 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 "
@@ -7440,17 +7332,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
+#: 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 "Ajouter"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Modifier"
+
+#: 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 "Enlever"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Basique"
 
-#: 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 "Terminer"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Faire"
@@ -7529,572 +7441,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Revalider"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Tchèque (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Allemand"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak standard"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "Espagnol"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Finlandais"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Français"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Norvégien"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polonais"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Russe"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Suédois"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Anglais (Angleterre)"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "Américain (États-Unis)"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albanais"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Arménien (ancien)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Arménien (machine à écrire)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Arménien (phonétique)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arabe"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbaïdjanais (latin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Belge"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Bengale"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Bulgare (phonétique)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Bulgare (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brésilien"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosniaque"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Blélorusse"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Suisse (allemand)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Suisse (français)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Tchèque (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Allemand (sans touches mortes)"
 
-#: 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 "Danois"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak américain"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak norvégien"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak suédois"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estonien"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Géorgien (disposition russe)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Géorgien (disposition latine)"
 
-#: 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 (polytonic)"
 
-#: 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 "Hongrois"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Croate"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irlandais"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Israélien"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Israélien (phonétique)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iranien"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Islandais"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Italien"
 
-#: 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 "Japonais 106 touches"
 
-#: 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 "Coréen"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Clavier Kirghiz"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Latino-américain"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laotien"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lituanien (AZERTY, ancien modèle)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lituanien (AZERTY, nouveau modèle)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Lituanien « ligne de nombres » QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituanien « phonétique » QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Letton"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macédonien"
 
-#: 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 "Mongolien (cyrillique)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltais (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltais (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Hollandais"
 
-#: 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 "Polonais (QWERTY)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polonais (QWERTZ)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Portugais"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Canadien (Québec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Roumain (QWERTZ)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Roumain (QWERTY)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Russe (phonétique)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (norvégien)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (Suédois/Finnois)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Slovénien"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Slovaque (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Slovaque (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbe (cyrillique)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syriaque"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Syriaque (phonétique)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Telegu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Tamoul (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamoul (façon machine à écrire)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Thaïlandais"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Tadjik"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Turc (modèle traditionnel « F »)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Turc (modèle moderne « Q »)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ukrainien"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Américain (international)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Ouzbékistanais (cyrillique)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamien « colonne numérique » QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Yougoslave (latin)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Touche Alt droite"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
-msgstr "Deux touches Shift simultanément"
+msgstr "Deux touches Maj simultanément"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
-msgstr "Touches <Ctrl> et <Maj> simultanément"
+msgstr "Touches Ctrl et Maj simultanément"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "Touche CapsLock (verrouillage majuscule)"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Touches Maj et CapsLock (verrouillage majuscule) simultanément"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Touches Ctrl et Alt simultanément"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
-msgstr "Touches Alt et Shift simultanément"
+msgstr "Touches Alt et Maj simultanément"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Touche « Menu »"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Touche « Windows » gauche"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Touche « Windows » droite"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Les deux touches Contrôle simultanément"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Les deux touches Alt simultanément"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Touche Majuscule gauche"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Touche Majuscule droite"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Touche Alt gauche"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Touche Contrôle gauche"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Touche Contrôle droite"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8105,7 +8210,7 @@ msgstr ""
 "permettra de commuter entre les différents types de claviers\n"
 "(ex : latin et non latin)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8116,1164 +8221,1188 @@ msgstr ""
 "Pendant l'installation, vous devrez utiliser la touche « Ctrl » droite\n"
 "pour commuter entre les différentes configurations du clavier."
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Andorre"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Émirats Arabes Unis"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua-et-Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albanie"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Arménie"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Antilles néerlandaises"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarctique"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentine"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Samoa Américaine"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Australie"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnie Herzégovine"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbade"
 
-#: 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 "Bulgarie"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahreïn"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Bénin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermudes"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Sultanat de Brunei"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: 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 "Brésil"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Île Bouvet"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Bélarus"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Îles Cocos"
 
-#: 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 "République Centrafricaine"
 
-#: 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 "Suisse"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Îles Cook"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chili"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Cameroun"
 
-#: 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 "Chine"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colombie"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbie-Monténégro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cap-Vert"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Île Christmas"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: 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 "Danemark"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominique"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominique"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algérie"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Équateur"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estonie"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Égypte"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Érythrée"
 
-#: 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 "Espagne"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Éthiopie"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finlande"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Fidji"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Îles Malouinnes"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Micronésie"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Îles Faroe"
 
-#: 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 "Royaume-Uni"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenade"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Guyane Française"
 
-#: 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 "Groenland"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambie"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Guinée"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Guinée Équatoriale"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Géorgie du Sud et Îles Sandwich du 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 "Guinée-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 "Chine (Hong-Kong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Îles Heard et McDonald"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croatie"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haïti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Irlande"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Israël"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "Inde"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Territoire Britannique de l'océan Indien"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
-msgstr "Irak"
+msgstr "Iran"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Islande"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japon"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirghizistan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comores"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint-Kitts-et-Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Corée du Nord"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Corée"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Koweit"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Îles Caïman"
 
-#: 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 "Liban"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Sainte-Lucie"
 
-#: 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 "Lituanie"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libye"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Maroc"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "République de Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Îles Marshall"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Macédoine"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Birmanie"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Îles Mariannes du Nord"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malte"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Maurice"
 
-#: 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 "Mexique"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibie"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Nouvelle-Calédonie"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Île Norfolk"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "Népal"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Nioue"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Pérou"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Polynésie Française"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papouasie-Nouvelle-Guinée"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Pologne"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Palestine"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palaos (Les)"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Réunion, île de la"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Roumanie"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Russie"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Îles Salomon"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Soudan"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Singapour"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Sainte-Hélène"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Îles Svalbard et Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: 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 Marin"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Sénégal"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Somalie"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tomé-et-Principe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Syrie"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Îles Turks et Caïcos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Tchad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Terres Australes Françaises"
 
-#: 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 "Thaïlande"
 
-#: 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 "Turkménistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turquie"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinité-et-Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzanie"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Îles mineures des États-Unis d'Amérique"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vatican"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint-Vincent-et-les-Grenadines"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Îles Vierges (Britanniques)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Îles Vierges (US)"
 
-#: 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 et Futuna, îles"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbie-Monténégro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambie"
 
-#: 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 "Vous devriez installer les paquetages suivants : %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 "Bienvenue sur %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Points de montage circulaires %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Enlevez d'abord les volumes logiques\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "AUCUN"
@@ -9290,8 +9419,8 @@ msgstr "Vous pouvez configurer ici chaque paramètre du module."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Interface(s) détectée(s) : %s %s"
+msgid "Found %s interfaces"
+msgstr "Interface(s) détectée(s) : %s"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9346,12 +9475,12 @@ msgid "Module options:"
 msgstr "Options du module :"
 
 #. -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 "Quel pilote %s faut-il essayer ?"
 
-#: 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"
@@ -9369,17 +9498,17 @@ msgstr ""
 "(La détection peut dans certains cas bloquer l'ordinateur,\n"
 "mais sans lui causer de dommage.)"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Détection automatique"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Spécifier des options"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9438,11 +9567,11 @@ msgstr "Souris standard PS2 à molette"
 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 "Automatique"
@@ -9587,50 +9716,55 @@ msgstr "Universelle"
 msgid "Any PS/2 & USB mice"
 msgstr "N'importe quelle souris PS/2 ou 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 "Tablette Synaptics"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "aucun"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Pas de souris"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Veuillez tester votre souris"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Pour activer la souris,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "VEUILLEZ FAIRE TOURNER LA MOLETTE !"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "utiliser « pppoe »"
+msgid "use PPPoE"
+msgstr "utiliser « PPPoE »"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "utiliser « pptp »"
+msgid "use PPTP"
+msgstr "utiliser « PPTP »"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "utiliser « dhcp »"
+msgid "use DHCP"
+msgstr "utiliser « DHCP »"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel Speedtouch USB"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB "
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9639,38 +9773,40 @@ msgstr " - détecté"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem USB (avec pppoa)"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem USB (avec PPPoA)"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem USB (avec dhcp)"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem USB (avec 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 "Connexion à 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 façon la plus courante de se connecter à Internet en utilisant une ligne "
-"ADSL est d'utiliser « pppoe ».\n"
-"Certaines connexions utilisent « pptp », quelques unes se servent de "
-"« DHCP ».\n"
-"Si vous ne savez pas quoi choisir, utilisez pppoe."
+"ADSL est d'utiliser « PPPoA ».\n"
+"« DHCP » est souvent utilisé lorsque la connexion est dégroupée.\n"
+"Certaines connexions utilisent « PPPoE », quelques unes se servent de "
+"« PPTP ».\n"
+"Si votre modem a été détecté, suivez les choix par défaut qui devraient vous "
+"convenir."
 
-#: 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 "Type de connexion par ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Serveur Web"
@@ -9741,8 +9877,8 @@ msgid ""
 msgstr ""
 "Configuration de drakfirewall\n"
 "\n"
-"Ceci configure un Pare-Feu (firewall) personnel pour votre machine Mandrake "
-"Linux.\n"
+"Ceci configure un Pare-Feu (firewall) personnel pour votre machine "
+"Mandrakelinux.\n"
 "Si vous souhaitez un Pare-Feu dédié plus puissant, tournez-vous plutôt vers\n"
 "la distribution spécialisée « MandrakeSecurity »."
 
@@ -9788,7 +9924,7 @@ msgstr ""
 "Le bon format est « port/tcp » ou « port/udp », \n"
 "où le port est compris entre 1 et 65535.\n"
 "\n"
-"Vous pouvez aussi passer un intervalle de ports (par exemple: 24300:24350/"
+"Vous pouvez aussi passer un intervalle de ports (par exemple : 24300:24350/"
 "udp)"
 
 #: network/drakfirewall.pm:192
@@ -9801,106 +9937,107 @@ msgstr "Tout (pas de firewall)"
 msgid "Other ports"
 msgstr "Autres 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 "Non listé - éditer manuellement"
 
-#: 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 "Je ne sais pas"
 
-#: 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 "Manuelle"
 
-#: 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 "Choix manuel"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Carte RNIS/ISDN interne"
 
-#: 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 "Géré"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Maître"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Répéteur"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Secondaire"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Configuration manuelle"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Attribution automatique de l'adresse IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Attribution automatique de l'adresse IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocole pour le reste du monde"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocole pour l'Europe (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"
@@ -9909,163 +10046,168 @@ msgstr ""
 "Protocole pour le reste du monde \n"
 "Pas de D-Channel (lignes louées)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem USB Alcatel Speedtouch"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Protocole de Configuration Dynamique du Hôte (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Configuration TCP/IP manuelle"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protocole de Tunnel Point à Point (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP sur ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP sur 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 "Pont ethernet LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Pont ethernet VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "IP LLC routé"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "IP VC routé"
 
-#: 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 "Basée sur un 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 "Manuelle par 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 "Configuration réseau & Internet"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(détecté sur le 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 "(détecté %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(détecté)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Connexion par modem"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "Connexion par RNIS/ISDN"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "Connexion par ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Connexion par câble"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Connexion à travers un réseau local (LAN)"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Connexion sans fil"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Choisissez la connexion que vous voulez configurer"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10078,131 +10220,130 @@ msgstr ""
 "\n"
 "Cliquez sur « %s » pour continuer."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Configuration de la connexion"
 
-#: 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 "Veuillez compléter ou vérifier les champs ci-dessous"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "n° IRQ de la carte"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Plage mémoire (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 carte"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "E/S_O de la carte"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "E/S_1 de la carte"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Votre numéro de téléphone personnel"
 
-#: 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 "Fournisseur d'accès (ex. : fournisseur.fr)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Numéro de téléphone pour l'accès"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "1er DNS du fournisseur (optionnel)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "2ème DNS du fournisseur (optionnel)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Numérotation"
 
-#: 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 "Vitesse de connexion"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Temps maxi pour établir la connexion (en sec.)"
 
-#: 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 "Nom d'utilisateur du compte"
 
-#: 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 "Mot de passe du 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 "Choisissez l'interface réseau à configurer:"
+msgstr "Choisissez l'interface réseau à configurer :"
 
-#: 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 "Périphérique réseau"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem RNIS/ISDN externe"
 
-#. -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 "Sélectionnez un périphérique !"
 
-#: 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 "Configuration RNIS (ISDN)"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Quel type de carte possédez-vous ?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10218,34 +10359,48 @@ msgstr ""
 "Si vous possédez une carte PCMCIA, vous avez besoin de connaître\n"
 "les réglages « IRQ » et « IO » de votre carte.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Continuer"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Arrêter"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Parmi les choix suivants, lequel correspond à votre carte RNIS/ISDN ?"
 
-#: 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 "Pilote"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Quel protocole désirez-vous utiliser ?"
 
-#: 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 "Protocole"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10254,13 +10409,13 @@ msgstr ""
 "Veuillez choisir votre fournisseur d'accès.\n"
 "S'il ne figure pas dans la liste, choisissez « Non listé »."
 
-#: 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 "Fournisseur d'accès :"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10269,122 +10424,117 @@ msgstr ""
 "Votre modem n'est pas supporté par le système.\n"
 "Veuillez consulter http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
-msgstr "Choisissez le modem à configurer:"
+msgstr "Choisissez le modem à configurer :"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Désolé, nous ne prenons en charge que les noyaux 2.4 et ultérieurs."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Veuillez choisir le port série sur lequel votre modem est connecté."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Choisissez votre fournisseur d'accès :"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
-msgstr "Appel: Options du compte"
+msgstr "Appel : Options du compte"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Nom de la connexion"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Identifiant de connexion"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
-msgstr "Appel: Paramètres IP"
+msgstr "Appel : Paramètres IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Paramètres 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 "Adresse IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "Masque de sous-réseau"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr "Appel: Paramètres DNS"
+msgstr "Appel : Paramètres 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 domaine"
 
-#: 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 "Serveur DNS principal (optionnel)"
 
-#: 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 "Serveur DNS secondaire (optionnel)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Modifier le nom d'hôte à partir de l'adresse IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Adresse IP de la passerelle"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Configuration ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Veuillez choisir votre fournisseur d'accès ADSL."
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10395,32 +10545,32 @@ msgstr ""
 "Celui-ci peut être fourni maintenant via une disquette ou depuis votre "
 "partition Windows, ou plus tard"
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Utiliser une disquette"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Utiliser ma partition Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Le faire plus tard"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
-msgstr "La copie du firmware a échouée, fichier %s non trouvé"
+msgstr "La copie du firmware a échoué, fichier %s non trouvé"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "La copie du firmware a réussi."
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10433,22 +10583,22 @@ msgstr ""
 "%s\n"
 "et copiez le fichier mgmt.o dans /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Identifiant de Circuit Virtuel (VPI) :"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Identifiant de Chemin Virtuel (VCI) :"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Encapsulation :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10461,44 +10611,43 @@ msgstr ""
 "\n"
 "Vous pouvez trouver un pilote sur http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr "Chargement manuel d'un pilote"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
 "ATTENTION : ce périphérique a déjà été configuré pour la connexion "
 "internet.\n"
-"\n"
-"Cliquez simplement sur « OK » pour conserver sa configuration.\n"
-"Sinon la configuration actuelle sera écrasée par les modifications que vous "
-"ferez."
+"La configuration actuelle sera écrasée par les modifications que vous "
+"ferez.\n"
+"Êtes-vous vraiment sûr de vouloir reconfigurer ce périphérique ?"
 
-#: 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 "Félicitations, la configuration internet et réseau est terminée.\n"
 
-#: network/netconnect.pm:871
-#, fuzzy, c-format
+#: network/netconnect.pm:929
+#, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "Nom d'hôte ZeroConf"
+msgstr "Résolution du nom d'hôte ZeroConf"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Configuration du périphérique réseau %s (pilote %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10508,7 +10657,7 @@ msgstr ""
 "ethernet.\n"
 "Veuillez sélectionner celui que vous désirez utiliser"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10519,98 +10668,104 @@ msgstr ""
 "Chaque champ doit être rempli avec une adresse IP en notation\n"
 "décimale pointée (par exemple, 12.34.56.78)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Affecter le nom d'hôte à partir de l'adresse DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Nom d'hôte DHCP"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "Masque de sous-réseau"
 
-#: 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 "Suivre l'id. de la carte réseau (utile pour les portables)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Branchement à chaud du réseau"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Lancer au démarrage"
 
-#: 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'adresse IP doit ressembler à quelque chose comme « 192.168.1.20 »"
 
-#: 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 "Attention : l'adresse IP %s est déjà réservée !"
 
-#: 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 est déjà utilisé\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Veuillez entrer les paramètres wireless de cette carte :"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode de fonctionnement"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nom de réseau (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "Identifiant réseau"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Fréquence de fonctionnement"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Seuil de sensibilité"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taux de transfert (bits par seconde)"
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
-"La fréquence doit avoir un suffixe k, M ou G (par ex.  « 2.46G » pour "
+"La fréquence doit avoir un suffixe k, M ou G (par ex. « 2.46G » pour "
 "2,46 GHz), ou bien avoir suffisamment de zéros."
 
-#: 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 "
@@ -10619,12 +10774,12 @@ msgstr ""
 "Le débit doit avoir un suffixe k, M ou G (par ex. « 11M » pour 11Mo), ou "
 "bien avoir suffisamment de zéros."
 
-#: 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 "
@@ -10646,43 +10801,43 @@ msgstr ""
 "taille maximale de paquet désactivera ce mécanisme. Vous pouvez\n"
 "également définir ce paramètre à « auto », « fixed » ou « off »."
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentation"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 "Arguments supplémentaires\n"
 "pour la commande iwconfig"
 
-#: 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 ""
 "Ici il est possible de configurer des paramètre supplémentaires pour la "
-"carte sans-fil, tels que:\n"
+"carte sans-fil, tels que :\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick est déjà "
 "configuré via le nom d'hôte).\n"
 "\n"
-"Cf la man page de iwpconfig(8) pour plus d'informations."
+"Cf la man page de iwconfig(8) pour plus d'informations."
 
 #. -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 supplémentaires\n"
 "pour la commande iwspy"
 
-#: 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"
@@ -10702,14 +10857,14 @@ msgstr ""
 "\n"
 "C.f. la page de manuel iwspy(8) pour plus d'informations."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 "Arguments supplémentaires\n"
 "pour la commande iwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10737,29 +10892,9 @@ msgstr ""
 "indiquer comment utiliser ces commandes spécifiques à l'interface\n"
 "ainsi que leurs effets.\n"
 "\n"
-"\"C.f. la page de manuel iwpriv(8) pour plus d'informations."
-
-#: 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 ""
-"Aucune carte réseau n'a été détectée sur votre système.\n"
-"La connexion ne peut donc pas être configurée."
+"C.f. la page de manuel iwpriv(8) pour plus d'informations."
 
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Choisissez la carte réseau"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "Veuillez choisir la carte réseau qui sera connectée à Internet"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10773,92 +10908,96 @@ msgstr ""
 "Vous pouvez également indiquer l'adresse IP de la passerelle si votre réseau "
 "local en possède une."
 
-#: 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 ""
 "Enfin, vous pouvez également entrer les adresses IP de vos serveurs DNS."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nom de la machine (optionnel)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Nom d'hôte :"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "Serveur DNS 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "Serveur DNS 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "Serveur DNS 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "Domaine recherché"
 
-#: 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 ""
 "Par défaut, le domaine de recherche sera déduit du nom de machine pleinement "
 "qualifié"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Passerelle (p.ex. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Périphérique passerelle"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 "L'adresse du DNS doit ressembler à quelque chose comme « 192.168.1.20 »"
 
-#: 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'adresse de la passerelle doit ressembler à quelque chose comme "
 "« 192.168.1.20 »"
 
-#: 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 ""
-"Entrez un nom de machine zeroconf qui sera celui que votre machine donnera "
-"aux autres machines du réseau :"
+"Si vous le souhaitez, entrez un nom d'hôte Zeroconf.\n"
+"C'est le nom que votre machine utilisera pour faire connaître les\n"
+"ressources partagées qui ne sont pas gérées par un serveur sur le réseau.\n"
+"Ce n'est pas nécessaire pour la plupart des réseaux."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Nom d'hôte ZeroConf"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Le nom d'hôte zeroconf ne doit pas contenir de point"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10869,35 +11008,55 @@ msgstr ""
 "Choisissez celui que vous voulez utiliser.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Connexion 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 configuration est achevée, voulez-vous appliquer les changements ?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Désirez-vous activer la connexion lors du démarrage ?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Automatiquement au démarrage"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "En utilisant l'applette Réseau dans la boîte à miniatures"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "Manuellement (L'interface sera activé au démarrage)"
+
+#: network/netconnect.pm:1271
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "How do you want to dial this connection?"
+msgstr "Comment désirez-vous activer cettte connexion ?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Le réseau doit être redémarré. Souhaitez-vous le redémarrer ?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Configuration du réseau"
 
-#: 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 ""
@@ -10905,27 +11064,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 "Souhaitez-vous vous connecter à Internet maintenant ?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Test de votre connexion..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Le système est à présent connecté à Internet."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Pour des raisons de sécurité, il va être déconnecté maintenant."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10934,7 +11093,7 @@ msgstr ""
 "Le système ne semble pas connecté à Internet.\n"
 "Essayez de reconfigurer votre connexion."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10943,19 +11102,19 @@ msgstr ""
 "Une fois terminé, il est recommandé de redémarrer votre interface graphique, "
 "afin d'éviter les problèmes liés au changement de nom d'hôte de la machine."
 
-#: 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 ""
 "Des problèmes sont apparus pendant la configuration.\n"
-"Testez votre connexion avec le « Centre de Contrôle Mandrake » (dans la "
+"Testez votre connexion avec le « Centre de Contrôle Mandrakelinux » (dans la "
 "section « réseau ») ou la commande « net_monitor ». Si votre connexion ne "
 "fonctionne pas, vous pouvez essayer de relancer la configuration."
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10968,39 +11127,39 @@ msgstr ""
 "Cliquez sur <Ok> pour conserver votre configuration,\n"
 "ou sur <Annuler> pour reconfigurer votre connexion internet et réseau.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
-"Une erreur s'est produite:\n"
+"Une erreur s'est produite :\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Configuration des serveurs mandataires (proxy)"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Serveur mandataire HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Serveur mandataire FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "La syntaxe doit être http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
-msgstr "L'URL doit commencer par 'ftp:' ou 'http:'"
+msgstr "L'URL doit commencer par « ftp: » ou « http: »"
 
 #: network/shorewall.pm:28
 #, c-format
@@ -11016,7 +11175,7 @@ msgstr ""
 "Attention ! Une configuration existante du Pare-Feu a été détectée. Vous "
 "devrez peut-être modifier la configuration manuellement après l'installation."
 
-#: 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"
@@ -11029,17 +11188,17 @@ msgstr ""
 "Veuillez entrer le nom de l'interface par laquelle vous êtes connecté à "
 "Internet.\n"
 "\n"
-"Exemples:\n"
+"Exemples :\n"
 "\t\tppp+ pour une connection ADSL ou un modem,\n"
 "\t\teth0 ou eth1 pour connection par cable,\n"
 "\t\tippp+ pour une connection RNIS.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Insérez une disquette"
 
-#: 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 "
@@ -11048,24 +11207,24 @@ msgstr ""
 "Insérez une disquette formatée en FAT dans le lecteur %s avec %s dans\n"
 "le répertoire racine, puis appuyez sur %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 "Erreur lors de l'accès à la disquette, impossible de monter le périphérique %"
 "s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "Le montage a échoué : "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Les partitions étendues ne sont pas supportée par cette plateforme"
 
-#: 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"
@@ -11076,22 +11235,22 @@ msgstr ""
 "inutilisable. La seule solution est de déplacer vos partitions primaires\n"
 "de telle façon que cet espace soit placé contre les partitions étendues."
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Restauration impossible depuis le fichier %s : %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Mauvais fichier de sauvegarde"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erreur d'écriture dans le fichier %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11104,27 +11263,27 @@ msgstr ""
 "échoué.\n"
 "Cela signifie que serez victime de pertes aléatoires de données."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "obligatoire"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "important"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "très utile"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "utile"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "éventuellement"
@@ -11139,7 +11298,7 @@ msgstr "(sur %s)"
 msgid "(on this machine)"
 msgstr "(sur cette machine)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Configurées sur d'autres machines"
@@ -11149,296 +11308,306 @@ msgstr "Configurées sur d'autres machines"
 msgid "On CUPS server \"%s\""
 msgstr "Sur serveur 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 " (Défaut)"
 
-#: 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 Nouvelle Génération"
 
-#: 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 (serveur distant)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "CUPS distant"
+
 #: 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 "Modèle inconnu"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Imprimante locale"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Imprimante distante"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Imprimante sur serveur CUPS distant"
 
-#: 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 "Imprimante sur serveur LPD distant"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Imprimante réseau autonome (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Imprimante sur serveur SMB (Windows 95/98/NT)"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Imprimante sur serveur 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 "Indiquer l'adresse du périphérique d'impression"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Impression vers une commande shell"
 
-#: 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 "Modèle inconnu"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Configurées(s) sur cette machine"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " sur port parallèle %s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", imprimante USB %s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", imprimante USB"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", périphérique multifonction sur le port parallèle %s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", périphérique multifonction sur port parallèle"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", périphérique USB multifonction"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", périphérique HP JetDirect multifonction"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", périphérique multifonction"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", impression sur %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " sur serveur d'impression LPD « %s », imprimante « %s »"
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", hôte TCP/IP « %s », port « %s »"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " sur serveur Windows « %s », partage « %s »"
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " sur serveur Novell « %s », imprimante « %s »"
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", en utilisant la commande %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Port parallèle %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 "Imprimante USB %s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "Imprimante USB"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Périphérique multifonction sur le port parallèle %s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Périphérique multifonction sur port parallèle"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Périphérique USB multifonction"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Périphérique HP JetDirect multifonction"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Périphérique multifonction"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Impression sur %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Serveur d'impression LPD « %s », imprimante « %s »"
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Hôte TCP/IP « %s », port « %s »"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Serveur SMB/Windows « %s », partage « %s »"
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Serveur Novell « %s », imprimante « %s »"
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "En utilisant la commande %s"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
-msgstr "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 "Imprimante à accès direct (pas de pilote)"
 
-#: 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 "Réseaux locaux"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interface « %s »"
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Réseau %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Hôte %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"
@@ -11451,12 +11620,12 @@ msgstr ""
 "printer. Il sera récupéré par le script de chargement et envoyé vers "
 "l'imprimante à chaque mise sous tension.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Configuration de l'imprimante 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 "
@@ -11466,55 +11635,50 @@ msgstr ""
 "doivent être accessibles depuis des machines distantes, et quelles machines "
 "pourront y accéder."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 "Vous pouvez aussi décider ici si les imprimantes des machines distantes "
-"seront rendues  automatiquement disponibles sur cette machine."
+"seront rendues automatiquement disponibles sur cette machine."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr ""
 "Les imprimantes de cette machine sont disponibles aux autres ordinateurs"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 "Trouver automatiquement des imprimantes disponibles sur des machines "
 "distantes."
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Partage d'imprimante sur les hôtes/réseaux :"
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "configuration personnalisée"
 
-#: 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 "Pas de machine distante"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Serveurs CUPS additionnels :"
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Aucun"
-
-#: 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 "
@@ -11527,7 +11691,7 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 "Pour obtenir l'accès aux imprimantes situées sur des serveurs CUPS distants "
-"de votre réseau local, vous avez seulement besoin d'activer l'option  "
+"de votre réseau local, vous avez seulement besoin d'activer l'option "
 "« Trouver automatiquement des imprimantes disponibles sur des machines "
 "distantes ». Les serveurs CUPS informent votre machine automatiquement sur "
 "leurs imprimantes. Toutes les imprimantes actuellement connues par votre "
@@ -11537,20 +11701,20 @@ msgstr ""
 "leur numéro de port, afin d'obtenir des informations sur les imprimantes qui "
 "y sont connectées."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Mode d'impression du texte japonais"
 
-#: 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 ""
 "Activer ceci permet d'imprimer des fichiers textes purs en japonais. "
@@ -11561,12 +11725,12 @@ msgstr ""
 "imprimer en japonais à partir d'une machine distante, vous devrez activer "
 "cette option sur la machine distante."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Correction automatique de la configuration du serveur 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 "
@@ -11594,12 +11758,38 @@ msgstr ""
 "Si cette option vous conduit à des problèmes, désactivez-la, mais faites "
 "alors attention aux points ci-dessus."
 
-#: 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 "Serveur CUPS distant et pas de démon CUPS local"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "Activé"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Désactivé"
+
+#: 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 "Partage d'imprimantes locales"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11608,29 +11798,29 @@ msgstr ""
 "Voici les machines et les réseaux à partir desquels les imprimantes locales "
 "seront disponibles :"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Ajouter un hôte/réseau"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Modifier l'hôte/réseau sélectionné"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Supprimer l'hôte/réseau sélectionné"
 
-#: 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 "Adresse IP de l'hôte/réseau :"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11639,32 +11829,32 @@ msgstr ""
 "Choisissez l'hôte ou le réseau à partir duquel les imprimantes locales "
 "seront disponibles :"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Adresse IP de l'hôte/réseau manquante."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "L'adresse IP de l'hôte/réseau n'est pas correcte.\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'adresses 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 "Cet hôte/réseau est déjà dans la liste, il ne peut pas être rajouté.\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 aux imprimantes sur serveurs CUPS distant..."
 
-#: 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 "
@@ -11675,104 +11865,120 @@ msgstr ""
 "Vous n'avez besoin de faire cela que si les serveurs ne diffusent pas les "
 "informations de leurs imprimantes sur le réseau local."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Ajouter un serveur"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Modifier le serveur sélectionné"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Supprimer le serveur sélectionné"
 
-#: 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 ""
 "Entrez l'adresse IP et le numéro de port de la machine dont vous voulez "
 "utiliser les imprimantes."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "631 sera le port utilisé par défaut"
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Adresse IP du serveur manquante !"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "L'adresse IP n'est pas correcte.\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 "Le numéro de port doit être un nombre entier !"
 
-#: 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 "Ce serveur est déjà dans la liste, il ne peut pas être rajouté.\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 "Actif, Nom ou IP du serveur distant :"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "Adresse IP ou non d'hôte du serveur CUPS manquant(e)."
+
+#: 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 "Lecture des données de l'imprimante..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "Redémarrage de CUPS..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Type de connexion de l'imprimante"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Quel est le type de connexion de l'imprimante ?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11783,7 +11989,7 @@ msgstr ""
 "Les imprimantes connectées à un serveur CUPS distant n'ont pas besoin d'être "
 "configurées ici; elles seront automatiquement détectées."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11791,10 +11997,10 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 "\n"
-"ATTENTION: Aucune connection au réseau local n'est active, les imprimantes "
+"ATTENTION : Aucune connection au réseau local n'est active, les imprimantes "
 "distantes ne peuvent donc être ni détectées ni testées !"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
@@ -11802,22 +12008,22 @@ msgstr ""
 "Autodétection d'imprimante (locale, TCP/Socket, imprimantes SMB et URI de "
 "périphériques)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Vérification de votre système..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "et une imprimante inconnue"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "et %d imprimantes inconnues"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11830,7 +12036,7 @@ msgstr ""
 "%s%s\n"
 "sont connectées directement à votre système."
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11843,7 +12049,7 @@ msgstr ""
 "%s%s\n"
 "sont connectées directement à votre système."
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11856,7 +12062,7 @@ msgstr ""
 "%s%s\n"
 "est connectée directement à votre système."
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11865,7 +12071,7 @@ msgstr ""
 "\n"
 "Il y a une imprimante inconnue connectée à votre machine"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11874,19 +12080,19 @@ msgstr ""
 "\n"
 "Il y a %d imprimantes inconnues reliées à votre machine"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 "Aucune des imprimantes trouvées n'est directement reliée à votre machine"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "(Vérifiez que toutes les imprimantes sont connectées et allumées).\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 "
@@ -11895,23 +12101,23 @@ msgstr ""
 "Souhaitez-vous permettre l'impression sur les imprimantes ci-dessus ou sur "
 "celles du réseau 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 ""
 "Souhaitez-vous activer l'impression sur les imprimantes de votre réseau ?\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 "Souhaitez-vous activer l'impression sur les imprimantes ci-dessus ?\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 "Êtes-vous sûr de vouloir définir l'impression sur cette machine ?\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 "
@@ -11920,48 +12126,42 @@ msgstr ""
 "NOTE : En fonction du modèle et du système d'impression, jusqu'à %d Mo de "
 "logiciels additionnels seront installés."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Recherche de nouvelles imprimantes..."
 
-#: printer/printerdrake.pm:713
-#, c-format
-msgid "Configuring printer ..."
-msgstr "Configuration de l'imprimante en cours..."
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Configuration en cours de l'imprimante « %s »..."
+msgid "Found printer on %s..."
+msgstr "Imprimante trouvée sur %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 " sur"
 
-#: 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 "Sélection du modèle de l'imprimante"
 
-#: 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 "Quel modèle d'imprimante possédez-vous ?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11974,7 +12174,7 @@ msgstr ""
 "Le modèle de votre imprimante %s n'a pas pu être déterminé. Veuillez choisir "
 "le modèle correct dans la liste."
 
-#: 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 "
@@ -11983,21 +12183,24 @@ msgstr ""
 "Si votre imprimante n'est pas listée, choisissez-en une compatible (voir le "
 "manuel de l'imprimante) ou similaire."
 
-#: 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 "Configuration en cours de l'imprimante sur %s ..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Configuration des programmes..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Configuration en cours de l'imprimante « %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 "Ajouter une nouvelle imprimante"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -12021,7 +12224,7 @@ msgstr ""
 "demandées; vous aurez également accès à tous les pilotes d'imprimantes "
 "disponibles ainsi qu'à toutes leurs options et à tous les types de connexion."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -12061,7 +12264,7 @@ msgstr ""
 "Cliquez sur « Suivant » quand vous êtes prêt, ou sur « Annuler » si vous ne "
 "voulez pas configurer d'imprimante(s) maintenant."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -12088,7 +12291,7 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, ou sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -12125,7 +12328,7 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, ou sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -12152,23 +12355,23 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, ou sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Détecter automatiquement les imprimantes connectées sur cette machine"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Détecter automatiquement les imprimantes reliées directement au réseau"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Détecter automatiquement les imprimantes reliées à des machines sous windows"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -12192,70 +12395,70 @@ msgstr ""
 "d'impression, etc.), rendez-vous dans la partie « imprimante »de la section "
 "« matériel » du Centre de Contrôle %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 "Impossible d'installer les paquetages %s !"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Passer l'autodetection des serveurs 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 "détection automatique d'imprimantes"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Détection des périphériques..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", imprimante réseau « %s », port « %s »"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", imprimante « %s » sur serveur SMB/Windows « %s »"
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Détecté %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 "Imprimante sur le port parallèle %s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Imprimante réseau autonome « %s », port %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Imprimante « %s » sur serveur Windows/SMB « %s »"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Imprimante locale"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12269,32 +12472,32 @@ msgstr ""
 "équivalents à LPT1:, LPT2:, ..., première imprimante USB : /dev/usb/lp0, "
 "deuxième imprimante USB : /dev/usb/lp1, ...) "
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Vous devez enter un nom de fichier ou de périphérique !"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Aucune imprimante trouvée !"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Imprimantes locales"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Imprimantes 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 "L'imprimante suivante a été détectée."
 
-#: 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 "
@@ -12303,7 +12506,7 @@ msgstr ""
 "si ce n'est pas celle que vous voulez configurer, tapez un nom de fichier ou "
 "de périphérique dans le champ d'entrée"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
@@ -12311,12 +12514,12 @@ msgstr ""
 "Sinon vous pouvez spécifier un nom de périphérique ou de fichier dans le "
 "champ d'entrée"
 
-#: 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 "Voici la liste de toutes les imprimantes auto-détectées. "
 
-#: 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 "
@@ -12325,7 +12528,7 @@ msgstr ""
 "Veuillez choisir l'imprimante que vous voulez configurer ou tapez un nom de "
 "périphérique ou de fichier dans le champ d'entrée"
 
-#: 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 "
@@ -12334,24 +12537,24 @@ msgstr ""
 "Veuillez choisir l'imprimante sur laquelle les travaux d'impression seront "
 "envoyés ou tapez un nom de périphérique ou de fichier dans le champ d'entrée"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
 "printer was not correctly detected or if you prefer a customized printer "
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
-"La configuration de cette imprimante sera effectuée automatiquement.  Si "
-"votre imprimante n'a pas été correctement détectée ou si vous préférez  "
-"effectuer une configuration personnalisée, activez « Configuration Manuelle "
-"»."
+"La configuration de cette imprimante sera effectuée automatiquement. Si "
+"votre imprimante n'a pas été correctement détectée ou si vous préférez "
+"effectuer une configuration personnalisée, activez « Configuration "
+"Manuelle »."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Il n'y a pour l'instant pas de solution alternative"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12364,14 +12567,14 @@ msgstr ""
 "pas été correctement détectée ou si vous préférez effectuer une "
 "configuration personnalisée, activez « Configuration Manuelle  »."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 "Veuillez choisir l'imprimante sur laquelle seront envoyé les travaux "
 "d'impression."
 
-#: 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 "
@@ -12380,12 +12583,12 @@ msgstr ""
 "Veuillez choisir le port sur laquelle votre imprimante est connectée ou "
 "tapez le nom du périphérique ou de fichier dans le champs d'entrée"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Veuillez choisir le port sur lequel votre imprimante est connectée."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12395,26 +12598,26 @@ msgstr ""
 "LPT2:, ..., première imprimante USB : /dev/usb/lp0, deuxième imprimante "
 "USB : /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Vous devez choisir ou entrer une imprimante ou un périphérique !"
 
-#: 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 "Annulation en cours"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Configuration d'une imprimante Unix (lpd) distante"
 
-#: 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 "
@@ -12423,63 +12626,63 @@ msgstr ""
 "Pour utiliser une imprimante Unix distante, vous devez indiquer le nom "
 "d'hôte du serveur LPD et le nom attribué à l'imprimante par ce serveur."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Nom d'hôte du serveur"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Nom de l'imprimante"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Nom du serveur distant manquant !"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Le nom de l'imprimante est manquant !"
 
-#: 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 "Informations"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Modèle détecté : %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Parcours du réseau..."
 
-#: 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 ", imprimante « %s » sur serveur « %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 "Imprimante « %s » sur serveur « %s »"
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Configuration d'une imprimante 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 "
@@ -12494,7 +12697,7 @@ msgstr ""
 "d'utilisateur, mot de passe et groupe de travail nécessaires pour accéder à "
 "l'imprimante."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12504,47 +12707,47 @@ msgstr ""
 "ajoutez un nom d'utilisateur, un mot de passe et un groupe de travail si "
 "nécessaire."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Nom du serveur"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "Adresse IP du serveur"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Nom de partage de l'imprimante"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Groupe de travail"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Auto-détecté"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Il faut au moins préciser le nom du serveur ou son adresse IP."
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Il faut préciser le nom de partage de l'imprimante."
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ALERTE DE SÉCURITÉ !"
 
-#: 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 "
@@ -12585,11 +12788,11 @@ msgstr ""
 "N'enlevez pas la protection d'un compte Utilisateur ou Administrateur.\n"
 "\n"
 "Paramétrez votre serveur Windows afin que les imprimantes soient disponibles "
-"sous le protocole LPD. Réglez ensuite l'impression de cette machine avec "
-"le type de connexion « %s » dans Printerdrake.\n"
+"sous le protocole LPD. Réglez ensuite l'impression de cette machine avec le "
+"type de connexion « %s » dans Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12602,7 +12805,7 @@ msgstr ""
 "type de connexion « %s » dans 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) "
@@ -12610,18 +12813,19 @@ msgid ""
 "\n"
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
-"Branchez votre imprimante sur un serveur Linux et laissez votre(vos) machine(s)\n"
+"Branchez votre imprimante sur un serveur Linux et laissez votre(vos) machine"
+"(s)\n"
 "Windows se connecter en tant que client(s).\n"
 "\n"
 "Souhaitez-vous vraiment poursuivre le paramétrage de cette imprimante de "
 "cette façon ?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Options de l'imprimante 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 "
@@ -12635,42 +12839,42 @@ msgstr ""
 "voulez accéder ainsi qu'un nom d'utilisateur et un mot de passe si "
 "nécessaire."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Nom du serveur d'impression"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nom de la file d'impression"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Nom du serveur NCP manquant !"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Nom de la file d'attente NCP manquant !"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", hôte « %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 "Hôte « %s », port « %s »"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Options de l'imprimante réseau (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 "
@@ -12680,7 +12884,7 @@ msgstr ""
 "nom de machine ou une adresse IP et le numéro port optionnel (9100 par "
 "défaut)."
 
-#: 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 "
@@ -12694,27 +12898,27 @@ msgstr ""
 "9100, mais cela peut être différent pour d'autres serveurs. Veuillez "
 "consulter le manuel de votre imprimante."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Nom d'hôte de l'imprimante ou adresse IP manquant(e) !"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nom d'hôte ou adresse IP de l'imprimante "
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Mise à jour de la liste des URI des Périphériques ..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Adresse réseau du périphérique d'impression"
 
-#: 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 "
@@ -12727,36 +12931,36 @@ msgstr ""
 "que tous les types d'URL ne sont pas supportés par tous les gestionnaires "
 "d'impression."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Une adresse valide doit être entrée !"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Impression vers une commande shell"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
-"Vous pouvez spécifier ici une ligne de commande dans laquelle sera "
-"redirigée  l'impression, au lieu d'être envoyée à l'imprimante."
+"Vous pouvez spécifier ici une ligne de commande dans laquelle sera redirigée "
+"l'impression, au lieu d'être envoyée à l'imprimante."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Ligne de commande"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Une ligne de commande doit être tapée !"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12767,75 +12971,75 @@ msgstr ""
 "(OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 avec scanner, DeskJet "
 "450, Sony IJP-V100), un HP PhotoSmart ou un HP LaserJet 2200 ?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Installation du paquetage HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Seul l'impression sera possible sur %s."
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Vérification du périphérique et configuration de HPOJ..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Installation des paquetages SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Scanner ne sera pas possible sur %s."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Installation des paquetages 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 à la carte mémoire photo du %s ne sera pas possible."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Numérisation avec votre périphérique multifonction HP"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Accès à la carte mémoire photo de votre périphérique multifonction"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Mise à disposition du port d'imprimante à CUPS..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Lecture de la base de données des imprimantes..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Entrez un nom d'imprimante et un commentaire."
 
-#: 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 ""
 "Le nom de l'imprimante ne devrait contenir que des lettres, des nombres et "
 "des tirets bas (_)"
 
-#: 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"
@@ -12844,7 +13048,7 @@ msgstr ""
 "L'imprimante « %s » existe déjà,\n"
 "souhaitez-vous vraiment écraser sa configuration ?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12855,35 +13059,35 @@ msgstr ""
 "Les champs « Description » et « Emplacement » n'ont pas besoin d'être "
 "remplis. Ce sont de simples commentaires pour les utilisateurs."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Nom de l'imprimante"
 
-#: 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 "Description"
 
-#: 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 "Emplacement"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Préparation de la base de données des imprimantes..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Le modèle de votre imprimante"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12901,25 +13105,25 @@ msgstr ""
 "données d'imprimantes pour trouver la meilleure correspondance. Ce choix "
 "peut être mauvais, particulièrement si votre modèle d'imprimante n'apparaît "
 "pas dans la base de données. Vérifiez ce choix, puis cliquez sur« Le modèle "
-"est correct », ou le cas échéant sur « Sélectionner manuellement  le "
+"est correct », ou le cas échéant sur « Sélectionner manuellement le "
 "modèle ».\n"
 "\n"
 "Votre imprimante a été détectée comme étant :\n"
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Le modèle est correct"
 
-#: 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 "Sélectionner manuellement le modèle"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12934,12 +13138,12 @@ msgstr ""
 "modèle correct dans la liste si le curseur se situe sur un modèle erroné ou "
 "sur « Imprimante à accès direct »."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Installer un fichier PPD fourni par le constructeur"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12948,8 +13152,7 @@ msgstr ""
 "Chaque imprimante PostScript est fournie avec un fichier PPD qui décrit les "
 "options et les fonctionnalités de l'imprimante."
 
-# un nom de machine pleinement qualifié
-#: 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 "
@@ -12958,14 +13161,14 @@ msgstr ""
 "Ce ficher est le plus souvent situé sur un CD avec les pilotes Windows et "
 "Mac fournis avec l'imprimante."
 
-#: 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 ""
 "Il est également possible de trouver les fichiers PPD sur les sites webs des "
 "constructeurs."
 
-#: 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 "
@@ -12974,7 +13177,7 @@ msgstr ""
 "Si Windows est installé sur votre disque, il est possible de trouver le "
 "fichier PPD sur la partition 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 "
@@ -12985,7 +13188,7 @@ msgstr ""
 "votre imprimante permet d'avoir accès à toutes les options de votre "
 "imprimante (qui sont fournies par le matériel)"
 
-#: 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 "
@@ -12994,58 +13197,51 @@ msgstr ""
 "Ici, vous pouvez choisir le fichier PPD à installer sur votre machine; il "
 "sera utilise pour configurer votre imprimante."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Installer le fichier PPD depuis"
 
-#: 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 "Lecteur de disquette"
 
-#: 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 "Autres emplacements"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Sélectionnez un fichier PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "Le fichier PPD %s n'existe pas ou n'est pas accessible en lecture !"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "Le fichier PPD %s n'est pas conforme aux spécifications PPD !"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Installation du fichier PPD ..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Configuration de l'imprimante OKI winprinter"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13063,12 +13259,12 @@ msgstr ""
 "l'impression de la page de test. Sans cela, l'imprimante ne fonctionnera pas "
 "Vos paramètres de type de connexion seront ignorés par le pilote."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Configuration de l'imprimante Lexmark inkjet"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13081,7 +13277,7 @@ msgstr ""
 "des serveurs d'impression. Veuillez connecter votre imprimante sur un port "
 "local ou configurez-la sur la machine à laquelle elle est connectée."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13105,12 +13301,12 @@ msgstr ""
 "d'impression avec « lexmarkmaintain » et ajustez les paramètres de ces têtes "
 "avec ce programme."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Configuration de l'imprimante Lexmark X125"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13123,12 +13319,36 @@ msgstr ""
 "d'impression. Veuillez connecter votre imprimante sur un port local USB ou "
 "configurez-la sur la machine à laquelle elle est connectée."
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Configuration du Samsung ML/QL-85G"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"Le pilote pour cette imprimante ne permet que l'utilisation des imprimantes "
+"locales connectées sur le premier port parallèle, et non les imprimantes "
+"distantes ou les serveurs d'impression ou les imprimantes connectées sur les "
+"autres ports parallèles. Veuillez connecter votre imprimante sur le premier "
+"port parallèle ou configurez-la sur la machine à laquelle elle est connectée."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Configuration du Canon LBP-460/660"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Téléchargement du firmware pour la HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13144,27 +13364,27 @@ msgstr ""
 "sont correctement indiqués. Notez que la vitesse d'impression peut diminuer "
 "si vous augmentez la qualité d'impression."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Paramètres par défaut de l'imprimante"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "L'option %s doit être un nombre entier !"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "L'option %s être un nombre !"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "L'option %s est en dehors des limites !"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13173,12 +13393,12 @@ msgstr ""
 "Désirez-vous que l'imprimante « %s » soit l'imprimante\n"
 "par défaut ?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Pages de test"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13192,57 +13412,57 @@ msgstr ""
 "même ne pas sortir.\n"
 "Dans la plupart des cas, l'impression de la page de test standard suffit."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Pas de page de test"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Imprimer"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Page de test standard"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Page de test alternative (Letter)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Page de test alternative (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Page de test photo"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Ne pas imprimer de page de test"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Impression des pages de test..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Impossible d'installer le paquetage %s !"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Passer la page de test photo."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13257,7 +13477,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13266,17 +13486,17 @@ msgstr ""
 "Les pages de test ont été envoyées à l'imprimante.\n"
 "Il peut se passer un certain temps avant le début effectif de l'impression.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Êtes-vous satisfait du résultat ?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Imprimante à accès direct"
 
-#: 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 "
@@ -13290,7 +13510,7 @@ msgstr ""
 "<fichier> ». Les utilitaires graphiques vous permettent de choisir "
 "l'imprimante et de modifier les paramètres d'impression facilement.\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 "
@@ -13302,8 +13522,8 @@ msgstr ""
 "programmes. Dans ce cas n'indiquez pas le nom du fichier puisqu'il sera "
 "fourni par le programme lui-même.\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"
@@ -13316,7 +13536,7 @@ msgstr ""
 "pour une impression particulière. Il suffit pour cela d'ajouter les "
 "paramètres voulus sur la ligne de commande. Par exemple, « %s <fichier> ». "
 
-#: 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 "
@@ -13327,7 +13547,7 @@ msgstr ""
 "lisez la liste ci-dessous ou cliquez sur le bouton « imprimer la liste des "
 "options ».%s%s%s\n"
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13337,17 +13557,17 @@ msgstr ""
 "courante :\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 "
 "<file>\".\n"
 msgstr ""
 "Pour imprimer un fichier depuis la ligne de commande (une fenêtre de "
-"terminal), utilisez la commande « %s <fichier>».\n"
+"terminal), utilisez la commande « %s <fichier> ».\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 "
@@ -13359,7 +13579,7 @@ msgstr ""
 "programmes. Dans ce cas, n'indiquez pas le nom du fichier à imprimer puisque "
 "celui-ci sera fourni par le programme lui-même.\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 "
@@ -13368,7 +13588,7 @@ msgstr ""
 "Pour obtenir la liste des paramètres disponibles pour l'imprimante courante, "
 "cliquez sur le bouton « liste des options d'impression »."
 
-#: 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 "
@@ -13377,7 +13597,7 @@ msgstr ""
 "Pour imprimer un fichier depuis la ligne de commande (une fenêtre de "
 "terminal), utilisez la commande « %s <fichier> » ou « %s <fichier> ».\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13395,7 +13615,7 @@ msgstr ""
 "les travaux d'impression. Ceci peut être utile en cas de bourrage papier, "
 "par exemple.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13409,42 +13629,32 @@ msgstr ""
 "cela d'ajouter les paramètres voulus sur la ligne de commande, par exemple "
 "« %s <fichier> ».\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Impression/Acquisition/Cartes photo sur « %s »"
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Impression/Acquisition sur l'imprimante « %s »"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Impression/Accès aux cartes photos sur « %s »"
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Impression sur l'imprimante « %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 "Fermer"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Liste des options d'impression"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13455,20 +13665,24 @@ 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 ""
 "Votre périphérique multifonction HP a été configuré automatiquement pour "
 "être capable de scanner. Maintenant vous pouvez scanner avec "
-"« scanimage » ( « scanimage -d hp:%s » pour spécifier le scanner si vous en "
+"« scanimage » ( « scanimage -d hp:%s » pour spécifier le scanner si vous en "
 "avez plus d'un) à partir de la ligne de commande, ou avec des interfaces "
 "graphiques comme « xscanimage » ou « xsane ». Si vous utilisez « Le Gimp », "
 "vous pouvez aussi scanner grâce au menu « Fichier / Acquisition ». Pour "
 "avoir plus d'information, vous pouvez taper « man scanimage » dans une "
 "fenêtre de commandes.\n"
 "\n"
-"N'utilisez pas « scannerdrake » pour cet appareil ! "
+"Il n'est pas necessaire d'utiliser « scannerdrake » pour cet appareil, vous "
+"ne devez utiliser « scannerdrake » que si vous desirez partager l'accès au "
+"numériseur via le réseau."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13484,26 +13698,21 @@ msgstr ""
 "Votre imprimante HP a été configurée automatiquement pour vous donner accès "
 "aux lecteurs de carte mémoire à partir de votre PC. Maintenant vous pouvez "
 "accéder à vos cartes en utilisant le programme graphique "
-"« MtoolsFM »  (Menu : « Applications » -> « Outils fichiers » -> "
-"« gestionnaire de fichiers MTools »)  ou le programme en ligne de commande "
-"mtools (tapez « man mtools » pour  plus d'informations). Vous accéderez à la carte "
-"par le lecteur ayant la lettre « p: », ou une autre lettre si vous avez plus "
-"d'un appareil de ce type. Dans « MtoolsFM » vous pouvez commuter entre "
-"plusieurs lecteurs grâce au champ situé dans le coin supérieur droit de la "
-"liste de fichiers."
-
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Lecture des données de l'imprimante..."
+"« MtoolsFM » (Menu : « Applications » -> « Outils fichiers » -> "
+"« gestionnaire de fichiers MTools ») ou le programme en ligne de commande "
+"mtools (tapez « man mtools » pour plus d'informations). Vous accéderez à la "
+"carte par le lecteur ayant la lettre « p: », ou une autre lettre si vous "
+"avez plus d'un appareil de ce type. Dans « MtoolsFM » vous pouvez commuter "
+"entre plusieurs lecteurs grâce au champ situé dans le coin supérieur droit "
+"de la liste de fichiers."
 
-#: 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 "Transfert de la configuration de l'imprimante"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13520,7 +13729,7 @@ msgstr ""
 "Toutes les files d'attente n'ont pas pu être transférées à cause des raisons "
 "suivantes :\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13529,7 +13738,7 @@ msgstr ""
 "CUPS ne supporte pas les imprimantes sur les serveurs Novell ni les "
 "impressions vers des commandes shell.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13538,21 +13747,21 @@ msgstr ""
 "PDQ ne supporte que les imprimantes locales, les imprimantes LPD distantes, "
 "et les imprimantes réseau autonomes.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD et LPRng ne supportent pas les imprimantes IPP.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 "De plus, les files d'attente qui n'ont pas été créées avec ce programme ou "
-"avec «foomatic-configure» ne peuvent pas être transférées."
+"avec « foomatic-configure » ne peuvent pas être transférées."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13563,7 +13772,7 @@ msgstr ""
 "Aussi, les imprimantes configurées avec les fichiers PPD fournis par leur "
 "fabriquant ou avec des pilotes CUPS natifs ne peuvent pas être transférées."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13574,17 +13783,17 @@ msgstr ""
 "Cochez les imprimantes que vous voulez transférer, et\n"
 "cliquez sur « Transfert »."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Ne pas transférer les imprimantes"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Transfert"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13596,17 +13805,17 @@ msgstr ""
 "Vous pouvez également taper un nouveau nom ou\n"
 "simplement ignorer cette imprimante."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nouveau nom de l'imprimante"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "Transfert de %s..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13616,28 +13825,28 @@ msgstr ""
 "elle être également l'imprimante par défaut de votre nouveau système "
 "d'impression %s ?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Mise à jour des données de l'imprimante..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Démarrage du réseau..."
 
-#: 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 "Configurez le réseau maintenant"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Les fonctions du réseau ne sont pas configurées"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13650,12 +13859,12 @@ msgstr ""
 "voulez continuer sans configurer le réseau, vous ne pourrez pas utiliser "
 "l'imprimante que vous êtes en train de configurer. Que souhaitez-vous faire ?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Continuer sans configurer le réseau"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13671,7 +13880,7 @@ msgstr ""
 "de configurer l'imprimante dans la section « Matériel / Imprimante » du "
 "« Centre de Contrôle %s »."
 
-#: 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,29 +13889,29 @@ msgid ""
 msgstr ""
 "L'accès réseau n'a pas pu être démarré. Veuillez vérifier la configuration "
 "de votre matériel et de votre accès réseau grâce au « Centre de Contrôle "
-"Mandrake » puis essayez à nouveau de configurer l'imprimante distante."
+"Mandrakelinux » puis essayez à nouveau de configurer l'imprimante distante."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Redémarrage du système d'impression..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "élevé"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranoïaque"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Installation du système d'impression sous le niveau de sécurité « %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 %"
@@ -13728,12 +13937,12 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement installer un système d'impression ?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Activation du système d'impression au démarrage"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13755,70 +13964,170 @@ msgstr ""
 "\n"
 "Souhaitez-vous rétablir l'activation automatique du système d'impression ?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Vérification du logiciel installé..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Suppression de %s ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Impossible de désinstaller le système d'impression %s !"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "Installation de %s ..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "Impossible d'installer le système d'impression %s !"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: 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 ""
+"Entrez le nom d'hote ou l'adresse IP de votre serveur CUPS\n"
+"et cliquez sur OK si vous voulez utiliser ce mode, cliquer sur Quitter sinon."
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Nom ou IP du serveur distant :"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Configuration de l'imprimante par défaut..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Impression sur serveur CUPS local ou distant ?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "Le système d'impression CUPS peut être utilisé de deux façons : "
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. Le système d'impression CUPS ne peut pas fonctionner localement"
+
+#: 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 ""
+"Ensuite les imprimantes locales pourront être utilisées et les imprimantes "
+"distantes sur d'autres serveurs CUPS du même réseau seront automatiquement "
+"découvertes."
+
+#: 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 ""
+"Les inconvénients de cette approche sont qu'elle nécessite plus de "
+"ressources sur la machine locale :\n"
+" Les paquetages additionels ont besoin d' tre installés,\n"
+"Le service CUPS doit tourner en arrière plan et a besoin de plus de mémoire, "
+"le port IPP (port 631) sera ouvert."
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+"2. Toutes les impressions sont transmises immédiatement au serveur CUPS "
+"distants"
+
+#: 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 ""
+"Icila consommation locale de ressources est réduite au minimum. Aucun "
+"service CUPS ne sera démarré, ni aucun port ouvert, aucun logiciel de "
+"configuration de files d'impression locales ne sera installé, donc moins de "
+"mémoire et d'espace disque sera utilisé."
+
+#: 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 ""
+"L'inconvénient est qu'il n'est pas possible de définir d'imprimantes locales "
+"ensuite et que si le serveur d'impression spécifé est arreté il n'est plus "
+"possible d'imprimer de cet ordinateur."
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "Comment CUPS doit-il être installé sur votre machine ?"
+
+#: 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 "Serveur distant, spécifiez un nom ou une adresse IP ici"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Système d'impression CUPS local"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Choisissez le gestionnaire d'impression"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Quel système d'impression désirez-vous utiliser ?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Échec de configuration de l'imprimante « %s » !"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Installation de Foomatic..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 "Impossible d'installer les paquetages %s, %s ne peut pas être démarré !"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-"Impossible d'installer les paquetages nécessaires, %s ne peut pas être "
-"démarré !"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13829,190 +14138,161 @@ msgstr ""
 "elles pour modifier ses paramètres, en faire l'imprimante par défaut ou "
 "consulter les informations à son propos."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Afficher toutes les imprimantes CUPS distantes"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Rafraîchir la liste des imprimantes (pour afficher toutes les imprimantes "
 "CUPS distantes)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "Configuration de CUPS"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Changer le système d'impression"
 
-#: 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 "Options de l'imprimante"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Modifier la configuration de l'imprimante"
 
-#: 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 ""
-"Imprimante %s\n"
+"Imprimante %s%s\n"
 "Que souhaitez-vous modifier sur cette imprimante ?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Cette imprimante est desactivée"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Faire"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Type de connexion"
 
-#: 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, description, emplacement"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Marque, modèle, pilote"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Marque, modèle"
 
-#: 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 "Choisir comme imprimante par défaut"
 
-#: 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 "Ajouter cette imprimante à StarOffice/OpenOffice"
+msgid "Enable Printer"
+msgstr "Activer l'imprimante"
 
-#: 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 "Retirer cette imprimante de StarOffice/OpenOffice"
+msgid "Disable Printer"
+msgstr "Désactiver l'imprimante"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Imprimer des pages de test"
 
-#: 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 "Savoir comment utiliser cette imprimante"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Désinstaller l'imprimante"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Désinstallation de l'ancienne imprimante « %s »..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Ajout de l'imprimante à StarOffice/OpenOffice"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "L'imprimante « %s » a été ajoutée avec succès à StarOffice/OpenOffice"
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "Impossible d'ajouter l'imprimante « %s » à StarOffice/OpenOffice"
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Retrait de l'imprimante de StarOffice/OpenOffice"
+msgid "Printer \"%s\" is now enabled."
+msgstr "L'imprimante « %s » est maintenant activée."
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "L'imprimante « %s » a été retirée avec succès de StarOffice/OpenOffice"
+msgid "Printer \"%s\" is now disabled."
+msgstr "L'imprimante « %s » est maintenant désactivée."
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "Impossible de retirer l'imprimante « %s » de StarOffice/OpenOffice"
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Désirez-vous vraiment désinstaller l'imprimante « %s » ?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Suppression de l'imprimante « %s »..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Imprimante par défaut"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "L'imprimante « %s » est maintenant celle par défaut."
 
-#: raid.pm:37
+#: raid.pm:36
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr ""
-"Impossible d'ajouter une partition au RAID md%d car\n"
-"celui-ci est déjà formaté"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "Impossible d'ajouter une partition au RAID %s formaté"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "« mkraid » a échoué (les « raidtools » sont-ils installés ?)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "« mkraid » a échoué"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Trop peu de partitions pour du RAID de niveau %d\n"
@@ -14039,16 +14319,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Impossible d'initialiser les permissions du fichier 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 ""
@@ -14080,7 +14360,8 @@ msgstr "Accepter/refuser l'écho icmp."
 msgid "Allow/Forbid autologin."
 msgstr "Activer/Désactiver la connexion automatique (autologin)."
 
-#: 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"
@@ -14095,23 +14376,23 @@ msgstr ""
 "\n"
 "Sinon seulement /etc/issue est permis."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr ""
 "Activer/Désactiver le redémarrage du système par l'utilisateur de la console."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Permettre la connexion distante en tant que root"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Permet/interdit la connexion directe en tant que 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 "
@@ -14120,7 +14401,20 @@ msgstr ""
 "Permet/interdit la liste des utilisateurs du système sur les gestionnaires "
 "de connexion (kdm et 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 ""
+"Permet/interdit d'exporter l'affichage lorsque l'on passe du\n"
+"compte super-utilisateur (« root ») à un autre utilisateur.\n"
+"\n"
+"Cf pam_xauth(8) pour plus d'informations"
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -14131,7 +14425,7 @@ msgid ""
 "\n"
 "- NONE (no connection)."
 msgstr ""
-"Permet/interdit les connexions à XFree :\n"
+"Permet/interdit les connexions à Xorg :\n"
 "\n"
 "- TOUS (toutes connexions permises),\n"
 "\n"
@@ -14139,16 +14433,17 @@ msgstr ""
 "\n"
 "- AUCUN (aucune connexion)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 "L'argument spécifie si les clients sont autorisés ou non à se connecter\n"
-"au serveur d'affichage (XFree) sur le port tcp 6000."
+"au serveur d'affichage (Xorg) sur le port tcp 6000."
 
-#: 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"
@@ -14163,7 +14458,7 @@ msgid ""
 "To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
 "(5))."
 msgstr ""
-"Autoriser:\n"
+"Autoriser :\n"
 "\n"
 "- tous les services contrôlés par tcp_wrappers (voir hosts.deny(5)) si "
 "« TOUS »,\n"
@@ -14175,7 +14470,7 @@ msgstr ""
 "Pour autoriser les services dont vous avez besoin, utilisez\n"
 "/etc/hosts.allow (voir hosts.allow(5)."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -14196,7 +14491,7 @@ msgstr ""
 "pour décider d'ajouter un service s'il est présent dans le fichier\n"
 "pendant l'installation des paquetages."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -14210,44 +14505,49 @@ msgstr ""
 "Mettre les utilisateurs autorisés dans /etc/cron.allow et\n"
 "/etc/at.allow (voir les pages de manuel at(1) et crontab(1)."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "Activer/désactiver l'affichage des messages systèmes sur la console 12"
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 "Activer/Désactiver la protection contre l'usurpation de résolution de\n"
-"nom (name resolution spoofing).  Si « alert » est à 1, effectue aussi\n"
+"nom (name resolution spoofing). Si « %s » est à 1, effectue aussi\n"
 "des rapports à syslog."
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Alertes de sécurité :"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Activer/désactiver la protection contre l'usurpation d'adresse IP"
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 "Activer/désactiver la bibliothèque libsafe si elle est présente sur le "
 "système"
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Activer/désactiver le traçage de tous les paquets IPv4 étranges"
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Activer/Désactiver les vérifications de msec toutes les heures"
 
-#: 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."
@@ -14255,47 +14555,47 @@ msgstr ""
 " Autorise « su » seulement pour les membres du groupe « wheel » ou bien pour "
 "tout le monde."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Utiliser des mots de passe pour authentifier les utilisateurs"
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr "Active/Désactive la vérification du mode espion des cartes réseau."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Activer/Désactiver les vérifications quotidiennes de sécurité."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 "Activer/Désactiver la demande de mot de passe en mode mono-utilisateur."
 
-#: 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 "Exclue « nom » de la gestion des mots de passe par msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Règle la durée de vie des mots de passe à « max » et le délai de changement "
 "de mot de passe à « inactive »."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 "Règle la profondeur de l'historique des mots de passe pour éviter la "
 "réutilisation de mots de passe."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14304,20 +14604,20 @@ msgstr ""
 "Règle la longueur minimum, le nombre minimum de chiffres et le nombre "
 "minimum de lettres en majuscule d'un mot de passe."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Règle le « umask » de root"
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "Si oui, vérifie les ports ouverts du réseau."
 
-#: 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"
@@ -14327,122 +14627,122 @@ msgid ""
 msgstr ""
 "Si oui, vérifie :\n"
 "\n"
-"- les mots de passe vides,\n"
+"- les mots de passe viDES,\n"
 "\n"
 "- les mots de passes absents de /etc/shadow,\n"
 "\n"
 "- les utilisateurs autres que root ayant le numéro d'« id » égal à 0."
 
-#: 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 oui, vérifie les droits des fichiers dans les dossiers personnels des "
 "utilisateurs."
 
-#: 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 oui, vérifie si les périphériques réseaux sont dans un mode espion"
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "Si oui, effectue les vérifications quotidiennes de sécurité."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 "Si oui, vérifie les ajouts/retraits des fichiers qui ont la permission "
 "« sgid »."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "Si oui, vérifie les mots de passe vides dans /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 oui, vérifie les sommes de contrôle des fichiers ayant la permission 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 oui, vérifie les ajouts/retraits des fichiers qui ont la permission "
-"« suid »."
+"« suid root »."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "Si oui, cherche des fichiers sans propriétaire."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr "Si oui, vérifie les fichiers/dossiers que tout le monde peut modifier"
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "Si oui, vérifie l'absence de rootkit via chkrootkits."
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 "Si rempli, envoie le rapport par courriel à cette adresse, sinon à root."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "Si oui, envoie un rapport de vérification par courriel"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "Ne pas envoyer d'emails s'il n'y a rien à signaler"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 "Si oui, effectue des vérifications par rapport à la base de données des "
 "paquetages rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr "Si oui, envoie le rapport de vérification vers syslog."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "Si oui, envoie le rapport de vérification dans le terminal."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Réglez la profondeur de l'historique du shell. Une valeur de -1 signifie "
 "historique illimité."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr "Réglez le délai d'expiration du shell. Zéro signifie pas d'expiration."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "L'unité du délai d'expiration est la seconde"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Réglez le « umask » utilisateur."
@@ -14490,219 +14790,226 @@ msgstr ""
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+"Exporter l'affichage lorsque l'on passe du superutilisateur à un autre "
+"utilisateur"
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Autoriser les connexions à X Window"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autoriser les connections X Window via TCP"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autoriser tous les services contrôlés par tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig obéit aux règles de msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Autoriser « crontab » et « at » pour les utilisateurs"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Afficher les messages systèmes sur la console 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr "Protection contre l'usurpation de résolution de nom"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Activer la protection contre l'usurpation d'adresse IP"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Activer la bibliothèque libsafe si elle est présente sur le système"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Activer le traçage de tous les paquets IPv4 étranges"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Activer les vérifications de msec toutes les heures"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 "Autoriser « su » seulement aux membres du groupe « wheel » ou à tout le monde"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Utilise un mot de passe pour authentifier les utilisateurs"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Activer la vérification du mode espion des cartes réseau"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Vérifications journalières de sécurité"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Activer la demande de mot de passe en mode mono-utilisateur"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Pas de délai d'expiration des mots de passe pour"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr ""
 "Règle la durée de vie des mots de passe et le délai d'inactivation du compte"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Taille de l'historique des mots de passe"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 "Longueur minimum du mot de passe ainsi que le nombre de chiffres et de "
 "majuscules"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Masque des permissions pour la création de fichier par root"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Taille (en lignes) de l'historique du shell"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Délai d'expiration de l'interpréteur de commande"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr ""
 "Masque des permissions pour la création de fichier par les utilisateurs"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Vérifier la liste des ports ouverts"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Rechercher les comptés non sécurisés"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Vérifie les droits des fichiers dans les dossiers personnels"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Vérifier l'utilisation du mode espion par les périphériques réseaux"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Effectue les vérifications quotidiennes de sécurité"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Vérifier les ajouts/retraits des fichiers sgid"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Vérifier les mots de passe vides dans /etc/shadow."
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr ""
 "Vérifier les sommes de contrôle des fichiers ayant la permission suid/sgid"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
-"Vérifier les ajouts/retraits des fichiers qui ont la permission « suid »"
+"Vérifier les ajouts/retraits des fichiers qui ont la permission « suid root »"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Rechercher les fichiers n'appartenant à aucun utilisateur"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Vérifie les fichiers et/ou dossiers modifiables par tout un chacun"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Effectue les vérifications de chkrootkit"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "Ne pas envoyer de mail quand cela n'est pas nécessaire"
 
-#: 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 rempli, envoie le rapport par courriel à cette adresse, sinon à root"
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Envoyer le rapport de vérification par courriel"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 "Vérifie les fichiers des paquetages rpm par rapport à la base de données"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Enregistrer le rapport de vérification via syslog"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Afficher le rapport de vérification dans le terminal"
@@ -14847,8 +15154,8 @@ msgstr ""
 "Anacron exécute des tâches périodiques avec une précision exprimée en jours. "
 "Les tâches sont exécutées automatiquement au redémarrage de la machine si "
 "elles ont expirés leur délai. Quelques tâches de maintenance quotidiennes et "
-"hebdomadaires sont préconfigurées pour le système Mandrake.(Plus d'informations "
-"dans « man anacron »)"
+"hebdomadaires sont préconfigurées pour le système Mandrakelinux. (Plus "
+"d'informations dans « man anacron »)"
 
 #: services.pm:21
 #, c-format
@@ -14994,7 +15301,7 @@ msgid ""
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 "Lpd est le serveur d'impression nécessaire au bon fonctionnement de la "
-"commande  lpr. Il permet gérer les files d'attente et les demandes "
+"commande lpr. Il permet gérer les files d'attente et les demandes "
 "d'impression."
 
 #: services.pm:52
@@ -15023,7 +15330,7 @@ msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"Montage et démontage de tous les dossiers partagés: systèmes de fichiers\n"
+"Montage et démontage de tous les dossiers partagés : systèmes de fichiers\n"
 "distants (NFS), SMB (Lan Manager/Windows), et NCP (Netware)."
 
 #: services.pm:57
@@ -15033,10 +15340,10 @@ msgid ""
 "at boot time."
 msgstr ""
 "Gestion groupée de toutes les connexions réseau que vous avez configurées et "
-"que vous avez choisi d'activer dès le démarrage du système.  (par ex. vos "
+"que vous avez choisi d'activer dès le démarrage du système. (par ex. vos "
 "connexions pour le réseau local et l'ADSL ou le Câble). Vous pouvez accéder "
-"séparément à vos interfaces réseau grâce au « Centre de  Contrôle Mandrake » "
-"dans la section « Internet et réseau »."
+"séparément à vos interfaces réseau grâce au « Centre de Contrôle "
+"Mandrakelinux » dans la section « Internet et réseau »."
 
 #: services.pm:59
 #, c-format
@@ -15064,7 +15371,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "Activation de la touche « Verr Num » du pavé numérique du clavier au "
 "démarrage."
@@ -15125,8 +15432,8 @@ msgid ""
 "partitions), for the use of applications such as Oracle or DVD players"
 msgstr ""
 "Permet de faire apparaître des périphériques de type bloc (par ex. "
-"partitions de disque dur)  comme des périphériques bruts à accès direct (raw "
-"devices). Les correspondances sont  établies dans le fichier /etc/sysconfig/"
+"partitions de disque dur) comme des périphériques bruts à accès direct (raw "
+"devices). Les correspondances sont établies dans le fichier /etc/sysconfig/"
 "rawdevices, et c'est la commande « raw » qui est utilisée. Cela peut être "
 "utilisé par des programmes comme Oracle ou par des lecteurs de DVD."
 
@@ -15164,7 +15471,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 ""
 "Le protocole rwho permet aux utilisateurs distants d'obtenir une liste des "
 "utilisateurs connectés à une machine qui fait tourner le démon rwho "
@@ -15192,10 +15499,10 @@ msgstr "Charger les pilotes pour vos périphériques USB."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr ""
-"Démarre le serveur de polices de caractères, obligatoire pour le  "
-"fonctionnement de l'interface graphique (XFree)"
+"Démarre le serveur de polices de caractères, obligatoire pour le "
+"fonctionnement de l'interface graphique (Xorg)"
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -15241,7 +15548,7 @@ msgstr "arrêté"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Serveurs et services"
 
 #: services.pm:221
@@ -15251,7 +15558,7 @@ msgid ""
 "about this service, sorry."
 msgstr "Pas d'autre information au sujet de ce service, désolé."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Information"
@@ -15266,863 +15573,1369 @@ msgstr "Démarré si nécessaire"
 msgid "On boot"
 msgstr "Au démarrage"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Démarrer"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Arrêter"
 
-#: 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>Merci d'avoir choisi Mandrakelinux !</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Qu'est-ce que 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 "Bienvenue dans le monde de l'Open Source !"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "<b>Mandrakelinux</b> vous souhaite la bienvenue !"
 
-#: 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 ""
-"Votre nouveau système Mandrakelinux et ses nombreux programmes sont le "
-"résultat d'une collaboration entre les développeurs MandrakeSoft et les "
-"contributeurs de Mandrakelinux de par le monde."
+"Mandrakelinux est une <b>distribution Linux</b>, qui regroupe un <b>système "
+"d'exploitation</b> (ie : le coeur du système, basé sur le noyau Linux) et "
+"<b>un très grand nombre d'applications</b> qui répondront à tous vos besoins."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Nous tenons à remercier tous ceux qui ont participé au développement de "
-"cette nouvelle version."
+"Mandrakelinux est la distribution Linux la plus <b>conviviale</b> de toutes. "
+"C'est aussi l'une des <b>plus utilisées</b> au monde !"
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>Open Source</b>"
+msgstr "<b>Logiciel libre</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Bienvenue dans le <b>monde du logiciel libre</b> !"
+
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
-"Discovery est la distribution Linux la plus facile et la plus conviviale. "
-"Elle est basée sur une sélection des meilleurs logiciels disponibles pour la "
-"bureautique, le multimédia et les activités liées à Internet."
+"Mandrakelinux adhère au modèle du logiciel libre. Cela signifie que cette "
+"dernière version est le résultat d'une <b>collaboration</b> entre "
+"<b>l'équipe des développeurs de Mandrakesoft</b> et la <b>communauté "
+"mondiale</b> des contributeurs à Mandrakelinux."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
-msgstr "Le menu est orienté tache, avec un seul programme par tache."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
+msgstr ""
+"Nous <b>remercions</b> vivement toutes les personnes qui ont participé au "
+"développement de cette dernière version."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>Le choix de KDE</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>La GPL</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Le puissant environnement graphique KDE est le bureau choisi pour Discovery."
+"La plupart des logiciels inclus dans la distribution et l'intégralité des "
+"outils Mandrakelinux respectent la <b>Licence Publique Générale</b> (en "
+"anglais General Public License ou GPL)."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr "<b>OpenOffice.org</b> : La suite bureautique complète pour Linux"
+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 est au coeur de modèle du logiciel libre ; elle donne à chacun la "
+"<b>liberté</b> d'utiliser, d'étudier, de distribuer et d'améliorer chaque "
+"logiciel comme il l'entend, à condition de redistribuer les résultats."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
-"<b>WRITER</b> est un puissant traitement de texte permettant de créer tout "
-"type de documents texte. Ces derniers peuvent contenir des images, des "
-"diagrammes et des tableaux."
+"L'avantage majeur de la GPL est le nombre <b>illimité</b> de développeurs, "
+"ce qui permet d'obtenir des logiciels de <b>très haute qualité.</b>"
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Rejoignez la communauté</b>"
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
-"<b>CALC</b> est un tableur doté de nombreuses fonctions vous permettant de "
-"calculer, analyser et gérer toutes vos données."
+"Mandrakelinux possède l'une des <b>plus importantes</b> communautés "
+"d'utilisateurs et de développeurs. Le rôle de cette communauté est multiple, "
+"des rapports de bugs aux développements de nouvelles applications. La "
+"communauté est une <b>part très importante</b> du monde Mandrakelinux."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"<b>IMPRESS</b> est le moyen le plus rapide et le plus puissant de créer des "
-"présentations multimédia percutantes."
+"Pour en savoir plus sur notre communauté dynamique, allez sur <b>www."
+"mandrakelinux.com</b> ou directement sur <b>www.mandrakelinux.com/en/"
+"cookerdevel.php3</b> si vous souhaitez vous impliquer dans le développement."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Version Download</b>"
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"<b>DRAW</b> est capable de tout créer, du simple diagramme aux illustrations "
-"3D dynamiques."
+"Vous être en train d'installer <b>Mandrakelinux Download</b>. C'est la "
+"version gratuite que Mandrakesoft tient à garder <b>disponible pour tous</b>."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:17
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Naviguez sur Internet</b>"
+msgid ""
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
+msgstr ""
+"La version Download <b>ne peut pas intégrer</b> tous les logiciels qui ne "
+"sont pas libres. Ainsi vous ne trouverez pas dans la version Download :"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"Découvrez la nouvelle suite de gestion d'informations personnelles KDE "
-"Kontact."
+"\t* Les <b>pilotes propriétaires</b> (tels que les pilotes pour NVIDIA®, "
+"ATI™, etc.)."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"Plus qu'un simple client de courrier électronique doté de toutes les "
-"fonctionnalités, <b>Kontact</b> comprend également un carnet d'adresses, un "
-"calendrier, un programme de gestions de taches ainsi qu'un outil de prise de "
-"notes !"
+"\t* Les <b>applications propriétaires</b> (telles que Acrobat® Reader®, "
+"RealPlayer®, Flash™, etc.)."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
-msgstr "Vous pouvez également :"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+"Vous n'aurez pas non plus accès aux <b>services inclus</b> dans les autres "
+"produits de Mandrakesoft."
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- consulter des sites Web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery, Votre premier poste de travail sous Linux</b>"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
-msgstr "\t- discuter en ligne"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Vous être en train d'installer <b>Mandrakelinux Discovery</b>."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organiser une vidéo-conférence"
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+"Discovery est la distribution la plus <b>simple</b> et la plus "
+"<b>conviviale</b> sous Linux. Elle comprend une sélection de <b>logiciels "
+"indispensables</b> à la bureautique, au multimédia et à Internet. Son menu "
+"est orienté tâche, avec une seule application par tâche."
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- créer votre propre site Web"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack, Le poste de travail de référence sous Linux</b>"
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Vous être en train d'installer <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimédia</b> : Des logiciels pour répondre à tous les besoins !"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
+"PowerPack est l'une des <b>distributions Linux de référence</b>. Elle "
+"intègre un <b>très grand nombre d'applications</b>, des plus utilisées aux "
+"plus avancées."
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Écoutez des CDs audio avec <b>KsCD</b>"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
+"<b>PowerPack+, La solution Linux pour postes de travail et serveurs</b>"
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Écoutez des fichiers musicaux avec <b>Totem</b>"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Vous être en train d'installer <b>Mandrakelinux PowerPack+</b>."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+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 ""
-"Affichez et modifiez images et photos avec <b>GQview</b> et <b>Le Gimp !</b>"
+"PowerPack+ est la <b>solution Linux</b> dédiée aux petits <b>réseaux</b>. "
+"Elle intègre un très grand nombre d'<b>applications pour poste de travail</"
+"b> ainsi que toutes les <b>fonctions serveurs</b> indispensables."
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Centre de Contrôle Mandrakelinux</b>"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Les produits Mandrakesoft</b>"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr ""
+"<b>Mandrakesoft</b> a développé une large gamme de produits "
+"<b>Mandrakelinux</b>."
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Les produits Mandrakelinux 10.1 sont :"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* <b>Discovery</b>, Votre premier poste de travail sous Linux."
+
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* <b>PowerPack</b>, Le poste de travail de référence sous Linux."
+
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
 msgstr ""
-"Le Centre de Contrôle Mandrakelinux est une collection d'outils spécifiques "
-"à Mandrakelinux et permettant de configurer facilement votre ordinateur."
+"\t* <b>PowerPack+</b>, La solution Linux pour postes de travail et serveurs."
 
-#: 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 ""
-"Vous apprécierez immédiatement cette collection d'outils vous permettant de "
-"configurer facilement les périphériques, de définir les points de montage, "
-"de configurer le réseau et Internet, d'ajuster le niveau de sécurité de "
-"votre ordinateur et de presque tout ce qui est relatif au système."
+"\t* <b>Mandrakelinux 10.1 pour x86-64</b>, La solution Mandrakelinux pour "
+"tirer le meilleur parti de votre processeur 64 bits."
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:13
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Les produits Mandrakesoft (produits nomades)</b>"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Vous trouverez tous les produits et services de MandrakeSoft sur "
-"<b>MandrakeStore</b> -- notre plateforme complète de commerce en ligne."
+"Mandrakesoft a développé deux produits qui permettent d'utiliser "
+"Mandrakelinux <b>sur n'importe quel ordinateur</b> et sans installation :"
 
-#: 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 "Arrêtez-vous aujourd'hui même sur <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
+"\t* <b>Move</b>, une distribution Mandrakelinux qui fonctionne entièrement "
+"depuis un CD-Rom amorçable."
+
+#: share/advertising/10.pl:17
+#, c-format
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* <b>GlobeTrotter</b>, une distribution Mandrakelinux pré-installée sur le "
+"disque dur ultra compact “LaCie Mobile Hard Drive”."
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:13
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Devenez membre de <b>MandrakeClub</b> !"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<b>Les produits Mandrakesoft (solutions professionnelles)</b>"
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
-"Profitez de nombreux avantages, produits et services en rejoignant "
-"MandrakeClub !"
+"Voici les produits Mandrakesoft destinés à répondre aux <b>besoins "
+"professionnels</b> :"
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Accès illimité à des programmes commerciaux"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr ""
+"\t* <b>Corporate Desktop</b>, Le poste de travail Mandrakelinux à "
+"destination des entreprises."
 
-#: 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- Liste de miroirs de téléchargement réservée uniquement aux membres du "
-"Club"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, La solution serveur Mandrakelinux."
+
+#: share/advertising/11.pl:18
+#, c-format
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr "\t* <b>Multi-Network Firewall</b>, La solution sécurité Mandrakelinux."
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>Le choix de KDE</b>"
+
+#: share/advertising/12.pl:15
+#, c-format
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
-"\t- Votez pour les logiciels à intégrer dans la prochaine distribution "
-"Mandrakelinux"
+"Avec Discovery, vous allez découvrir <b>KDE</b>, l'<b>environnement "
+"graphique</b> le plus avancé et le plus convivial."
 
-#: 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:17
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+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 ""
-"\t- Des réductions spéciales sur des produits et services de MandrakeStore"
+"KDE rendra vos <b>premiers pas</b> sous Linux si <b>faciles</b> que vous ne "
+"songerez même plus à utiliser un autre système d'exploitation !"
 
-#: 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:19
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- Et plus encore !"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
+"KDE inclut également beaucoup de <b>logiciels intégrés</b> à l'environnement "
+"graphique tels que Konqueror, le navigateur web et Kontact, la suite "
+"d'informations personnelles."
 
-#: 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/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Pour plus d'informations, visitez <b>www.mandrakeclub.com</b>"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Choisissez votre environnement de bureau favori</b>"
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:15
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Besoin d'aide ?"
+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 ""
+"Avec PowerPack, vous aurez le choix de l'<b>environnement graphique</b>. "
+"Mandrakesoft a choisi <b>KDE</b> comme environnement par défaut."
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> est la principale source de support technique."
+msgid ""
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
+msgstr ""
+"KDE est l'un des environnements graphiques les <b>plus avancés</b> et les "
+"<b>plus conviviaux</b>. Il inclut un grand nombre de logiciels intégrés."
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
-"Si vous vous posez des questions à propos de Linux, inscrivez-vous à "
-"MandrakeExpert sur <b>www.mandrakeexpert.com</b>"
+"Mais nous vous conseillons d'essayer les autres disponibles (dont <b>GNOME</"
+"b>, <b>IceWM</b>, etc.) pour choisir votre préféré."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Mandrakelinux adhère au modèle Open Source et respecte la licence GPL dans "
-"sa totalité. Cette distribution est le résultat d'une collaboration entre "
-"les développeurs MandrakeSoft et les contributeurs Mandrakelinux de part le "
-"monde."
+"Avec PowerPack+, vous aurez le choix de l'<b>environnement graphique</b>. "
+"Mandrakesoft a choisi <b>KDE</b> comme environnement par défaut."
+
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:15
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Rejoignez la communauté Mandrakelinux !</b>"
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Avec Discovery, vous allez découvrir <b>OpenOffice.org</b>."
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Si vous souhaitez participer, veuillez vous inscrire à la liste de "
-"discussion « cooker » en visitant <b>mandrakelinux.com/cooker</b>"
+"C'est une <b>suite bureautique complète</b> qui inclut un traitement de "
+"texte, un tableur, un logiciel de présentation et un logiciel de dessin."
 
-#: 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 ""
-"Pour plus d'informations au sujet de notre communauté et de son dynamisme, "
-"veuillez visiter <b>www.mandrakelinux.com</b> !"
+"OpenOffice.org peut lire et écrire la plupart des documents <b>Microsoft® "
+"Office</b> comme Word, Excel et PowerPoint®."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Qu'est-ce que 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 ""
-"Mandrakelinux est une distribution Open Source basée sur des milliers de "
-"programmes sélectionnés dans le monde du Logiciel Libre. Mandrakelinux est "
-"une des distributions Linux les plus utilisées au monde."
+"Discovery inclut <b>Kontact</b>, la nouvelle <b>solution de travail "
+"collaboratif</b> de KDE."
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
-"Mandrakelinux comprend les environnements graphiques KDE et GNOME ainsi que "
-"les dernières versions des programmes Open Source les plus appréciés."
+"Plus qu'un simple <b>client e-mail</b>, Kontact inclut aussi un <b>carnet "
+"d'adresses</b>, un <b>agenda</b> ainsi qu'un outil pour prendre des "
+"<b>notes</b> !"
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr ""
+"C'est la façon la plus simple de communiquer avec vos contacts et "
+"d'organiser votre temps."
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Surfez sur Internet</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
-"Mandrakelinux est reconnue pour être la distribution Linux la plus "
-"conviviale, la plus facile d'installation et d'utilisation."
+"Discovery vous donnera accès à <b>toutes les ressources d'Internet</b>. Vous "
+"pourrez :"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Naviguer sur le <b>web</b> avec Konqueror."
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* <b>Discuter</b> en ligne avec vos amis grâce à Kopete."
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Transférez</b> des fichiers avec KBear."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Découvrez nos <b>Solutions Personnelles</b> :"
+msgid "\t* ..."
+msgstr "\t* ..."
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/17.pl:13
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "<b>Profitez du multimédia</b>"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
-"\t- Découvrez Mandrakelinux sur un CD amorçable grâce à <b>MandrakeMove</b>"
+"Discovery vous simplifiera aussi l'utilisation du <b>multimédia</b>. Vous "
+"pourrez ainsi :"
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* Regarder vos <b>vidéos</b> favorites avec Kaffeine."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* Écouter vos <b>fichiers musicaux</b> avec amaroK."
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Créer et modifier des <b>images</b> avec le GIMP."
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Profitez de la large gamme d'applications</b>"
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+"Dans le menu Mandrakelinux, vous trouverez des applications <b>faciles "
+"d'utilisation</b> pour <b>toutes vos tâches</b> :"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
-"\t- Si vous utilisez Linux principalement pour la Bureautique, Internet et "
-"le Multimédia, <b>Discovery</b> répond parfaitement à vos besoins"
+"\t* Créer, éditer et partager des documents bureautiques avec <b>OpenOffice."
+"org</b>."
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t- Si vous souhaitez avoir le choix parmi un très grand nombre de "
-"programmes incluant des outils de développement puissants, <b>PowerPack</b> "
-"est pour vous !"
+"\t* Gérer vos données personnelles avec les suites d'informations "
+"personnelles <b>Kontact</b> et <b>Evolution</b>."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Naviguer sur le web avec <b>Mozilla</b> et <b>Konqueror</b>."
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Discuter en ligne avec <b>Kopete</b>."
+
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
-"\t- Si vous avez besoin d'une solution Linux complète et personnalisable "
-"pour les réseaux locaux, choisissez <b>PowerPack+</b> !"
+"\t* Écouter vos <b>CD audio</b> et vos <b>fichiers musicaux</b>, regarder "
+"vos <b>vidéos</b>."
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:21
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Découvrez nos <b>Solutions Professionnelles</b>!"
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Créer et modifier des images avec le <b>GIMP</b>."
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Environnements de développement</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
-"<b>Corporate Server</b> : la solution idéale pour les entreprises. Il s'agit "
-"d'une solution complète « tout-en-un » qui comprend tout ce qui nécessaire "
-"pour déployer rapidement des programmes serveurs Linux de classe mondiale."
+"PowerPack vos offre les meilleurs outils pour <b>développer</b> vos propres "
+"applications."
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
-"<b>Multi Network Firewall</b> : basé sur un noyau Linux 2.4 sécurisé, le "
-"pare-feu multi-réseau gère réseaux privés virtuels (VPN) et zones DMZ  "
-"multiples. La MNF est la solution de sécurité hautes performances de "
-"prédilection."
+"Vous allez apprécier le puissant environnement de développement intégré de "
+"KDE, <b>KDevelop</b>, qui vous permettra de programmer dans un grand nombre "
+"de langages."
+
+#: share/advertising/19.pl:19
+#, c-format
+msgid ""
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
+"PowerPack fournit aussi <b>GCC</b>, le célèbre compilateur Linux et <b>GDB</"
+"b>, le débogueur associé."
+
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Éditeurs de texte</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr "PowerPack vous laissera choisir parmi les <b>célèbres éditeurs</b> :"
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b> : un éditeur de texte très configurable."
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
-"<b>MandrakeClustering</b> : la puissance et la rapidité d'un cluster Linux "
-"alliées à la stabilité et la simplicité d'utilisation de la distribution "
-"Mandrakelinux pour des performances HPC hors du commun."
+"\t* <b>XEmacs</b> : un autre éditeur de texte et environnement de "
+"développement libre."
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
-"Vous trouverez tous les produits de MandrakeSoft sur <b>MandrakeStore</b> -- "
-"notre plateforme complète de commerce en ligne."
+"\t* <b>Vim</b> : un éditeur de texte avancé, extrêmement efficace, basé sur "
+"Vi."
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Langages de programmation</b>"
+
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
-"Découvrez aussi nos offres d'aide technique. Si vous avez le moindre "
-"problème, du support standard au support professionnel, de 1 à 50 incidents, "
-"choisissez celui qui répond parfaitement à vos besoins !"
+"Avec ces <b>puissants outils</b>, vous pourrez écrire des applications dans "
+"<b>un grand nombre de langages</b> :"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* Le célèbre <b>langage C</b>."
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Les langages orientés objet :"
+
+#: 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/dwd-07.pl:13
+#: share/advertising/21.pl:20
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Devenez membre de MandrakeClub !</b>"
+msgid "\t* Scripting languages:"
+msgstr "\t* Langages de scripts "
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:21
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Besoin d'aide ?</b>"
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:22
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Note</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:18
+# c-format
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Ceci est la <b>version téléchargée</b> de Mandrakelinux."
+msgid "\t* And many more."
+msgstr "\t* Et d'autres encore."
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Outils de développement</b>"
+
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
-"Cette version gratuite et téléchargeable n'intègre pas de logiciels "
-"commerciaux. Il se peut donc que certains modems (tels certains modems ADSL "
-"et RTC) et certaines cartes vidéo (telles que les ATI® et NVIDIA® nForce) ne "
-"fonctionnent pas. Pour éviter des problèmes de compatibilité avec ces "
-"périphériques, nous vous recommendons l'achat d'un de nos produits "
-"commerciaux qui inclut les pilotes et tout autre logiciel propriétaire."
+"Avec le puissant environnement de développement intégré <b>KDevelop</b> et "
+"le célèbre compilateur <b>GCC</b>, vous pourrez créer vos logiciels dans "
+"<b>beaucoup de langages</b> (C, C++, Java™, Perl, Python, etc.)."
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Serveur de travail collaboratif</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
-"Votre nouvelle distribution Mandrakelinux est le résultat d'une "
-"collaboration entre les développeurs MandrakeSoft et les contributeurs "
-"Mandrakelinux de par le monde."
+"PowerPack+ vous donnera accès à <b>Kolab</b>, un <b>serveur de travail "
+"collaboratif</b> qui vous permettra, grâce au client <b>Kontact</b>, de :"
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Envoyer et recevoir vos <b>e-mails</b>."
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/23.pl:17
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* Partager vos <b>calendriers</b> et vos <b>carnets d'adresses</b>."
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* Gérer vos <b>mémos</b> et vos <b>listes de tâches</b>."
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Serveurs</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"PowerPack+ est une solution complète pour les petits et moyens réseaux. "
-"PowerPack+ enrichie l'édition standard PowerPack en y ajoutant une sélection "
-"complète de programmes serveurs de classe mondiale."
+"Enrichissez votre réseau d'entreprise avec les <b>solides fonctions serveur</"
+"b> incluant :"
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
-"Il s'agit du seul produit Mandrakelinux comprenant une solution de travail "
-"collaboratif."
+"\t* <b>Samba</b> : Services de partage de fichiers et d'impression pour "
+"clients Microsoft® Windows®."
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Choisissez votre environnement graphique !</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b> : Le serveur web le plus utilisé au monde."
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"La première fois que vous vous connectez à votre système Mandrakelinux, vous "
-"avez le choix parmi les environnements graphiques les plus populaires : KDE, "
-"GNOME, WindowMaker, IceWM, et bien d'autres encore."
+"\t* <b>MySQL</b> et <b>PostgreSQL</b> : Les bases de données libres les plus "
+"populaires."
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"Dans le menu Mandrakelinux, vous trouverez des programmes faciles à utiliser "
-"pour toutes les tâches :"
+"\t* CVS : Concurrent Versions System, le logiciel libre de gestion de "
+"versions le plus utilisé."
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"\t- Créez, modifiez et partagez des documents bureautique avec <b>OpenOffice."
-"org</b>"
+"\t* <b>ProFTPD</b> : Le serveur FTP sous licence GPL, entièrement "
+"configurable."
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
-"\t- Gérez vos données personnelles avec les suites d'informations "
-"personnelles : <b>Kontact</b> et <b>Evolution</b>."
+"\t* <b>Postfix</b> et <b>Sendmail</b> : Les puissants et populaires serveurs "
+"e-mail."
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Consultez des sites Web avec <b>Mozilla</b> et <b>Konqueror</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Centre de Contrôle Mandrakelinux</b>"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Participez à des discussions en ligne avec <b>Kopete</b>"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
+msgstr ""
+"Le <b>Centre de Contrôle Mandrakelinux</b> est un ensemble cohérent d'outils "
+"créés par Mandrakelinux pour simplifier la configuration de vote ordinateur."
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- Écouter des CDs audio et des fichiers musicaux avec <b>KsCD</b> et "
-"<b>Totem</b>"
+"Vous apprécierez immédiatement cette collection de <b>plus de 60</b> outils "
+"très faciles d'utilisation, pour <b>configurer facilement votre système</"
+"b> : périphériques, points de montage, connexion réseau et Internet, niveau "
+"de sécurité de votre ordinateur, etc."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Modifiez images et photos avec <b>The Gimp</b>"
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>Le modèle du logiciel libre</b>"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
-"PowerPack+ comprend tout ce qui est nécessaire à la conception et à la "
-"création de vos propres logiciels, y compris :"
+"Comme toute autre activité informatique, le logiciel libre requiert du "
+"<b>temps et des effectifs</b> pour mener à bien les développements. Pour "
+"respecter la philosophie du logiciel libre, Mandrakesoft vend des produits "
+"et des services à valeur ajoutée pour <b>continuer d'améliorer "
+"Mandrakelinux</b>. Si vous souhaitez <b>soutenir la philosophie du logiciel "
+"libre</b> et le développement de Mandrakelinux, <b>merci</b> d'envisager "
+"l'achat d'un de nos produits ou services !"
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Boutique en ligne</b>"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Kdevelop</b> : un environnement de développement intégré, doté de "
-"toutes les fonctions et facile à utiliser pour la programmation en C++"
+"Pour en savoir plus sur les produits et les services de Mandrakesoft, vous "
+"pouvez visitez notre <b>plate-forme de commerce électronique</b>."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b> : la suite de compilateurs GNU"
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
+"Vous y trouverez tous nos produits, nos services et des produits tiers."
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b> : le débogueur du projet GNU"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr ""
+"Cette plate-forme a été entièrement <b>repensée</b> pour améliorer son "
+"efficacité et sa convivialité."
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr ""
-"\t- <b>Emacs</b> : un éditeur à affichage instantané et personnalisable à "
-"souhait"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Arrêtez-vous aujourd'hui sur <b>store.mandrakesoft.com</b> !"
+
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
-"\t- <b>Xemacs</b> : un éditeur libre et un système de développement de "
-"programmes"
+"<b>Mandrakeclub</b> est le <b>partenaire parfait</b> de votre produit "
+"Mandrakelinux."
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- <b>Vim</b> : un éditeur de texte avancé comprenant bien plus de "
-"fonctions que le Vi standard"
+"Profitez de <b>nombreux avantages</b> en rejoignant Mandrakeclub, tels que :"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
-"<b>Découvrez la solution de travail collaboratif dotée de toutes les "
-"fonctionnalités !</b>"
+"\t* <b>Des réductions spéciales</b> sur des produits et des services de "
+"notre boutique en ligne <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Elle comprend des fonctionnalités client et serveur pour :"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
+msgstr ""
+"\t* Accès à des <b>applications commerciales</b> (par exemple aux pilotes "
+"NVIDIA® ou ATI™)."
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Envoyer et recevoir des courriers électroniques"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Participation aux <b>forums d'utilisateurs</b> Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
-"\t- Gérer votre calendrier, vos listes de choses à faire, vos mémos, vos "
-"contacts, les demandes de réunions (envoi et réception), les demandes de "
-"travaux (envoi et réception)"
+"\t* Accès privilégié, et avant les sorties publiques, aux images ISO de "
+"Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Carnet d'adresses (serveur et client)"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
-"Musclez votre réseau professionnel avec <b>des solutions serveurs de tout "
-"premier plan</b>"
+"<b>Mandrakeonline</b> est le tout nouveau service que Mandrakesoft est fier "
+"de présenter à ses clients !"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>Samba</b> : le serveur de fichiers et d'impression pour les clients "
-"MS-Windows"
+"Mandrakeonline fournit une large gamme de services à valeur ajoutée pour "
+"<b>mettre à jour facilement</b> votre système Mandrakelinux :"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b> : Le serveur Web le plus utilisé au monde"
-
-#: share/advertising/ppp-07.pl:17
-#, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b> : La base de données libre la plus populaire"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+"\t* Sécurité <b>parfaite</b> du système (mises à jour logicielles "
+"automatiques)."
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
-"\t- <b>CVS</b>: le système de contrôle de versions libre le plus utilisé"
+"\t* <b>Notification</b> de mises à jour (par e-mail ou par une icône sur le "
+"bureau)."
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* <b>Planification</b> flexible des mises à jour."
+
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr "\t- <b>ProFTPD</b> : le serveur FTP libre hautement configurable"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgstr ""
+"\t* Gestion de <b>tous vos systèmes Mandrakelinux</b> avec un seul compte."
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:13
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Et bien d'autres"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Votre nouvelle distribution Mandrakelinux est le résultat d'une "
-"collaboration entre les développeurs MandrakeSoft et les contributeurs "
-"Mandrakelinux à travers le monde."
+"Vous avez besoin d'<b>assistance</b> ? Rencontrez les experts techniques de "
+"Mandrakesoft sur notre <b>plate-forme de support technique</b> www."
+"mandrakeexpert.com."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Nous tenons à remercier tous ceux qui ont participé au développement de "
-"notre dernière version."
+"Nous vous y offrons une <b>nouvelle expérience</b> basée sur les services "
+"d'<b>experts Mandrakelinux qualifiés</b>."
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:19
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid ""
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr ""
+"Pour toutes questions relatives à Mandrakelinux, nous vous offrons la "
+"possibilité d'acheter des incidents de support sur <b>store.mandrakesoft."
+"com</b>."
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:25
 #, c-format
+msgid "Office Workstation"
+msgstr "Machine de bureau"
+
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"PowerPack est le principal produit Linux pour le bureau de MandrakeSoft. "
-"PowerPack est non seulement la distribution la plus facile et la plus "
-"conviviale, mais en plus, PowerPack comprend des milliers de programmes (de "
-"tout, des plus populaires aux plus techniques)."
+"Programmes pour la bureautique : traitements de texte (kword, abiword), "
+"tableurs (kspread, gnumeric), visualiseur pdf, etc"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmes pour la bureautique : traitements de texte (kword, abiword), "
+"tableurs (kspread, gnumeric), visualiseur pdf, etc"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Jeux"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
-"Dans le menu Mandrakelinux, vous trouverez des programmes faciles à utiliser "
-"pour toutes vos tâches :"
+"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimédia"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Programmes pour jouer/éditer du son et de la vidéo"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internet"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
-"\t- Gérez vos données personnelles avec les suites d'informations "
-"personnelles : <b>Kontact</b> et <b>Evolution</b>."
+"Ensemble d'outils pour lire et envoyer des courriers électroniques et des "
+"messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Ordinateur réseau (client)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Clients pour différents protocoles, dont ssh"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:54
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Consultez des sites Web avec <b>Mozilla</b> et <b>Konqueror</b>"
+msgid "Configuration"
+msgstr "Configuration"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Outils pour faciliter la configuration de votre ordinateur"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:59
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "Console Tools"
+msgstr "Utilitaires console"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
-"\t- Écouter des CDs audio et des fichiers musicaux avec KsCD et <b>Totem</b>"
+"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Outils de développement</b>"
+msgid "Documentation"
+msgstr "Documentation"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
-msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "« Linux Standard Base ». Support des programmes tiers"
+
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "chemin"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Groupe"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Serveur Samba"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Pare Feu/Routeur"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Passerelle internet"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Fichier/_Nouveau"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Serveur de courrier Postfix"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Restaurer à partir du chemin"
+
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "Serveur NTP"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
 msgstr ""
-"PowerPack comprend tout ce qui est nécessaire à la conception et à la "
-"création de vos propres logiciels, y compris :"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Serveur de Noms de domaine"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Nom du serveur d'impression"
+
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Serveur Samba"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Base de Données"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Serveurs de bases de données PostgreSQL ou 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 et Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Courrier"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Serveur de courrier Postfix"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Serveur réseau"
+
+#: share/compssUsers.pl:138
 #, c-format
-msgid "And of course the editors!"
-msgstr "Et bien sur, les éditeurs !"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "Station de travail 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 éditeur libre et un système de développement de "
-"programmes"
+"Le K Desktop Environement, l'environnement de bureau de base avec sa "
+"collection d'outils"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Station de travail 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 ""
+"Un environnement de bureau avec un ensemble de programmes et d'outils "
+"intuitifs"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Autres Environnements de Bureau"
+
+#: 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 "Philippines"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "Serveur 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 "Configuration du Serveur de Terminaux"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Surveillance du réseau"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
-"\t- <b>Vim</b> : un éditeur de texte avancé comprenant bien plus de "
-"fonctionnalités par rapport au Vi standard"
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Les produits Mandrakesoft</b>"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Échec de configuration de l'imprimante « %s » !"
 
 #: standalone.pm:21
 #, c-format
@@ -16195,7 +17008,7 @@ msgid ""
 "default mode: offer to configure autologin feature"
 msgstr ""
 "[--boot] [--splash]\n"
-"OPTIONS:\n"
+"OPTIONS :\n"
 "  --boot            - permet de configurer le gestionnaire de démarrage\n"
 "  --splash          - permet de configurer le thème du démarrage\n"
 "mode par défaut : configurer la connexion automatique"
@@ -16207,15 +17020,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 "[OPTIONS] [NOM_PROGRAMME]\n"
 "\n"
-"OPTIONS:\n"
+"OPTIONS :\n"
 "  --help            - affiche ce message.\n"
-"  --report          - le programme doit être un outil mandrake\n"
-"  --incident        - le programme doit être un outil mandrake"
+"  --report          - le programme doit être un outil mandrakelinux\n"
+"  --incident        - le programme doit être un outil mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -16243,7 +17056,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"
@@ -16270,7 +17083,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16284,7 +17097,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPTIONS]...\n"
-"Configurateur pour Mandrake Terminal Server\n"
+"Configurateur pour Mandrakelinux Terminal Server\n"
 "--enable         : active MTS\n"
 "--disable        : désactive MTS\n"
 "--start          : démarre MTS\n"
@@ -16376,7 +17189,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake resolution"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16384,117 +17197,111 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 "\n"
-"Utilisation : %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"Utilisation : %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 ""
 "Veuillez vous déconnecter puis presser simultanément les touches Ctrl-Alt-"
 "BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 "Vous devez vous déconnecter puis vous connecter à nouveau afin de prendre "
 "les changements en considération"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Inutilisable sans Serveur 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 nécessite un nom d'utilisateur...\n"
+msgstr "%s : %s nécessite un nom d'utilisateur...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
-"%s: %s a besoin du nom de domaine, de l'adresse MAC, de l'IP, de la nbi-"
+"%s : %s a besoin du nom de domaine, de l'adresse MAC, de l'IP, de la nbi-"
 "image, 0/1 pour Client Léger, 0/1 pour Config Locale...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
-msgstr "%s: %s nécessite un nom d'hôte...\n"
-
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
+msgstr "%s : %s nécessite un nom d'hôte...\n"
 
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Configuration du Serveur de Terminaux"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Activer le serveur"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Désactiver le serveur"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Lancer le serveur"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Arrêter le serveur"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "disquette/ISO etherboot"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Images d'amorçage réseau"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Ajouter/Effacer un utilisateur"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Ajouter/Effacer un client"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Assistant de première connexion"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 "%s est défini comme étant le dm, ajout de l'utilisateur gdm a /etc/passwd$"
 "$CLIENT$$"
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -16514,9 +17321,9 @@ msgstr ""
 "Cet assistant va :\n"
 "\t1) vous demander de sélectionner ou bien le type de client : « léger » ou "
 "« lourd ».\n"
-"\t2) configurer dhcp\n"
+"\t2) configurer DHCP\n"
 "\t\n"
-"Une fois ces étapes franchies, l'assistant va : \n"
+"Une fois ces étapes franchies, l'assistant va : \n"
 "    a) générer tous les nbis\n"
 "    b) activer le serveur\n"
 "    c) lancer le serveur\n"
@@ -16525,22 +17332,22 @@ msgstr ""
 "    e) vous proposer de créer une disquette de démarrage\n"
 "    f) vous proposera de redémarrer KDM s'il s'agit d'un client léger.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Annuler l'assistant"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Veuillez sauvegarder la configuration de dhcpd !"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Utiliser les client légers."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16548,46 +17355,53 @@ msgid ""
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
+"S'il vous plait sélectionnez le type de client par défaut.\n"
+"    « Client léger » utilise le processeur et la ram du serveur, utilise "
+"l'affichage du client.\n"
+"    « Client lourd » utlise son propre processeur et sa propre ram mais le "
+"système de fichier du serveur."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
-msgstr ""
+msgstr "Synchroniser le paramétrage X11 du clavier avec le serveur."
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Création des images de démarrage réseau pour tous les noyaux"
 
-#: 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 "Cela va prendre quelques minutes."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
-msgstr "Terminé!"
+msgstr "Terminé !"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
+"Pour être en mesure d'activer les changements fait pour les clients légers, "
+"le gestionnaire d'affichage doit être rechargé. Le redémarrer maintenant ?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Survol du Serveur de Terminaux"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16612,7 +17426,7 @@ msgstr ""
 "        \t\tqui est inclus dans dhcpd.conf, vous devriez créer les images\n"
 "        \t\tEtherboot pour au moins un noyau complet."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16638,7 +17452,7 @@ msgstr ""
 "retirer ces entrées.\n"
 "\t\t\t\n"
 "        \t\t(Les cartes PCI peuvent omettre l'image, etherboot demandera "
-"l'image correcte.  Il faut aussi\n"
+"l'image correcte. Il faut aussi\n"
 "        \t\ttenir compte du fait que quand etherboot cherche des images, il "
 "s'attend à trouver des noms comme\n"
 "        \t\tboot-3c59x.nbi, plutôt que boot-3c59x.2.4.19-16mdk.nbi).\n"
@@ -16646,7 +17460,7 @@ msgstr ""
 "        \t\tUne strophe habituelle de dhcpd.conf pour le support d'un client "
 "léger ressemble à :"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16657,14 +17471,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"
@@ -16691,22 +17505,22 @@ msgstr ""
 "\t\t\tde configurations séparées par client pour les fonctions que fournit "
 "ClusterNFS.\n"
 "\t\t\t\t\t\tRemarque : L'entrée « #type » est utilisée seulement par "
-"drakTermServ.  Les clients peuvent être soit\n"
+"drakTermServ. Les clients peuvent être soit\n"
 "\t\t\t« légers », soit « lourd ». Les clients légers font tourner la plupart "
-"des logiciels sur le serveur via xdmcp, \n"
+"des logiciels sur le serveur via XDMCP, \n"
 "\t\t\ttandis que les clients lourds font tourner eux-mêmes leurs logiciels. "
 "Un fichier inittab spécial, %s est\n"
 "\t\t\técrit pour les clients légers. Les fichiers de configuration système "
 "xdm-config, kdmrc, et gdm.conf sont modifiés\n"
-"\t\t\tsi des clients légers sont utilisés, pour pouvoir activer xdmcp. Étant "
-"donné que xdmcp pose des problèmes de sécurité,\n"
+"\t\t\tsi des clients légers sont utilisés, pour pouvoir activer XDMCP. Étant "
+"donné que XDMCP pose des problèmes de sécurité,\n"
 "\t\t\tles fichiers hosts.deny et hosts.allow sont modifiés pour limiter "
 "l'accès au sous-réseau local.\n"
 "\t\t\t\n"
 "\t\t\tRemarque : vous devez redémarrer le serveur après avoir ajouté ou "
 "modifié des clients."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16736,7 +17550,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tAvec SUBNET/MASK défini pour votre réseau."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16753,7 +17567,7 @@ msgstr ""
 "        \t\tDrakTermServ permet à cet effet d'ajouter ou de retirer des "
 "utilisateurs de ce fichier."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16769,7 +17583,7 @@ msgstr ""
 "        \t\tsur la partition racine du serveur. DrakTermServ permettra plus "
 "tard de créer ces fichiers."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16805,7 +17619,7 @@ msgstr ""
 "conservant les fichiers de\n"
 "        configuration, une fois que la machine cliente est configurée."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16815,7 +17629,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"
@@ -16845,26 +17659,26 @@ msgstr ""
 "        \tservice tftp\n"
 "\t\t\t{\n"
 "                        disable         = no\n"
-"                        socket_type  = dgram\n"
+"                        socket_type     = dgram\n"
 "                        protocol        = udp\n"
-"                        wait             = yes\n"
-"                        user             = root\n"
+"                        wait            = yes\n"
+"                        user            = root\n"
 "                        server          = /usr/sbin/in.tftpd\n"
-"                        server_args  = -s /var/lib/tftpboot\n"
+"                        server_args     = -s /var/lib/tftpboot\n"
 "        \t}\n"
 "        \t\t\n"
 "        \t\tIci les différences par rapport à l'installation par défaut sont "
-"le drapeau 'disable' mis à 'no'\n"
+"le drapeau « disable » mis à « no »\n"
 "        \t\tet le chemin d'accès à tftpboot mis à « /var/lib/tftpboot », où "
 "mkinitrd-net place ses images."
 
-#: 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"
@@ -16889,62 +17703,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\n"
 "        \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disquette de démarrage"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "Image ISO de démarrage"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Image PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Version du noyau par défaut"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Construire le noyau entier -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Aucun noyau sélectionné !"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Construire un NIC unique -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Aucune interface réseau sélectionnée !"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Construire tous les noyaux -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Effacer"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Effacer toutes les NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16956,27 +17770,27 @@ msgstr ""
 "connu par le Terminal Server. Effacez et ajoutez à nouveau l'utilisateur\n"
 "au Terminal Server pour permettre la connexion."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Ajouter un utilisateur -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Effacer un utilisateur"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "type : %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
-msgstr "configuration locale: %s"
+msgstr "configuration locale : %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16985,67 +17799,67 @@ msgstr ""
 "Permettre une configuration\n"
 "matérielle locale."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Aucune image d'amorçage réseau créée"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Client léger"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Autoriser les client légers"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Ajouter un client -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "type : lourd"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "type : léger"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
-msgstr "fichiers locaux: non"
+msgstr "fichiers locaux : non"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
-msgstr "configuration locale: oui"
+msgstr "configuration locale : oui"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Modifier un client"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Désactive la Configuration Locale"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Effacer un client"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Configuration de dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17054,78 +17868,78 @@ msgstr ""
 "Le gestionnaire de connexion doit être redémarré pour que les changements\n"
 "prennent tous effet. (« service dm restart » dans une console)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 "Les clients légers ne fonctionnent pas avec autologin. Désactiver autologin ?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Tous les clients utiliseront %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Sous-réseau :"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Masque de réseau :"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Routeurs :"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Masque de sous-réseau :"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Adresse de diffusion (broadcast) :"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Nom de domaine :"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Serveurs de nom :"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Début de la plage d'adresses IP :"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Fin de la plage d'adresses 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 "Écrire la configuration"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Configuration du serveur dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -17136,104 +17950,98 @@ msgstr ""
 "de votre système. Vous pouvez les modifier\n"
 "comme vous le souhaitez."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Plages d'adresses IP dynamiques"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Veuillez insérer une disquette dans le lecteur"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Impossible d'accéder à la disquette !"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "La disquette peut maintenant être retirée du lecteur"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Aucun lecteur de disquette disponible !"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "L'image PXE est %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Erreur d'écriture %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "L'image ISO etherboot est %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Quelque chose s'est mal passé ! mkisofs est-il bien installé ?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Il faut d'abord créer /etc/dhcpd.conf !"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "mauvais mot de passe %s dans Terminal Server - réécriture...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s n'est pas un utilisateur ...\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s est déjà un utilisateur du Serveur de Terminal\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "L'ajout de %s au Serveur de Terminaux a échoué !\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s a été ajouté au Serveur de Terminal\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s effacé...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s introuvable...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s est déjà utilisé\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 et /etc/hosts.deny déjà configurés. Aucune modification"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "La configuration a été modifiée. Relancer clusternfs/dhcpd ?"
@@ -17275,7 +18083,7 @@ msgstr ""
 "La disquette d'auto-installation vous permettra d'installer un autre "
 "ordinateur avec exactement la même configuration que le vôtre. Mais parmi "
 "l'ensemble des étapes d'installation, vous pouvez choisir lesquelles seront "
-"complètement  automatisées et lesquelles seront manuelles.\n"
+"complètement automatisées et lesquelles seront manuelles.\n"
 "Pour une sûreté maximale, les étapes de partitionnement et de formatage ne "
 "seront jamais faites automatiquement, quels que soient les choix que vous "
 "aviez fait lors de la première installation de cet ordinateur.\n"
@@ -17338,8 +18146,8 @@ msgstr ""
 "Les paramètres de l'installation automatique sont disponibles dans les "
 "sections sur la gauche."
 
-#: 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 "Félicitations !"
@@ -17378,27 +18186,22 @@ msgstr "hd"
 msgid "tape"
 msgstr "Cartouche"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Aucun périphérique trouvé"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
-"Expect est une extension du langage Tcl qui permet d'établir des sessions "
+"Expect est une extension du langage TCL qui permet d'établir des sessions "
 "interactives (FTP, SSH, etc.) sans intervention manuelle."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 "Stocke le mot de passe pour ce système dans la configuration DrakBackup"
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -17407,7 +18210,7 @@ msgstr ""
 "Pour un CD multisession, seulement la première session va effacer le CD/RW. "
 "Sinon, le CD/RW est effacé avant chaque sauvegarde."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17416,7 +18219,7 @@ msgstr ""
 "Cette option permet de sauver les fichiers qui ont changé. Le comportement "
 "exact dépend du mode (différentiel ou incrémental)."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17425,7 +18228,7 @@ msgstr ""
 "Les sauvegardes incrémentales ne sauvent que les fichiers modifiés ou "
 "nouveaux depuis la sauvegarde précédente."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17434,17 +18237,17 @@ msgstr ""
 "Les sauvegardes différentielles sauvent seulement les fichiers qui ont été "
 "modifiés ou ceux qui sont nouveaux depuis la sauvegarde de base."
 
-#: 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 ""
 "Ceci devrait être un nom d'utilisateur local ou une adresses e-mail auquel "
 "vous voulez que soient envoyés les résultats de la sauvegarde. Vous devrez "
 "avoir installé sur votre système un logiciel de transfert de mail (MTA)."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17453,7 +18256,7 @@ msgstr ""
 "Les fichiers listés dans le fichier .backupignore, placé au sommet d'une "
 "hiérarchie de dossiers, ne seront pas sauvegardés."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17465,7 +18268,7 @@ msgstr ""
 "sauvegarde. Activer cette option permet d'effacer les fichiers temporaires "
 "locaux après la sauvegarde."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17476,7 +18279,7 @@ msgstr ""
 "lieu d'utiliser un chemin de dossier, vous utiliseriez un nom de module pour "
 "le chemin du service."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17485,28 +18288,28 @@ msgstr ""
 "« Personnalisé » vous permet de spécifier votre propre date et heure. Les "
 "autres options utilisent « run-parts » dans /etc/crontab."
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Aucun média n'a été sélectionné pour l'opération sur cron."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Aucun intervalle n'a été sélectionné pour l'opération sur cron."
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, fuzzy, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron n'est pas encore disponible en dehors de 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 » n'est ni une adresse de courrier valide ni un utilisateur local !"
 
-#: 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 "
@@ -17516,22 +18319,22 @@ msgstr ""
 "SMTP local.\n"
 "Vous devez donc utiliser une adresse de courrier complète !"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Liste d'utilisateurs modifiée. Réécriture du fichier de configuration."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Ancienne liste d'utilisateurs :\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Nouvelle liste d'utilisateurs :\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17540,7 +18343,7 @@ msgstr ""
 "\n"
 "                      Rapport de sauvegarde (DrakBackup) \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17549,7 +18352,7 @@ msgstr ""
 "\n"
 "                      Rapport du service DrakBackup\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17562,13 +18365,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 "Avancement total :"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17581,42 +18384,42 @@ msgstr ""
 "Si vous avez déjà effectué ce processus, vous devrez probablement\n"
 "purger l'entrée des clés autorisées sur le serveur."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Générer les clefs peut prendre un moment."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Impossible de lancer %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Pas de demande de mot de passe sur %s à l'entrée %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Mauvais mot de passe sur %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Vous n'avez pas le droit de transférer %s vers %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Ne peut trouver %s sur %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s ne répond pas"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17633,47 +18436,47 @@ msgstr ""
 "\n"
 "sans qu'il ne soit affiché de demande."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Le site distant WebDAV est déjà synchronisé !"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "Échec du transfert WebDAV !"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Il n'y a pas de CDR/DVDR dans le lecteur !"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Cela ne semble pas être un support enregistrable !"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Ce n'est pas un support effaçable !"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Effacer le support peut prendre un moment."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Vous n'avez pas les droits d'accès au CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Pas de bande dans %s !"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17682,37 +18485,37 @@ msgstr ""
 "Quota de sauvegarde dépassé !\n"
 "%d Mo utilisés contre %d Mo alloués."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Sauvegarde des fichiers systèmes..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Sauvegarde sur disque dur..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Sauvegarde des comptes utilisateurs..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Sauvegarde des autres fichiers..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Sauvegarde sur disque dur..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "Pas de changement à sauvegarder !"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17723,7 +18526,7 @@ msgstr ""
 "activités de Drakbackup par %s :\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17734,7 +18537,7 @@ msgstr ""
 "Problème de connexion FTP : impossible d'envoyer vos fichiers de sauvegarde "
 "par FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -17742,12 +18545,12 @@ msgstr ""
 "Erreur pendant l'envoi du fichier par FTP. Veuillez corriger votre "
 "configuration FTP"
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "liste des fichiers envoyée par FTP : %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17758,7 +18561,7 @@ msgstr ""
 "activités de Drakbackup par CD :\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17769,23 +18572,23 @@ msgstr ""
 "activités de Drakbackup par cartouche :\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 "Impossible d'envoyer un courrier. Votre rapport n'a pas été envoyé par mail."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "Erreur lors de l'envoi du courrier.\n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Ne peut créer le catalogue !"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17794,7 +18597,7 @@ msgstr ""
 "\n"
 "Veuillez cocher toutes les options dont vous avez besoin.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17802,37 +18605,37 @@ msgstr ""
 "Ces options peuvent sauvegarder et restaurer\n"
 "tous les fichiers du dossier de configuration système « /etc »\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Sauvegarder vos fichiers système (dossier /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 ""
 "Utiliser des sauvegardes différentielles/incrémentales (ne remplace pas les "
 "anciennes sauvegardes)"
 
-#: 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 "Utiliser des sauvegardes incrémentales"
 
-#: 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 "Utiliser des sauvegardes différentielles"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Ne pas inclure les fichiers critiques (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17840,178 +18643,178 @@ msgid ""
 msgstr ""
 "Note : la sauvegarde incrémentale n'écrase pas les anciennes sauvegardes."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Veuillez cocher tous les comptes utilisateurs à sauvegarder"
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Ne pas inclure le cache du navigateur internet (fichiers tampon)"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Sélectionnez les fichiers ou dossiers puis cliquez sur « OK »"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Supprimer sélection"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Utilisateurs..."
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Sauvegarder via le réseau"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Méthode NET :"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Utiliser Expect pour SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Créer/Transférer les clés de sauvegardes pour SSH."
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Transfert Maintenant"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "D'autres clefs (pas celles de drakbackup) sont déjà en place"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Nom d'hôte ou IP."
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Dossier (ou module) où poser la sauvegarde sur cette machine"
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Identifiant de connexion"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Se souvenir du mot de passe"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 "Le nom d'hôte, le nom d'utilisateur et le mot de passe dont nécessaires !"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Sauvegarder sur CDR (ou DVDR)"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Choisissez votre lecteur CD/DVD"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Veuillez choisir la taille de votre média CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "CD multisessions"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "Média CDRW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Effacer votre support réinscriptible (1ere session)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr "Effacer maintenant"
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "Média DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "Média DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "périphérique DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Pas de périphérique CD défini !"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Sauvegarde sur cartouche"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Nom de périphérique du matériel de sauvegarde"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Sauvegarder directement sur Bande"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Ne pas rembobiner la bande après la sauvegarde"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Effacer la cartouche avant la sauvegarde"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Éjectez la bande une fois la sauvegarde effectuée"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Veuillez indiquer le dossier où sauvegarder :"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Dossier où sauvegarder"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -18020,309 +18823,309 @@ msgstr ""
 "Taille maximale\n"
 " permise à Drakbackup (Mo)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-Rom / DVD"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Dans un dossier (local ou partagé)..."
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "toutes les heures"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "tous les jours"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "toutes les semaines"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "tous les mois"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "personnalisé"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Janvier"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Février"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Mars"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Avril"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Juin"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Juillet"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Août"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Septembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Octobre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Novembre"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Décembre"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Lundi"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Vendredi"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Samedi"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Sauvegarde périodique"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Veuillez choisir l'intervalle de temps entre les sauvegardes"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Entrée setup/crontab personnalisée :"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Minute"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Heure"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Jour"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Mois"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Jour de la semaine"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Veuillez choisir le média de sauvegarde."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Veuillez vérifier que le démon « cron » fait partie de vos services."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Tenez compte du fait qu'actuellement tous les médias réseaux utilisent "
 "également le disque dur."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Veuillez choisir le type de compression"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Utiliser les fichiers .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Envoyer un rapport par courriel après chaque sauvegarde à :"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Serveur SMTP pour le courrier :"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Effacer les fichiers tar après sauvegarde vers un autre support."
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Quoi..."
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Où..."
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Quand..."
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Plus d'options..."
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "La destination de la sauvegarde n'est pas configurée..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Configuration de sauvegarde Drakbackup"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Veuillez choisir où stocker la sauvegarde"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Disque dur utilisé pour préparer les sauvegardes pour tous les médias"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "Par réseau"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "Sur CD-R"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "Sur Lecteur de Bande "
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Sauvegarder les comptes utilisateurs"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr "(par défaut, tous les utilisateurs)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Veuillez choisir ce que vous voulez sauvegarder"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Sauvegarder le système"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Sélectionner individuellement les utilisateurs"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Veuillez choisir les données à sauvegarder..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18331,7 +19134,7 @@ msgstr ""
 "\n"
 "Sources de sauvegarde : \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -18340,7 +19143,7 @@ msgstr ""
 "\n"
 "- Fichiers système :\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18349,7 +19152,7 @@ msgstr ""
 "\n"
 "- Données des utilisateurs :\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18358,7 +19161,7 @@ msgstr ""
 "\n"
 "- Autres fichiers ou dossiers :\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18367,12 +19170,12 @@ msgstr ""
 "\n"
 "- Sauvegarde sur le disque dur dans le dossier : %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLimiter l'usage disque à %s Mo\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18381,17 +19184,7 @@ msgstr ""
 "\n"
 "- Efface les fichiers du disque dur après sauvegarde.\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NON"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "OUI"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18400,22 +19193,22 @@ msgstr ""
 "\n"
 "- Graver le 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 "sur le périphérique : %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (multisession)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18424,12 +19217,17 @@ msgstr ""
 "\n"
 "- Sauvegarde sur bande via le périphérique : %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tEfface=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tSauvegarder directement sur Bande\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18438,7 +19236,7 @@ msgstr ""
 "\n"
 "- Sauvegarde via %s sur la machine : %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18447,7 +19245,7 @@ msgstr ""
 "\t\t nom de connexion : %s\n"
 "\t\t dans le dossier : %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18456,86 +19254,86 @@ msgstr ""
 "\n"
 "- Options :\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tFichiers systèmes non inclus\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tLe sauvegarde utilise « tar » et « bzip2 »\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tLa sauvegarde utilise « tar » et « gzip »\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tLa sauvegarde utilise seulement « tar »\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tUtiliser les fichiers .backupignore\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tEnvoyez un mail à %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tUtilisation du serveur SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 "\n"
-"- Démon, %s via:\n"
+"- Démon, %s via :\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-celle sur Disque dur.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-celle sur CDR.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Bande\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-celle par transfert FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-celle par transfert SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-celle par rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-celle par webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
@@ -18543,7 +19341,7 @@ msgstr ""
 "Veuillez cliquer sur « Configuration par assistant », ou « Configuration "
 "manuelle »\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18552,27 +19350,27 @@ msgstr ""
 "Liste de données à restaurer :\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Restaure les Fichiers Système.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - depuis la date : %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Restaure les Données des utilisateurs :\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Restaure les Autres fichiers ou dossiers :\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18581,128 +19379,128 @@ msgstr ""
 "Liste des données corrompues :\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Veuillez le décocher ou le retirer la prochaine fois"
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Les fichiers de sauvegarde sont corrompus"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Toutes vos données sélectionnées ont été       "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr ""
 "    correctement restaurées en prenant « %s » comme dossier racine      "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Restauration de la configuration       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK pour restaurer les autres fichiers."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "Fichiers de sauvegarde à restaurer (seul le plus récent compte)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Veuillez choisir la date à restaurer :"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Restaurer à partir d'un dossier"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Veuillez entrer le dossier où résident les sauvegardes"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Dossier des sauvegardes"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Choisir un autre support de sauvegarde"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Autre support"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Restaurer le système"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Restaurer les comptes utilisateurs"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Restaurer les autres fichiers ou dossiers"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
-msgstr "Choisir un chemin de restauration ( au lieu de / )"
+msgstr "Choisir un chemin de restauration ( au lieu de / )"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Chemin où restaurer"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Nouvelle sauvegarde avant restauration (seulement pour l'incrémental)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Retirer les dossiers personnels des utilisateurs avant restauration"
 
-#: standalone/drakbackup:3201
-#, fuzzy, c-format
+#: standalone/drakbackup:3196
+#, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "Nom de fichier à chercher :"
+msgstr "Partie de nom de fichier à chercher (chaine vide cherche tout) :"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Recherche de sauvegardes"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Aucune image trouvée..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Restaurer les fichiers choisis"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18711,8 +19509,7 @@ msgstr ""
 "Cliquez sur un date/temps pour voir les fichiers de sauvegarde.\n"
 "Control-cliquez pour sélectionner plusieurs fichiers."
 
-# whom is selected, the entry or the catalog?
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18721,7 +19518,7 @@ msgstr ""
 "Rétablir l'entrée\n"
 "du catalogue choisi."
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18730,17 +19527,17 @@ msgstr ""
 "Restaurer les\n"
 "fichiers choisis"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Fichiers de sauvegardes non trouvés sur %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Restaurer à partir d'un CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18749,17 +19546,17 @@ msgstr ""
 "Insérez le CD %s dans le lecteur correspondant\n"
 "au point de montage /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Ce n'est pas le bon CD. Celui-ci est intitulé %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Restaurer à partir d'une bande"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18768,220 +19565,220 @@ msgstr ""
 "Insérez la bande ayant pour nom %s\n"
 "dans le lecteur de bande %s."
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Ce n'est pas la bonne bande. Celle-ci s'appelle %s."
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Restaurer à partir du réseau"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Restaurer via le Protocole Réseau : %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Nom d'hôte"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Chemin de l'hôte ou du module"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Mot de passe nécessaire"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Nom d'utilisateur nécessaire"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Nom de machine nécessaire"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Le chemin ou le module est nécessaire"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Fichiers restaurés..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Échec de la restauration..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s non téléchargé ..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Chercher les fichiers à restaurer"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Restaurer toutes les sauvegardes..."
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Restauration personnalisée..."
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Restaurer à partir d'un catalogue"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Impossible de trouver les sauvegardes à restaurer...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Vérifiez que %s est le bon chemin"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " et le CD est dans le lecteur."
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "Sauvegardes sur supports non montables - Utilisez le Catalogue pour "
 "restaurer."
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "Le CD et en place - continuer."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Naviguer dans le nouvel emplacement de sauvegarde."
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Restaurer à partir du chemin"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Avancement de la restauration"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Valider"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Sauvegarder !"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Restaurer !"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Les paquetages suivants doivent être installés :\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Veuillez choisir les données à restaurer..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Sauvegarde des fichiers systèmes..."
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Sauvegarde des comptes utilisateurs..."
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Sauvegarde des autres fichiers ou dossiers..."
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "TOTAL :"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Envoi des fichiers par FTP"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Envoi des fichiers..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Sauvegarder à partir de la configuration définie"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Voir la configuration de sauvegarde"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Configuration par assistant"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Configuration manuelle"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Afficher la Configuration"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "Consulter le dernier journal"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Sauvegarder !"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18991,56 +19788,56 @@ msgstr ""
 "Veuillez cliquer sur « Configuration par assistant », ou « Configuration "
 "manuelle »"
 
-#: 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 "Sélection du thème graphique de démarrage"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Choix pour l'interface utilisateur"
 
-#: 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 "/_Fichier"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fichier/_Quitter"
 
-#: 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 "Installation de thèmes"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Créer un nouveau thème"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Utiliser le démarrage graphique"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -19050,12 +19847,17 @@ msgstr ""
 "le démarrage graphique, sélectionnez un mode graphique dans l'outil de "
 "configuration du programme d'amorçage."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Désirez-vous le configurer maintenant ?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Thème"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -19064,274 +19866,267 @@ msgstr ""
 "Affiche le thème\n"
 "dans la console"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Lancer l'interface graphique au démarrage"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Ne pas connecter automatiquement un utilisateur"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Connexion automatique (choisir utilisateur et environnement)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Utilisateur par défaut"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Environnement par défaut"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "L'installation de %s a échoué pour la raison suivante :"
-
-#: 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 ""
-"Pour soumettre un rapport de bogue, cliquez sur le bouton Signaler.\n"
-"Cela ouvrira une fenêtre de navigateur sur %s\n"
-"où vous trouverez un formulaire à remplir.\n"
-" L'information affichée ci-dessus sera transférée vers ce serveur."
+"S'il vous plait choisissez un mode vidéo, il sera appliqué à chaque entrée "
+"de démarrage sélectionnée ci-dessus.\n"
+"Vérifiez que votre carte vidéo est en mesure de supporter le mode choisis"
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Outil de signalement de bogue Mandrake"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Outil de signalement de bogue Mandrakelinux"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Centre de Contrôle Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Centre de Contrôle Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Outil de synchronisation"
 
-#: 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 "Outils autonomes"
 
-#: 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 "Contrôle à distance"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Gestionnaire de programmes"
 
-#: 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 "Outil de migration 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 "Assistants de configuration"
 
-#: 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 ""
-"Pour soumettre un rapport de bogue, cliquez sur le bouton Signaler.\n"
-"Cela ouvrira votre navigateur par défaut\n"
-"sur une page qui vous permettra d'envoyer l'information affichée ci-dessus "
-"en tant que  rapport de bogue."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Application :"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Paquetage : "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Noyau :"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Version : "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
 "or Full Path:"
 msgstr ""
 "Nom de l'Application\n"
-"ou Chemin Complet:"
+"ou Chemin Complet :"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Rechercher des Paquetages"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
-msgstr "Résumé: "
+msgstr "Résumé : "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "VOTRE TEXTE ICI"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Description de l'erreur/Informations Système"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "VOTRE TEXTE ICI"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "Version du noyau"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Envoyer les informations sur le processeur"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Envoyer la liste des périphériques PCI"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"Pour soumettre un rapport de bogue, cliquez sur le bouton Signaler.\n"
+"Cela ouvrira une fenêtre de navigateur sur %s\n"
+"où vous trouverez un formulaire à remplir.\n"
+" L'information affichée ci-dessus sera transférée vers ce serveur."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Signaler"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Non installé"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Paquetage non installé"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NON TROUVÉ"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "Connexion à %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Pas de navigateur disponible ! Veuillez en installer un."
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Veuillez taper un nom de paquetage."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Veuillez entrer votre texte de résumé."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "non défini"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Changer le fuseau horaire"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Fuseau horaire - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
-msgstr "DrakClock: GMT"
+msgstr "DrakClock : GMT"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "Votre horloge système est-elle réglée sur Greenwich (GMT) ?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Protocole du Temps Réseau (NTP)"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19340,50 +20135,55 @@ msgstr ""
 "Votre ordinateur peut synchroniser son horloge\n"
 "avec un un serveur distant via NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Activer NTP"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Serveur :"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "Impossible de synchroniser avec « %s »."
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: 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 ""
 "Le package ntp doit être installé\n"
 "afin de pouvoir activer NTP\n"
 "\n"
 "Voulez-vous l'installer ?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuration du réseau (%d cartes réseau)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Passerelle :"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interface :"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Veuillez patienter"
@@ -19393,12 +20193,8 @@ msgstr "Veuillez patienter"
 msgid "Interface"
 msgstr "Interface"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Pilote"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "État"
@@ -19413,7 +20209,7 @@ msgstr "Nom de machine : "
 msgid "Configure hostname..."
 msgstr "Configuration du nom de machine..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Configuration LAN (réseau local)"
@@ -19423,8 +20219,8 @@ msgstr "Configuration LAN (réseau local)"
 msgid "Configure Local Area Network..."
 msgstr "Configurer le réseau local..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Appliquer"
@@ -19434,107 +20230,113 @@ msgstr "Appliquer"
 msgid "Manage connections"
 msgstr "Gérer les connections"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Périphérique sélectionné"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "Configuration IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Serveurs DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Domaine recherchés"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "Statique"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Métrique"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Contrôle du flux"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Terminaison de la ligne"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Délai d'expiration du modem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Utiliser un fichier de verrouillage"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Attendre la tonalité avant de numéroter"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "Attente active"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Volume du modem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Activer"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Désactiver"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Classe de matériel"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nom du module"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Adresse matérielle"
 
-#: 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 "Position sur le 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 "
@@ -19543,20 +20345,20 @@ msgstr ""
 "Aucune carte réseau n'a été détectée sur votre système. Veuillez utiliser "
 "l'outil de configuration du matériel."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Détruire une interface réseau"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Choisissez l'interface réseau à détruire :"
 
-#: 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 ""
@@ -19565,53 +20367,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 "Félicitations, l'interface réseau « %s » a été détruite avec succès"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Pas d'IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Pas de masque"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "activé"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "arrêté"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Connecté"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Non connecté"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Se déconnecter..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Se connecter..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19620,17 +20422,17 @@ msgstr ""
 "Attention, une autre connexion internet a été détectée, peut-être utilisant "
 "votre réseau"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Désactiver maintenant"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Activer maintenant"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19639,82 +20441,103 @@ msgstr ""
 "Vous n'avez aucune interface réseau configurée.\n"
 "Vous pouvez en configurer une en cliquant sur « Configurer »"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Configuration du LAN (réseau local)"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Carte réseau %s : %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocole d'amorçage"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Lancer au démarrage"
 
-#: 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 ""
 "Cette interface n'a pas encore été configurée.\n"
 "Lancez l'assistant « Ajouter une interface » depuis le Centre de Contrôle "
-"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 ""
 "Vous n'avez aucune connexion internet configurée.\n"
-"Vous pouvez en créer une en cliquant sur « Accès à Internet »"
+"Lancez l'assistant « Ajouter une interface » depuis le Centre de Contrôle "
+"Mandrakelinux"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Configuration de la connexion internet"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Serveur DNS tertiaire (optionnel)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Configuration de la connexion internet"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Accès internet"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Type de connexion : "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "État :"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (Gestionaire de connection de GNOME)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (Gestionaire de connection de KDE)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkDM (Gestionaire de connection de Mandrakelinux)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (Gestionaire de connection X)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Choix d'un gestionnaire de connexion"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19722,98 +20545,108 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 "Le gestionnaire de connexion vous permet d'ouvrir une session graphique\n"
-"sur votre système grâce au serveur d'affichage XFree, et permet le "
+"sur votre système grâce au serveur d'affichage Xorg, et permet le "
 "fonctionnement\n"
-"de plusieurs sessions XFree en même temps sur la même machine."
+"de plusieurs sessions Xorg en même temps sur la même machine."
 
-#: 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 ""
 "Les modifications ont été appliquées à la configuration, souhaitez-vous "
 "redémarrer le service 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 ""
+"Vous êtes sur le point de fermer tous les programmes en cours d'exécution et "
+"de fermer votre session. Êtes-vous vraiment sur que vous voulez redémarrer "
+"le service dm ?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Création d'une disquette d'amorçage"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Général"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Périphérique"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Version du noyau"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Préférences"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Options avancées"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Taille"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Arguments optionnels pour mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "forcer"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "ne pas tenir compte des modules RAID"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "si besoin est"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "ne pas tenir compte des modules SCSI"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Ajouter un module"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Retirer un module"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Assurez-vous qu'un médium est présent dans le périphérique %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19822,22 +20655,23 @@ msgstr ""
 "Il n'y a aucune disquette dans le lecteur %s ou alors elle est \n"
 "protégée contre l'écriture. Veuillez vérifier ou en insérer une."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Ne peut dédoubler (fork) : %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "La création de la disquette est maintenant terminée"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "La création de la disquette de démarrage a été menée avec succès\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"
@@ -19964,7 +20798,7 @@ msgstr ""
 "\n"
 "- Vous pouvez installer les polices par la voie habituelle. Dans de rares "
 "cas,\n"
-"des polices boguées peuvent bloquer votre serveur d'affichage XFree."
+"des polices boguées peuvent bloquer votre serveur d'affichage Xorg."
 
 #: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
@@ -19981,7 +20815,7 @@ msgstr "Liste des polices"
 msgid "About"
 msgstr "À propos"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Désinstaller"
@@ -19991,10 +20825,11 @@ msgstr "Désinstaller"
 msgid "Import"
 msgstr "Importer"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -20003,7 +20838,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 par MandrakeSoft\n"
+"Copyright © 2001-2002 par Mandrakesoft\n"
 "\n"
 "     DUPONT Sebastien (original version)\n"
 "\n"
@@ -20011,7 +20846,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"
@@ -20047,7 +20882,7 @@ msgstr ""
 "en même temps que ce programme; sinon, écrivez à la « Free Software\n"
 "Foundation », Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -20076,15 +20911,15 @@ msgstr ""
 "\t   type1inst génère les fichiers fonts.dir, fonts.scale et Fontmap.\n"
 "\n"
 "    -  ttf2pt1 :   \n"
-"\t  par Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
+"\t  par Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin \n"
 "             Conversion des fichiers ttf vers afm et pfb\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Choisissez les programmes qui utiliseront ces polices"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20098,124 +20933,129 @@ msgstr ""
 "\n"
 "Vous pouvez installer les polices par la voie habituelle. Dans de rares "
 "cas,\n"
-"des polices boguées peuvent bloquer votre serveur d'affichage XFree."
+"des polices boguées peuvent bloquer votre serveur d'affichage Xorg."
 
-#: 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 "Imprimantes génériques"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Sélectionnez les polices ou dossiers et cliquez sur « Ajouter »"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Sélection de fichiers ou dossiers"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Vous n'avez sélectionné aucune police"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importer les polices"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Installer les polices"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "cliquez ici si vous êtes sûr"
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "ici sinon"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Désélectionne tout"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Sélectionne tout"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Désinstalle la liste"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Importation des polices en cours"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Tests initiaux"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copier les polices sur votre système"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Installe et convertit des polices"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Post-installation"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Retirer des polices de votre système"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Post-désinstallation"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Partage de la connexion internet"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Désolé, nous ne prenons en charge que les noyaux 2.4 et ultérieurs."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Le partage de la connexion à Internet est désactivé"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -20228,39 +21068,39 @@ msgstr ""
 "\n"
 "Que souhaitez-vous faire ?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "activer"
 
-#: 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 "reconfigurer"
 
-#: 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 "ne rien faire"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Activation des serveurs..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Le partage de la connexion internet est maintenant activé."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Le partage de la connexion internet est activé"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20273,22 +21113,22 @@ msgstr ""
 "\n"
 "Que souhaitez-vous faire ?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "désactiver"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Désactivation des serveurs..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Le partage de la connexion à Internet est maintenant désactivé."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20312,27 +21152,27 @@ msgstr ""
 "Veuillez noter que vous avez besoin d'une carte réseau dédiée à votre réseau "
 "local."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (utilisant le module %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interface %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Aucune carte réseau n'est présente dans votre système !"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Carte réseau"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20347,7 +21187,12 @@ msgstr ""
 "\n"
 "Je vais configurer votre réseau local avec cette carte réseau."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Choisissez la carte réseau"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20355,12 +21200,12 @@ msgid ""
 msgstr ""
 "Veuillez choisir quelle carte réseau sera connectée à votre réseau local"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Interface réseau déjà configurée"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20375,27 +21220,27 @@ msgstr ""
 "\n"
 "Vous pouvez le faire manuellement, mais vous devez savoir ce que vous faites."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Reconfiguration automatique"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Non (pour les experts)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Montrer la configuration actuelle"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Configuration actuelle de l'interface"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20412,7 +21257,7 @@ msgstr ""
 "Attribution de l'adresse : %s\n"
 "Pilote : %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20441,12 +21286,12 @@ msgstr ""
 "DHCP à votre place.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Adresse de Réseau Local"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20459,76 +21304,76 @@ msgstr ""
 "Vous pouvez ici sélectionner différentes options pour le serveur DHCP.\n"
 "Si vous ne connaissez pas leur signification, laissez-les telles quelles."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "Adresse IP du serveur DHCP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "L'adresse IP du serveur DNS"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "Le nom de domaine international"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "La plage DHCP de début"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "La plage DHCP de fin"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Délai standard (en secondes)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Délai maxi (en secondes)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Reconfigurer l'interface et le serveur DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Le réseau local ne finissait pas par `.0', j'abandonne."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Conflit potentiel d'adresses du réseau local trouvé dans la configuration de "
 "%s !\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Configuration en cours..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Configuration des scripts, installation des logiciels, démarrage des "
 "serveurs..."
 
-#: 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 "Des problèmes sont apparus en installant le paquetage %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20545,14 +21390,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 © 2003-2004 Mandrakesoft.\n"
 "Ce programme est un logiciel libre et peut être redistribué selon les\n"
 "termes de la licence GNU GPL.\n"
 "\n"
@@ -20579,7 +21424,12 @@ msgstr ""
 " --doc <lien>          - lien vers une autre page web (pour l'interface de "
 "bienvenue de WM)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Le centre d'aide de Mandrakelinux"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20588,7 +21438,7 @@ msgstr ""
 "%s ne peut être affiché\n"
 ". Aucune entrée d'aide pour ce type\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20597,42 +21447,42 @@ msgstr ""
 "Aucun navigateur n'est installé sur votre système. Veuillez en installer un "
 "si vous voulez consulter le système d'aide."
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Réglages système"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Réglages personnalisés"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Réglages personnalisés et système"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Éditable"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Chemin"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Utilisateur"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Groupe"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Permissions"
@@ -20694,9 +21544,9 @@ msgid "Delete selected rule"
 msgstr "Supprimer la règle"
 
 #. -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 "Éditer"
@@ -20706,103 +21556,121 @@ msgstr "Éditer"
 msgid "Edit current rule"
 msgstr "Modifier la règle"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "naviguer"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "utilisateur"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "groupe"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "autre"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Lecture"
 
-#: 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 "Permet à « %s » de lire ce fichier"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Écriture"
 
-#: 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 "Permet à « %s » de modifier ce fichier"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Exécuter"
 
-#: 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 "Permet à « %s » d'exécuter ce fichier"
 
-#: 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"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
 "Utilisé pour des dossiers :\n"
-"un fichier du dossier ne peut être effacé ou renommé que par le "
-"propriétaire  du dossier ou du fichier"
+"un fichier du dossier ne peut être effacé ou renommé que par le propriétaire "
+"du dossier ou du fichier"
 
-#: 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 "Utiliser l'id du propriétaire lors de l'exécution"
 
-#: 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 "Utiliser l'id du groupe lors de l'exécution"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Utilisateur :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Groupe :"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Utilisateur courant"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr ""
 "Une fois vérifiés, le propriétaire et le groupe ne seront plus modifiés"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Sélection du chemin"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Propriété"
@@ -20932,54 +21800,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Emplacement du fichier auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "TOUS"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "par défaut"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorer"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "non"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "yes"
-msgstr "oui"
+msgid "Ignore"
+msgstr "Ignorer"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -21017,20 +21873,22 @@ msgstr ""
 "de la sécurité de votre machine.\n"
 "\n"
 "\n"
-"L'Administrateur de Sécurité recevra les alertes de sécurité si\n"
-"l'option « Alertes de Sécurité » est cochée.  Il peut s'agir d'une\n"
-"adresse email ou d'un nom d'utilisateur.\n"
+"L' « <span weight=\"bold\">Administrateur de Sécurité</span> » recevra\n"
+"les alertes de sécurité si l'option « <span weight=\"bold\">Alertes de\n"
+"Sécurité</span> » est cochée. Il peut s'agir d'une adresse email ou\n"
+"d'un nom d'utilisateur.\n"
 "\n"
 "\n"
-"Le menu « Niveau de Sécurité » permet de sélectionner l'un des six\n"
-"niveaux de sécurité préconfigurés par msec.\n"
-"Ces niveaux vont de « Très faible » à « Paranoïaque », utilisable comme\n"
-"base pour créer un serveur hautement sécurisé.\n"
+"Le menu « <span weight=\"bold\">Niveau de Sécurité</span> » permet de\n"
+"sélectionner l'un des six niveaux de sécurité préconfigurés par msec.\n"
+"Ces niveaux vont de « <span weight=\"bold\">Très faible</span> » à\n"
+"« <span weight=\"bold\">Paranoïaque</span> », utilisable comme base\n"
+"pour créer un serveur hautement sécurisé.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Très faible</span> : Ce niveau de\n"
-"sécurité n'est absolument pas sur mais votre système est plus facile à\n"
-"utiliser.  Il ne devrait donc pas être utilisé sur une machine\n"
+"sécurité n'est absolument pas sûr mais votre système est plus facile à\n"
+"utiliser. Il ne devrait donc pas être utilisé sur une machine\n"
 "connectée à un réseau ou à Internet.\n"
 "\n"
 "\n"
@@ -21054,62 +21912,56 @@ msgstr ""
 "précédent, mais le système sera totalement clos et la sécurité au\n"
 "maximum."
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Description des champs :\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(valeur par défaut : %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Niveau de sécurité :"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Alertes de sécurité :"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Administrateur sécurité :"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Options de base"
 
-#: 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 options suivantes permettent de personnaliser la sécurité de votre "
-"système.\n"
-"Si vous avez besoin d'explications, jetez un œil aux bulles d'aide.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Options réseau"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Options système"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Vérifications périodiques"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Veuillez patienter, configuration du niveau de sécurité..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Veuillez patienter, configuration des options de sécurité..."
@@ -21119,7 +21971,8 @@ msgstr "Veuillez patienter, configuration des options de sécurité..."
 msgid "No Sound Card detected!"
 msgstr "Aucune carte son détectée !"
 
-#: 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-"
@@ -21140,7 +21993,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -21281,15 +22134,15 @@ msgstr "Affiche le logo dans la console"
 msgid "Make kernel message quiet by default"
 msgstr "Rendre non bavards les messages noyau"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Mode d'emploi"
 
-#: 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 "Ces thèmes n'avaient pas encore d'image de démarrage dans %s !"
 
 #: standalone/draksplash:167
@@ -21302,102 +22155,115 @@ msgstr "choisissez l'image"
 msgid "saving Bootsplash theme..."
 msgstr "sauvegarde du thème de démarrage..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Sélection de couleur de la barre de progression"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Vous devez choisir une image d'abord !"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Création de l'aperçu ..."
 
 #. -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 "Aperçu de l'écran de démarrage %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 ""
+"L'image « %s » ne peut être chargée pour la raison suivante :\n"
+"\n"
+"<span foreground=\\\"Red\\\">%s</span>"
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Connecté via un port série ou un cable USB"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Ajouter un onduleur"
 
-#: 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 ""
 "Bienvenue dans l'utilitaire de configuration des onduleurs.\n"
 "\n"
 "Vous allez pouvoir ajouter ici un nouvel onduleur à votre système.\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 ""
 "Nous allons ajouter un onduleur.\n"
 "\n"
 "Voulez-vous détecter automatiquement les onduleurs connectées à cette "
-"machine ?"
+"machine ou en sélectionner un manuellement ?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Autodétection"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Détection en cours"
 
-#: 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 "Félicitations"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr "L'assistant a ajouté avec succès les onduleurs suivants :"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Aucun onduleur supplémentaire trouvé"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Configuration du pilote UPS"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Veuillez sélectionner votre modèle d'onduleur."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Marque / modèle :"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21406,88 +22272,88 @@ msgstr ""
 "Nous allons configurer l'onduleur « %s » depuis « %s ».\n"
 "Veuillez remplir son nom, son pilote et son 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 "Le nom de votre onduleur"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr "Le pilote qui gère votre onduleur"
 
-#: 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 "le port sur lequel votre onduleur est connecté"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "L'assistant a configuré avec succès le onduleur « %s »."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Périphériques onduleur"
 
-#: 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 "Utilisateurs UPS"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Listes de Contrôle d'Accès"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr "Masque IP"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Règles"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Actions"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Niveau"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "Nom de l'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 "Bienvenue dans l'outil de configuration des onduleurs"
@@ -21509,7 +22375,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "La configuration de la connexion VPN a déjà été effectuée.\n"
 "\n"
@@ -21539,7 +22405,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "La configuration de la connexion VPN a déjà été effectuée.\n"
 "\n"
@@ -21577,6 +22443,18 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
+"Vous êtes sur le point de configurer votre ordinateur pour utiliser une "
+"connection VPN.\n"
+"\n"
+"Avec cette fonctionalité, les ordinateurs de votre réseau local et ceux "
+"d'autres réseaux privés distants peuvent partagés des ressources à travers "
+"leur firewall respectif, en passant par internet, de manière sécurisée.\n"
+"\n"
+"La communication à travers internet est cryptée. L'ordinateur local et celui "
+"distant regardent s'ils sont sur le m me réseau.\n"
+"\n"
+"Vérifiez bien que vous avez configuré votre réseau et connection internet "
+"via drakconnect avant d'aller plus loin."
 
 #: standalone/drakvpn:184
 #, c-format
@@ -21612,7 +22490,7 @@ msgstr "Module du noyau."
 #: 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"
@@ -21632,7 +22510,7 @@ msgstr "Politiques de sécurité"
 #: standalone/drakvpn:292
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "service IKE : raccon"
 
 #: standalone/drakvpn:295 standalone/drakvpn:306
 #, c-format
@@ -21642,14 +22520,21 @@ msgstr "Fichier de configuration"
 #: 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 ""
+"Etape de configuration !\n"
+"\n"
+"Vous devez définir la potlitique de sécurité et ensuite configurer le "
+"service d'échange de clé automatique (IKE).\n"
+"Le service KAME IKE utilsé est appelé racoon.\n"
+"\n"
+"Que voulez-vous configurer ?\n"
 
 #: standalone/drakvpn:307
 #, c-format
@@ -21675,13 +22560,22 @@ 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 ""
+"Le contenu du fichier  %s \n"
+"est divisé en sections.\n"
+"\n"
+"Maintenant vous pouvez :\n"
+"\n"
+"  - afficher, ajouter, modifier, ou enlever des sections, ensuite\n"
+"  - appliquez les changements\n"
+"\n"
+"Que voulez-vous faire ?\n"
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
@@ -21691,9 +22585,9 @@ msgid ""
 msgstr "Afficher"
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
-#, fuzzy, c-format
+#, c-format
 msgid "Commit"
-msgstr "compact"
+msgstr "Appliquer"
 
 #: standalone/drakvpn:347 standalone/drakvpn:351 standalone/drakvpn:709
 #: standalone/drakvpn:713
@@ -21728,7 +22622,7 @@ msgstr "entreés d'ipsec.conf"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -21737,6 +22631,16 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"Le fichier %s contient différentes sections.\n"
+"\n"
+"Voici son squelette :\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"
+"\n"
+"Vous pouvez maintenant ajouter une de ses sections.\n"
+"\n"
+"Choisissez la section que vous voulez ajouter.\n"
 
 #: standalone/drakvpn:376
 #, fuzzy, c-format
@@ -21755,7 +22659,7 @@ msgstr "Mode normal"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Existe !"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21767,6 +22671,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
+"Une section portant ce nom existe déjà.\n"
+"Le nom de section doit tre uniqueT\n"
+"\n"
+"YVous devez revenir en arrière et ajouter une autre sectionnoou changer son "
+"nom\n"
 
 #: standalone/drakvpn:400
 #, c-format
@@ -21779,6 +22688,12 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Cette section doit se trouver en haut du fichier %s.\n"
+"\n"
+"Soyer sur que toutes les autres section suivent cette section de "
+"configuration.\n"
+"\n"
+"Choisissez continuer ou précédent quyand vous avez fini.\n"
 
 #: standalone/drakvpn:405
 #, c-format
@@ -21786,29 +22701,29 @@ msgid "interfaces"
 msgstr "interfaces"
 
 #: standalone/drakvpn:406
-#, c-format
+#, fuzzy, c-format
 msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
 
 #: standalone/drakvpn:407
-#, c-format
+#, fuzzy, c-format
 msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
 
 #: standalone/drakvpn:408
-#, c-format
+#, fuzzy, c-format
 msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
 
 #: standalone/drakvpn:409
-#, c-format
+#, fuzzy, c-format
 msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
 
 #: standalone/drakvpn:410
-#, c-format
+#, fuzzy, c-format
 msgid "uniqueids"
-msgstr ""
+msgstr "Identifiant unique"
 
 #: standalone/drakvpn:444
 #, c-format
@@ -21822,6 +22737,12 @@ msgid ""
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
+"C'est la première section après celle de configuration.\n"
+"\n"
+"Ici vous définissez les paramètres par défaut. \n"
+"Toutes les autres sections devront suivre celle-ci.\n"
+"Les paramètres de gauche sont optionnels. Si vous ne les définissez pas ici\n"
+"vous pourrez les définir dans chaques section.\n"
 
 #: standalone/drakvpn:451
 #, c-format
@@ -21839,9 +22760,9 @@ msgid "compress"
 msgstr "compresser"
 
 #: standalone/drakvpn:454
-#, c-format
+#, fuzzy, c-format
 msgid "disablearrivalcheck"
-msgstr ""
+msgstr "Désactiver la relève d'arrivée"
 
 #: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
@@ -21854,14 +22775,14 @@ msgid "leftcert"
 msgstr ""
 
 #: standalone/drakvpn:457 standalone/drakvpn:496
-#, c-format
+#, fuzzy, c-format
 msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
 
 #: standalone/drakvpn:458 standalone/drakvpn:497
-#, c-format
+#, fuzzy, c-format
 msgid "leftsubnet"
-msgstr ""
+msgstr "Masque de sous réseau de gauche"
 
 #: standalone/drakvpn:459 standalone/drakvpn:498
 #, c-format
@@ -21908,9 +22829,9 @@ msgid "rightrsasigkey"
 msgstr ""
 
 #: standalone/drakvpn:502
-#, c-format
+#, fuzzy, c-format
 msgid "rightsubnet"
-msgstr ""
+msgstr "Masque de sous réseau de droite"
 
 #: standalone/drakvpn:503
 #, c-format
@@ -21926,6 +22847,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
+"Une section avec nom existe déjà.\n"
+"Le nom de section doit être unique.\n"
+"\n"
+"Vous devez retourner en arrière et ajouter une autre section\n"
+"ou changer le nom de cette section.\n"
 
 #: standalone/drakvpn:543
 #, c-format
@@ -21936,6 +22862,11 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Ajouter une politique de sécurité.\n"
+"\n"
+"Vous pouvez mainenant ajouter une politique de sécurité.\n"
+"\n"
+"Choisissez continuer quand vous avez fini d'écrire ces données.\n"
 
 #: standalone/drakvpn:576 standalone/drakvpn:826
 #, c-format
@@ -21959,7 +22890,7 @@ msgstr "Noms des sections"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Ne peut éditer !"
 
 #: standalone/drakvpn:591
@@ -21967,11 +22898,16 @@ msgstr "Ne peut éditer !"
 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 ""
+"Vous ne pouvez pas modifier cette section.\n"
+"\n"
+"Cette section est obligatoire pour Freeswan 2.X.\n"
+"Une section doit spécifier « version 2.0 » dans le haut du fichier %s et "
+"éventuellement, désactiver ou activer le cryptage.\n"
 
 #: standalone/drakvpn:600
 #, c-format
@@ -22006,7 +22942,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 ""
@@ -22031,13 +22967,22 @@ 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"
 "  - remove \t\t (remove an existing section)\n"
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
+"Le fichier de configuration racoon.conf.\n"
+"\n"
+"Le contenu de ce fichier est découpé en sections.\n"
+"Vous pouvez :\n"
+"  - afficher \t\t (afficher le contenu du fichier)\n"
+"  - ajouter\t\t\t (ajouter une section)\n"
+"  - modifier \t\t\t (modifier les paramètres d'un section)\n"
+"  - enlever\t\t (enlever une section existante)\n"
+"  - appliquer \t\t (écrire les changements dans le fichier réel)"
 
 #: standalone/drakvpn:714
 #, c-format
@@ -22048,6 +22993,11 @@ msgid ""
 "\n"
 "You'll have to go back and choose configure.\n"
 msgstr ""
+"Le fichier %s n'existe pas\n"
+"\n"
+"Cela sera une nouvelle configuration.\n"
+"\n"
+"Vous devez revenir en arrière et choisir configurer.\n"
 
 #: standalone/drakvpn:728
 #, c-format
@@ -22059,13 +23009,21 @@ msgstr "entrées de racoonf.conf"
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"L'étape d'ajout de section.\n"
+"\n"
+"Ce qui suit est le squelette du fichier « racoon.conf » :\n"
+"\t'chemin'\n"
+"\t'distant'\n"
+"\t'sainfo' \n"
+"\n"
+"Choisissez la section que vous voulez ajouter.\n"
 
 #: standalone/drakvpn:735
 #, c-format
@@ -22078,9 +23036,9 @@ msgid "remote"
 msgstr "distant"
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "sainfo"
-msgstr "Espagnol"
+msgstr ""
 
 #: standalone/drakvpn:743
 #, c-format
@@ -22093,38 +23051,38 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:746
-#, fuzzy, c-format
+#, c-format
 msgid "path type"
-msgstr "Changer le type"
+msgstr "type de chemin"
 
 #: 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 ""
 
 #: standalone/drakvpn:770 standalone/drakvpn:863
-#, fuzzy, c-format
+#, c-format
 msgid "real file"
-msgstr "Sélectionnez un fichier"
+msgstr "fichier réel"
 
 #: standalone/drakvpn:793
 #, c-format
@@ -22135,6 +23093,10 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Soyez sur que vous ayez déjà la section de chemin.\n"
+"en haut du fichier racoon.conf.\n"
+"Vous pouvez maintenant choisir les paramètres distants.\n"
+"Choisissez continuer ou précédent quand vous avez fini.\n"
 
 #: standalone/drakvpn:810
 #, c-format
@@ -22145,6 +23107,11 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Soyez sur que vous ayez déjà les sections de chemin.\n"
+"en haut de votre fichier %s.\n"
+"\n"
+"Vous pouvez maintenant choisir les paramètres sainfo.\n"
+"Choisissez continuer ou précédent quand vous avez fini.\n"
 
 #: standalone/drakvpn:827
 #, c-format
@@ -22165,6 +23132,12 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Votre fichier %s a plusieurs sections.\n"
+"\n"
+"\n"
+"Vous pouvez maintenant modifier les paramètre de la section distantes.\n"
+"\n"
+"Choisissez continuer quand vous avez écrit les données.\n"
 
 #: standalone/drakvpn:847
 #, c-format
@@ -22175,6 +23148,11 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data."
 msgstr ""
+"Votre fichier %s a plusieurs sections.\n"
+"\n"
+"Vous pouvez maintenant modifier les paramètre de la section sainfo.\n"
+"\n"
+"Choisissez continuer quand vous avez écrit les données."
 
 #: standalone/drakvpn:855
 #, c-format
@@ -22189,11 +23167,18 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Cette section doit être en haut du fichier %s.\n"
+"\n"
+"Soyez sur que les autres sections suivent cette section de chemin.\n"
+"\n"
+"Vous pouvez maintenant modifier les entrés de chemin.\n"
+"\n"
+"Choisissez continuer ou précédent quand vous avez fini.\n"
 
 #: standalone/drakvpn:862
 #, c-format
 msgid "path_type"
-msgstr ""
+msgstr "type de chemin"
 
 #: standalone/drakvpn:903
 #, c-format
@@ -22206,6 +23191,13 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
+"Tout a été configuré.\n"
+"\n"
+"Vous pouvez maintenant partager vos ressources à travers internet\n"
+"de manière sécurisée, en utilisant une connection VPN.\n"
+"\n"
+"Vous devez être sur que la section de shorewall concernant les tunnels est "
+"configurée."
 
 #: standalone/drakvpn:923
 #, c-format
@@ -22223,7 +23215,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"
@@ -22251,7 +23243,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"
@@ -22276,7 +23268,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"
@@ -22304,7 +23296,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"
@@ -22324,25 +23316,25 @@ 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 ""
 
 #: standalone/drakvpn:996
-#, fuzzy, c-format
+#, c-format
 msgid "Lifetime number"
-msgstr "un nombre"
+msgstr "Durée de vie du nombre"
 
 #: standalone/drakvpn:997
 #, c-format
 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"
@@ -22357,25 +23349,25 @@ msgstr ""
 #: standalone/drakvpn:1013
 #, c-format
 msgid "Lifetime unit"
-msgstr ""
+msgstr "Unité de la durée de vie "
 
 #: standalone/drakvpn:1015
 #, c-format
 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"
@@ -22415,7 +23407,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]"
@@ -22438,9 +23430,9 @@ msgid ""
 msgstr ""
 
 #: standalone/drakvpn:1060
-#, fuzzy, c-format
+#, c-format
 msgid "Generate policy"
-msgstr "Sécurité"
+msgstr "Générer des règles de sécurité"
 
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
 #, c-format
@@ -22483,6 +23475,8 @@ msgid ""
 "to on.  The default value is off.  It is useful for a\n"
 "server."
 msgstr ""
+"Si vous ne voulez pas initier la négociation, mettez ceci à on.\n"
+"La valeur par défaut est off. C'est plus pratique pour un serveur."
 
 #: standalone/drakvpn:1081
 #, c-format
@@ -22490,9 +23484,9 @@ msgid "Certificate type"
 msgstr "Type de certificat"
 
 #: standalone/drakvpn:1083
-#, fuzzy, c-format
+#, c-format
 msgid "My certfile"
-msgstr "Sélectionnez un fichier"
+msgstr "Mon fichier de certification"
 
 #: standalone/drakvpn:1084
 #, c-format
@@ -22510,14 +23504,14 @@ msgid "Name of the private key"
 msgstr "Nom de la clé privée"
 
 #: standalone/drakvpn:1087
-#, fuzzy, c-format
+#, c-format
 msgid "Peers certfile"
-msgstr "Sélectionnez un fichier"
+msgstr "Fichier de certification du tiers"
 
 #: standalone/drakvpn:1088
 #, c-format
 msgid "Name of the peers certificate"
-msgstr ""
+msgstr "Nom du certificat du tiers"
 
 #: standalone/drakvpn:1089
 #, c-format
@@ -22530,6 +23524,9 @@ msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
+"Si vous ne voulez pas vérifier le certificat du tiers pour certaines "
+"raisons,\n"
+"désactivez ceci. La valeur par défaut est actif."
 
 #: standalone/drakvpn:1093
 #, c-format
@@ -22540,7 +23537,7 @@ msgstr "Mon identifiant"
 #, 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"
@@ -22549,7 +23546,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"
@@ -22558,13 +23555,13 @@ 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 ""
 
 #: standalone/drakvpn:1114
-#, fuzzy, c-format
+#, c-format
 msgid "Peers identifier"
 msgstr "Identifiant peers"
 
@@ -22578,12 +23575,20 @@ msgstr "Protocole"
 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 ""
+"Spécifiez l'algorythme de cryptage utilisé pour la phase 1 de la "
+"négociation.\n"
+"Ce choix doit etre défini.\n"
+"L'alogorythme est un des suivants :\n"
+"\n"
+"DES, 3DES, blowfish, cast128 pour oakley.\n"
+"\n"
+"Pour d'autres cryptages, ce paramètre ne doit pas être utilisé."
 
 #: standalone/drakvpn:1124
 #, c-format
@@ -22673,7 +23678,12 @@ msgstr "Source/destination"
 #: standalone/drakvpn:1146
 #, c-format
 msgid "require"
-msgstr ""
+msgstr "Requis"
+
+#: standalone/drakvpn:1146
+#, c-format
+msgid "default"
+msgstr "par défaut"
 
 #: standalone/drakvpn:1146
 #, c-format
@@ -22685,67 +23695,67 @@ msgstr "utiliser"
 msgid "unique"
 msgstr "unique"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "USA (hertzien)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "USA (câble)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "USA (câble ou HRC)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Canada (câble)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japon (hertzien)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japon (câble)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Chine (hertzien)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Europe de l'ouest"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Europe de l'est"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "France [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Nouvelle Zélande"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Câble TV australien Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22754,47 +23764,48 @@ msgstr ""
 "SVP,\n"
 "Veuillez choisir votre région et votre norme de TV"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Norme TV :"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Zone :"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Recherche des canaux de télévision en cours ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Recherche des canaux de télévision"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Une erreur est survenue pendant la recherche des chaînes TV."
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Passez une bonne journée !"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Maintenant vous pouvez lancer xawtv (sous X-Window) !\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Aucune carte TV détectée !"
 
-#: 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-"
@@ -22815,17 +23826,17 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Autres pilotes"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "list des autres pilotes pour cette carte son"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
@@ -22833,33 +23844,7 @@ msgstr ""
 "ceci est le bus physique sur lequel le périphérique est connecté (ex : PCI, "
 "USB, ...)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Canal"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "Nappe EIDE/Canal 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 ""
-"le noyau Linux doit exécuter une boucle de calcul au démarrage pour "
-"initialiser un compteur d'horloge.  Le résultat est donné sous la forme de "
-"bogomips et donne une indication sur les performances du processeur."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Identification de Bus"
@@ -22886,135 +23871,287 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Taille du cache"
-
-#: standalone/harddrake2:33
-#, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "taille du cache (de second niveau) du processeur"
-
-#: standalone/harddrake2:34
-#, c-format
 msgid "Drive capacity"
 msgstr "Spécificités du lecteur"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:33
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 "caractéristiques spéciales du lecteur (capable de graver des médias ou de "
 "lire des DVD)"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:34
 #, c-format
-msgid "Coma bug"
-msgstr "Bogue de « coma »"
+msgid "this field describes the device"
+msgstr "ce champs décrit le périphérique"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:35
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "le processeur a-t-il le bogue « coma » du Cyrix 6x86 ?"
+msgid "Old device file"
+msgstr "Ancien nom de périphérique"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:36
 #, c-format
-msgid "Cpuid family"
-msgstr "Famille CPUID"
+msgid "old static device name used in dev package"
+msgstr "ancien nom de périphérique statique utilisé dans le paquetage dev"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:37
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "famille du processeur (exemple : 6 pour la classe des i686)"
+msgid "New devfs device"
+msgstr "Nouveau périphérique devfs"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:38
 #, c-format
-msgid "Cpuid level"
-msgstr "Niveau CPUID"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "nouveau nom de périphérique dynamique généré par devfs"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "niveau d'information qui peut être obtenu par l'instruction cpuid"
+msgid "Module"
+msgstr "Module"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:41
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Fréquence (MHz)"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "le module du noyau GNU/Linux qui gère ce périphérique"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"la fréquence du processeur en MHz (les méga hertz sont en première\n"
-"approximation le nombre d'instructions exécutables par seconde par le\n"
-"processeur)"
+msgid "Extended partitions"
+msgstr "Partitions étendues"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:42
 #, c-format
-msgid "this field describes the device"
-msgstr "ce champs décrit le périphérique"
+msgid "the number of extended partitions"
+msgstr "le nombre de partitions étendues"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "Ancien nom de périphérique"
+msgid "Geometry"
+msgstr "Géométrie"
 
 #: standalone/harddrake2:43
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "ancien nom de périphérique statique utilisé dans le paquetage dev"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "Géométrie cylindres/têtes/secteurs du disque"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Nouveau périphérique devfs"
+msgid "Disk controller"
+msgstr "Contrôleur disque"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
+msgstr "le contrôlleur disque du coté de l'hote"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "nouveau nom de périphérique dynamique généré par devfs"
+msgid "class of hardware device"
+msgstr "classe de matériel"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Modèle"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "Modèle de disque dur"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "port de l'imprimante réseau"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Module"
+msgid "Primary partitions"
+msgstr "Partitions primaires"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "le module du noyau GNU/Linux qui gère ce périphérique"
+msgid "the number of the primary partitions"
+msgstr "le nombre de partitions primaires"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "Extended partitions"
-msgstr "Partitions étendues"
+msgid "the vendor name of the device"
+msgstr "le nom du vendeur de ce périphérique"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
-msgid "the number of extended partitions"
-msgstr "le nombre de partitions étendues"
+msgid "Bus PCI #"
+msgstr "Bus PCI n°"
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "ceci est le bus PCI sur lequel le périphérique est connecté"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "Périphérique PCI n°"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "Numéro du périphérique PCI"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "Fonction PCI n°"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "Numéro de fonction PCI"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "Identifiant du Vendeur"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "ceci est l'identifiant numérique standard du vendeur"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "Identifiant du périphérique"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "ceci est l'identifiant numérique de ce périphérique"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "Identifiant secondaire du vendeur"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "ceci est l'identifiant numérique mineur du vendeur"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "Identifiant secondaire du périphérique"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "ceci est l'identifiant numérique mineur de ce périphérique"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "Identifiant du périphérique 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 ""
+"le noyau Linux doit exécuter une boucle de calcul au démarrage pour "
+"initialiser un compteur d'horloge. Le résultat est donné sous la forme de "
+"bogomips et donne une indication sur les performances du processeur."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Taille du cache"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "taille du cache (de second niveau) du processeur"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Bogue de « coma »"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "le processeur a-t-il le bogue « coma » du Cyrix 6x86 ?"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Famille CPUID"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "famille du processeur (exemple : 6 pour la classe des i686)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Niveau CPUID"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "niveau d'information qui peut être obtenu par l'instruction cpuid"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Fréquence (MHz)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"la fréquence du processeur en MHz (les méga hertz sont en première\n"
+"approximation le nombre d'instructions exécutables par seconde par le\n"
+"processeur)"
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Drapeaux processeurs indiqués par du noyau"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Bogue de l'instruction FDIV"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23025,54 +24162,44 @@ msgstr ""
 "nombres flottants qui empêche d'avoir la précision nécessaire lors d'une "
 "opération de division en flottants (FDIV)."
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "Coprocesseur arithmétique présent"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "« oui » signifie qu'un coprocesseur arithmétique est présent"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Est-ce que le FPU a un vecteur d'IRQ"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr "« oui » signifie que le coprocesseur possède un vecteur d'exception"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "Bogue f00f"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "les premiers Pentium étaient bogués et se bloquaient pendant le décodage du "
 "bytecode f00f"
 
-#: standalone/harddrake2:56
-#, c-format
-msgid "Geometry"
-msgstr "Géométrie"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr "Géométrie cylindres/têtes/secteurs du disque"
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "Bogue de l'instruction halt"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23081,126 +24208,65 @@ msgstr ""
 "Certaines vielles puces i486DX-100 ne peuvent pas redémarrer de façon fiable "
 "après une instruction « halt »."
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Type de lecteur de disquette"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "le format des disquettes que le lecteur accepte"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "sous-génération de processeur"
 
-#: standalone/harddrake2:62
-#, c-format
-msgid "class of hardware device"
-msgstr "classe de matériel"
-
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Modèle"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "Modèle de disque 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 "génération du processeur (exemple : 8 pour les Pentium III, ...)"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Nom du modèle"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "le nom officiel du fabriquant de ce processeur"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Nombre de boutons"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "le nombre de boutons que possède la souris"
-
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "le nom du processeur"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "port de l'imprimante réseau"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "Identifiant du processeur"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "le numéro du processeur"
 
-#: standalone/harddrake2:70
-#, c-format
-msgid "Primary partitions"
-msgstr "Partitions primaires"
-
-#: standalone/harddrake2:70
-#, c-format
-msgid "the number of the primary partitions"
-msgstr "le nombre de partitions primaires"
-
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Numéro de modèle"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "numéro de sous-modèle du processeur (stepping)"
 
-#: standalone/harddrake2:72
-#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "le type de bus sur lequel la souris est connectée"
-
-#: standalone/harddrake2:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "le nom du vendeur de ce périphérique"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "le nom du vendeur de ce processeur"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Protection en écriture"
 
-#: 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 ""
@@ -23208,60 +24274,192 @@ msgstr ""
 "les accès en écriture et prévient ainsi les bogues du kernel écrivant "
 "directement dans la mémoire des processus utilisateurs"
 
-#. -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 "Type de lecteur de disquette"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "le format des disquettes que le lecteur accepte"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Canal"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "Nappe EIDE/Canal SCSI"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Identifiant du disque"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "généralement le numéro de série du disque"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Numéro d'unité logique"
+
+#: 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 ""
+"le numéro de la cible SCSI (LUN). Les périphériques SCSI connectés à l'hote "
+"sont uniquement identifiés par\n"
+"un numéro de canal, un un numéro de cible et un numéro d'unité logique."
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Fichier de périphérique"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+"le fichier de périphérique utilisé pour communiquer avec le pilote du noyau "
+"pour la souri"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr "Molette émulée"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "la molette est-elle émulée ou non"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "le type de la souris"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "le nom de la souris"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Nombre de boutons"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "le nombre de boutons que possède la souris"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "le type de bus sur lequel la souris est connectée"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr "Protocole souris utilisé par X11"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "le protocole utilisé par l'interface du bureau avec la souris"
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identification"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Connexion"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Performances"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Bogues"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "Coprocesseur arithmétique"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partitions"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Fonctionnalités"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Options"
 
-#: 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 "/_Aide"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Auto-détecter les _imprimantes"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Auto-détecter les _modems"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Auto-détecter les périphériques _Jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Quitter"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Description des champs"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Aide de Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Description des champs :\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 "
@@ -23270,67 +24468,74 @@ msgstr ""
 "Après avoir sélectionné un périphérique, vous pourrez consulter les "
 "informations correspondantes dans la partie droite (« Information »)"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Signaler une bogue"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_A propos..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "A propos de Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Harddrake est l'outil de configuration Mandrake du matériel.\n"
+"Harddrake est l'outil de configuration Mandrakelinux du matériel.\n"
 "<span foreground=\"royalblue3\">Version :</span> %s\n"
 "<span foreground=\"royalblue3\">Auteur :</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 version %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Matériel détecté"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Configuration du module"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Lancer l'outil de configuration"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "inconnu"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Divers"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -23338,184 +24543,189 @@ msgstr ""
 "Cliquez sur un périphérique dans l'arborescence afin de consulter les "
 "informations correspondantes."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "esclave"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "maître"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "graveur"
 
-#: 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 "Veuillez choisir votre type de clavier."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Souhaitez-vous que la touche BackSpace retourne Delete en console ?"
 
-#: 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 ""
 "Les changements ont été effectués mais ne seront effectifs qu'après votre "
 "déconnexion"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Actions des Outils Mandrake"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Actions des Outils Mandrakelinux"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "N'afficher que pour les jours sélectionnés"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Fichier/_Nouveau"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
-msgstr "<Ctrl>-N"
+msgstr "<control>N"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/Fichier/_Ouvrir"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
-msgstr "<Ctrl>-O"
+msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Fichier/Enregi_strer"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
-msgstr "<Ctrl>-S"
+msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Fichier/_Enregistrer sous"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Fichier/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Options/Test"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Aide/_A propos..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Authentification"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Utilisateur"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Messages"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "Syslog"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "chercher"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Un outil pour voir vos fichiers journaux"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Paramètres"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Contenant"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "mais ne contenant pas"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Choisir le fichier"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Contenu du fichier"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Alerte par courrier"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "L'assistant des alertes par mail a échoué de manière imprévue :"
 
 #: standalone/logdrake:221
@@ -23523,62 +24733,57 @@ msgstr "L'assistant des alertes par mail a échoué de manière imprévue :"
 msgid "please wait, parsing file: %s"
 msgstr "s'il vous plaît attendez, examen du fichier : %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Serveur web Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Résolveur de Nom de domaine"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "Serveur FTP"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Serveur de courrier Postfix"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Serveur Samba"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "Serveur SSH"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Service Webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Service Xinetd"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Configurer le système d'alerte par email"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Arrêter le système d'alerte par email"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Configuration des alertes par courrier"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23589,17 +24794,17 @@ msgstr ""
 "\n"
 "Vous allez pouvoir configurer ici vos les alertes systèmes.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Que désirez-vous faire ?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Configuration des services"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23607,54 +24812,54 @@ msgid ""
 msgstr ""
 "Vous recevrez une alerte si l'un des services sélectionnés ne tourne plus"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Chargement des paramètres"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Vous recevrez une alerte si la charge machine dépasse cette valeur"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Charge"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Configuration des alertes"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Veuillez entrer votre adresse courriel ci -dessous"
 
-#: 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 ""
 "et entrez le nom (ou l'adresse IP) du serveur SMTP que vous désirez utiliser"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 "L'assistant a configuré avec succès le service d'alerte par courrier "
 "électronique."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 "L'assistant a désactivé avec succès le service d'alerte par courrier "
 "électronique."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Enregistrer sous..."
@@ -23679,27 +24884,76 @@ msgstr "Test de la souri"
 msgid "Please test your mouse:"
 msgstr "Veuillez tester votre souris :"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "Le réseau est actif sur l'interface %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 ""
+"Le réseau est inactif sur l'interface %s. Cliquez sur « Configuration du "
+"Réseau »"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Connecter %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Déconnecter %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Surveillance Réseau"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Configuration du Réseau"
+
+#. -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 "Rafraîchir"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Aide en ligne"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Toujours lancer au démarrage"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Surveillance du réseau"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Statistiques globales"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Instantané"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Moyenne"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23708,7 +24962,7 @@ msgstr ""
 "Vitesse\n"
 "d'émission :"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23717,7 +24971,7 @@ msgstr ""
 "Vitesse de\n"
 "réception :"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23726,81 +24980,76 @@ msgstr ""
 "Temps de\n"
 "connexion : "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Utiliser la même échelle pour les paquets reçus et ceux envoyés"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Test de votre connexion, veuillez patienter..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Déconnexion d'Internet en cours"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
-msgstr "Connexion à Internet en"
+msgstr "Connexion à Internet "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
-msgstr "La déconnexion d'Internet a échouée."
+msgstr "La déconnexion d'Internet a échoué."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Déconnexion d'Internet effectuée."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Connexion effectuée."
 
-#: 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 connexion a échoué.\n"
-"Vérifiez votre configuration dans le Centre de Contrôle Mandrake."
+"Vérifiez votre configuration dans le Centre de Contrôle Mandrakelinux."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Configuration des couleurs"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "envoyés : "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "reçus : "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "moyenne"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Mesure locale"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "transmis"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "reçus"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23809,177 +25058,172 @@ msgstr ""
 "Attention, une autre connexion internet a été détectée, peut-être utilisant "
 "votre réseau"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Déconnecter %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Connecter %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Aucune connexion internet n'a été configurée"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Chargement de la configuration des imprimantes... Veuillez patienter"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Lecture des données des imprimantes installées..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
-msgstr "Outil de gestion des imprimantes  %s"
+msgstr "Outil de gestion des imprimantes %s"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Actions"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Ajouter une Imprimante"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/par _défaut"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Éditer"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Effacer"
 
-#: 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 "/_Rafraîchir"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Ajouter une Imprimante"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Configuration de CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Chercher :"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Nom de l'Imprimante"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Type de connexion"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Nom du serveur"
 
 #. -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 ""
 "Ajouter une\n"
 "Imprimante"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Ajouter une nouvelle imprimante au système"
 
 #. -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 "Par défaut"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Choisir l'imprimante sélectionnée comme étant celle par défaut"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Modifier l'imprimante sélectionné"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Supprimer l'imprimante sélectionnée"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Rafraîchir la liste"
 
 #. -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 ""
 "Configuration\n"
 "de CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Configurer le système d'impression CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Activé"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Désactivé"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Auteurs : "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Gestion des imprimantes \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -23991,12 +25235,12 @@ msgstr ""
 "\n"
 "Souhaitez-vous installer les paquetages SANE ?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Annulation de Scannerdrake"
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -24004,78 +25248,67 @@ msgstr ""
 "Impossible d'installer les paquetages nécessaires à la configuration d'un "
 "scanner avec ScannerDrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "ScannerDrake ne sera pas lancé tout de suite."
 
-#: 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 "Recherche de scanners configurés..."
 
-#: 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 "Recherche de nouveaux scanners..."
 
-#: 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 "Régénération de la liste des scanners configurés..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s n'est pas supporté par cette version de %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s trouvé sur %s. Le configurer automatiquement ?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s n'est pas dans la base des scanners, configuration manuelle ?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Sélectionnez un modèle de scanner"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Modèle détecté : %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Port : %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s n'est pas supporté par cette version de Scannerdrake."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Ne pas installer le fichier du 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 "
@@ -24084,12 +25317,12 @@ msgstr ""
 "Il est possible que votre %s nécessite que son firmware soit uploade à "
 "chaque fois qu'il est allumé."
 
-#: 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 "Dans ce cas, cela peut être effectué automatiquement."
 
-#: 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 "
@@ -24098,7 +25331,7 @@ msgstr ""
 "Pour ce faire, vous devez fournir le fichier du firmware pour votre scanner "
 "afin qu'il soit installé."
 
-#: 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 "
@@ -24107,23 +25340,23 @@ msgstr ""
 "Vous trouverez le fichier sur le CD ou la disquette qui accompagne votre "
 "scanner, sur la page web du fabricant ou sur votre partition Windows."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Installer le fichier du firmware depuis"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Sélectionnez un fichier 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 ""
 "Le fichier firmware « %s » n'existe pas ou n'est pas accessible en lecture !"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24132,7 +25365,7 @@ msgstr ""
 "Il est possible que vos scanners nécessitent que leurs firmware soient mis à "
 "jour à chaque fois qu'ils sont branchés."
 
-#: 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 "
@@ -24141,7 +25374,7 @@ msgstr ""
 "Pour ce faire, vous devez fournir le fichier du firmware de vos scanners "
 "afin qu'ils puissent être installés."
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -24150,32 +25383,32 @@ msgstr ""
 "Si vous avez déjà installé le firmware de votre scanner, vous pouvez le "
 "mettre à jour en fournissant un nouveau fichier de firmware."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Installer le firmware pour le"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Sélectionnez un fichier de firmware pour %s"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "Impossible d'installer le fichier du firmware pour %s!"
+msgstr "Impossible d'installer le fichier du firmware pour %s !"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Le fichier du firmware de votre %s a été installé avec succès."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s n'est pas supporté"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24185,33 +25418,33 @@ msgstr ""
 "Vous pouvez lancer printerdrake depuis le Centre de Contrôle %s dans la "
 "section Matériel"
 
-#: 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 "Auto-détecter les 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 "Veuillez sélectionner le périphérique sur lequel %s est branché"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(N.B. : les ports parallèles ne peuvent être auto-détectés)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "choisissez le périphérique"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Recherche des scanners..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24222,7 +25455,7 @@ msgstr ""
 "Vous pouvez maintenant scanner des documents en utilisant « XSane » ou "
 "« Kooka » à partir du menu général Multimédia->Graphisme."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24235,7 +25468,7 @@ msgstr ""
 "%s\n"
 "sont disponibles sur votre système.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24248,42 +25481,42 @@ msgstr ""
 "%s\n"
 "est disponible sur votre système.\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 "Aucun scanner trouvé disponible sur votre système.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Rechercher des nouveaux scanners"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Ajouter manuellement un scanner"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Installer/Mettre à jour les fichier de firmware"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Partage de scanners"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Toutes les machines distantes"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Cette machine"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24293,7 +25526,7 @@ msgstr ""
 "être accessibles depuis des machines distantes, et quelles machines pourront "
 "y accéder."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24302,34 +25535,34 @@ msgstr ""
 "Vous pouvez aussi décider ici si les scanners des machines distantes seront "
 "rendus disponibles sur cette machine."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 "Les scanners de cette machine sont utilisables par les autres ordinateurs"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Partage de scanners pour les hôtes : "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Utiliser des scanners sur des ordinateurs distants"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Utiliser les scanners sur les hôtes : "
 
-#: 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 "Partage de scanners locaux"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24338,58 +25571,58 @@ msgstr ""
 "Voici les machines à partir desquelles les scanners connectés localement "
 "seront disponibles :"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Ajouter un hôte"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Modifier l'hôte sélectionné"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Supprimer l'hôte sélectionné"
 
-#: 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 ou Adresse IP de l'hôte :"
 
-#: 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 ""
 "Choisissez l'hôte à partir duquel les scanners locaux seront 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 "Vous devez entrer un nom d'hôte ou une adresse 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 "Cet hôte est déjà dans la liste, il ne peut pas être rajouté.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Utilisation des scanners distants"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 "Voici les machines à partir desquelles les scanners locaux seront "
 "disponibles :"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24401,32 +25634,32 @@ msgstr ""
 "\n"
 "Voulez-vous installer le paquetage 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 "Vos scanners ne seront pas disponibles sur le réseau."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr "Certains matériels listés dans la classe  « %s » ont été enlevés :\n"
+msgstr "Certains matériels listés dans la classe « %s » ont été enlevés :\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s a été enlevé\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Certains périphériques ont été ajoutés : %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s a été ajouté\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Détection du matériel en cours"
@@ -24438,7 +25671,7 @@ msgstr "Modification matériel dans la classe « %s » (%s seconds pour répon
 
 #: 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 "Désirez-vous lancer l'outil approprié ?"
 
 #: steps.pm:14
@@ -24531,22 +25764,22 @@ msgstr "Installer les mises à jour"
 msgid "Exit install"
 msgstr "Fin de l'installation"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Est-ce correct ?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Développer l'arborescence"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Réduire l'arborescence"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Basculer entre tri alphabétique et tri par groupes"
@@ -24565,257 +25798,313 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Échec de l'installation"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Machine de bureau"
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "Utilise BIND anonyme"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programmes pour la bureautique : traitements de texte (kword, abiword), "
-"tableurs (kspread, gnumeric), visualiseur pdf, etc"
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Jeux"
+#~ msgid "NO"
+#~ msgstr "NON"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
-"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
+#~ msgid "YES"
+#~ msgstr "OUI"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimédia"
+#~ 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 options suivantes permettent de personnaliser la sécurité de votre "
+#~ "système.\n"
+#~ "Si vous avez besoin d'explications, jetez un œil aux bulles d'aide.\n"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmes pour jouer/éditer du son et de la vidéo"
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "%s n'est pas supporté par cette version de Scannerdrake."
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet"
+#~ msgid "Hide Release Notes"
+#~ msgstr "Cache les notes de version"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Ensemble d'outils pour lire et envoyer des courriers électronique et des "
-"messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "Tchèque (QWERTZ)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinateur réseau (client)"
+#~ msgid "German"
+#~ msgstr "Allemand"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients pour différents protocoles, dont ssh"
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak standard"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuration"
+#~ msgid "Spanish"
+#~ msgstr "Espagnol"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Outils pour faciliter la configuration de votre ordinateur"
+#~ msgid "Finnish"
+#~ msgstr "Finlandais"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Utilitaires console"
+#~ msgid "French"
+#~ msgstr "Français"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
+#~ msgid "Norwegian"
+#~ msgstr "Norvégien"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Station de travail KDE"
+#~ msgid "Polish"
+#~ msgstr "Polonais"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Le K Desktop Environement, l'environnement de bureau de base avec sa "
-"collection d'outils"
+#~ msgid "Russian"
+#~ msgstr "Russe"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Station de travail GNOME"
+#~ msgid "Swedish"
+#~ msgstr "Suédois"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un environnement de bureau avec un ensemble de programmes et d'outils "
-"intuitifs"
+#~ msgid "Albanian"
+#~ msgstr "Albanais"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Autres Environnements de Bureau"
+#~ msgid "Armenian (old)"
+#~ msgstr "Arménien (ancien)"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "Arménien (machine à écrire)"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "Arménien (phonétique)"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentation"
+#~ msgid "Arabic"
+#~ msgstr "Arabe"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "Azerbaïdjanais (latin)"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "Belgian"
+#~ msgstr "Belge"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "« Linux Standard Base ». Support des programmes tiers"
+#~ msgid "Bengali"
+#~ msgstr "Bengale"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "Bulgare (phonétique)"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache et Pro-ftpd"
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "Bulgare (BDS)"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Courrier"
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "Brésilien"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Serveur de courrier Postfix"
+#~ msgid "Bosnian"
+#~ msgstr "Bosniaque"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Données"
+#~ msgid "Belarusian"
+#~ msgstr "Blélorusse"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+#~ msgid "Swiss (German layout)"
+#~ msgstr "Suisse (allemand)"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Pare Feu/Routeur"
+#~ msgid "Swiss (French layout)"
+#~ msgstr "Suisse (français)"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passerelle internet"
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "Tchèque (QWERTY)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serveur réseau"
+#~ msgid "German (no dead keys)"
+#~ msgstr "Allemand (sans touches mortes)"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
+#~ msgid "Devanagari"
+#~ msgstr "Devanagari"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Ensemble d'outils pour lire et envoyer des courriers électronique, des "
-"messages de forums, et pour naviguer sur Internet"
+#~ msgid "Danish"
+#~ msgstr "Danois"
 
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Souhaitez-vous exporter par NFS (protocole Unix) ou SMB (protocole "
-#~ "Windows) ?"
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak américain"
 
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Souhaitez-vous exporter par NFS (protocole Unix) ou SMB (protocole "
-#~ "Windows) ?"
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (Esperanto)"
 
-#~ msgid "The package %s is going to be removed."
-#~ msgstr "Le paquetage %s va être désinstallé."
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak norvégien"
 
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr ""
-#~ "Vous devez être root afin de pouvoir consulter le fichier de "
-#~ "configuration. \n"
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak suédois"
 
-#~ msgid "Can't open %s!"
-#~ msgstr "Ne peut ouvrir %s !"
+#~ msgid "Estonian"
+#~ msgstr "Estonien"
 
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Votre carte vidéo peut utiliser l'accélération 3D matérielle mais\n"
-#~ "uniquement en utilisant XFree %s.\n"
-#~ "Votre carte vidéo est supportée par XFree %s. Ce dernier peut être plus\n"
-#~ "performant en 2D."
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "Géorgien (disposition russe)"
 
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Votre carte vidéo peut utiliser l'accélération 3D matérielle mais\n"
-#~ "uniquement en utilisant XFree %s.\n"
-#~ "Attention, veuillez noter que ce support est EXPÉRIMENTAL et peut "
-#~ "BLOQUER\n"
-#~ "VOTRE ORDINATEUR.\n"
-#~ "\n"
-#~ "Votre carte vidéo est supportée par XFree %s. Ce dernier peut être plus\n"
-#~ "performant en 2D."
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "Géorgien (disposition latine)"
 
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac (pilote d'affichage pour l'installation)"
+#~ msgid "Greek"
+#~ msgstr "Grec"
 
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "4 milliards de couleurs (32 bits)"
+#~ msgid "Greek (polytonic)"
+#~ msgstr "Grec (polytonic)"
 
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "Serveur XFree86 : %s\n"
+#~ msgid "Gujarati"
+#~ msgstr "Gujarati"
 
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "Voici la liste complète des claviers disponibles"
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhi"
 
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "Insérez la disquette d'amorçage utilisée dans le lecteur %s"
+#~ msgid "Hungarian"
+#~ msgstr "Hongrois"
 
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr ""
-#~ "Profitez de nombreux avantages, produits et services en rejoignant le "
-#~ "MandrakeClub !"
+#~ msgid "Croatian"
+#~ msgstr "Croate"
 
-#~ msgid "TCP/IP"
-#~ msgstr "TCP/IP"
+#~ msgid "Irish"
+#~ msgstr "Irlandais"
 
-#~ msgid "Account"
-#~ msgstr "Compte"
+#~ msgid "Israeli"
+#~ msgstr "Israélien"
 
-#~ msgid "Wireless"
-#~ msgstr "Sans fil"
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "Israélien (phonétique)"
 
-#~ msgid ""
-#~ "Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
-#~ "tests, the 2.4 series kernel will be installed as the default to insure\n"
-#~ "compliance under the \"LSB\" group selection."
-#~ msgstr ""
-#~ "Suite à des incompatibilités entre la série 2.6.x du noyau et les "
-#~ "vérifications LSB dynamiques, la série 2.4.x du noyau sera installée par "
-#~ "défaut afin de garantir la conformité avec sélection du groupe « LSB »."
+#~ msgid "Iranian"
+#~ msgstr "Iranien"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandais"
+
+#~ msgid "Italian"
+#~ msgstr "Italien"
+
+#~ msgid "Inuktitut"
+#~ msgstr "Inuktitut"
+
+#~ msgid "Japanese 106 keys"
+#~ msgstr "Japonais 106 touches"
+
+#~ msgid "Kannada"
+#~ msgstr "Kannada"
+
+#~ msgid "Korean keyboard"
+#~ msgstr "Coréen"
+
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "Clavier Kirghiz"
+
+#~ msgid "Latin American"
+#~ msgstr "Latino-américain"
+
+#~ msgid "Laotian"
+#~ msgstr "Laotien"
+
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "Lituanien (AZERTY, ancien modèle)"
+
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "Lituanien (AZERTY, nouveau modèle)"
+
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "Lituanien « ligne de nombres » QWERTY"
+
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "Lituanien « phonétique » QWERTY"
+
+#~ msgid "Latvian"
+#~ msgstr "Letton"
+
+#~ msgid "Malayalam"
+#~ msgstr "Malayalam"
+
+#~ msgid "Macedonian"
+#~ msgstr "Macédonien"
+
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "Myanmar (Burmese)"
+
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "Mongolien (cyrillique)"
+
+#~ msgid "Maltese (UK)"
+#~ msgstr "Maltais (UK)"
+
+#~ msgid "Maltese (US)"
+#~ msgstr "Maltais (US)"
+
+#~ msgid "Dutch"
+#~ msgstr "Hollandais"
+
+#~ msgid "Oriya"
+#~ msgstr "Oriya"
+
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "Polonais (QWERTY)"
+
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "Polonais (QWERTZ)"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugais"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "Canadien (Québec)"
+
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "Roumain (QWERTZ)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "Roumain (QWERTY)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "Russe (phonétique)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Saami (norvégien)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "Saami (Suédois/Finnois)"
+
+#~ msgid "Slovenian"
+#~ msgstr "Slovénien"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "Slovaque (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "Slovaque (QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "Serbe (cyrillique)"
+
+#~ msgid "Syriac"
+#~ msgstr "Syriaque"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "Syriaque (phonétique)"
+
+#~ msgid "Telugu"
+#~ msgstr "Telegu"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "Tamoul (ISCII)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "Tamoul (façon machine à écrire)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "Thaïlandais"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "Tadjik"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "Turc (modèle traditionnel « F »)"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "Turc (modèle moderne « Q »)"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ukrainien"
+
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "Ouzbékistanais (cyrillique)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "Vietnamien « colonne numérique » QWERTY"
+
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "Yougoslave (latin)"
 
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTV n'est pas installé !"
+#~ msgid "RAID md%s\n"
+#~ msgstr "Appartient au RAID md%s\n"
diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po
index e0167fcfe..72538cf98 100644
--- a/perl-install/share/po/hu.po
+++ b/perl-install/share/po/hu.po
@@ -1,23 +1,90 @@
+# translation of hu.po to Hungarian
 #
 # translation of DrakX-hu.po to Hungarian
-# Copyright (C) 2000-2001,2003 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001,2003, 2004 Free Software Foundation, Inc.
 # Emese Kovacs <emese@gnome.hu>, 2000-2001.
-# Arpad Biro <biro_arpad@yahoo.com>, 2000,2003.
+# Arpad Biro <biro_arpad@yahoo.com>, 2000,2003, 2004.
 # Tamas Szanto <tszanto@mol.hu>, 2001.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-hu\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2003-09-18 21:16+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-08 21:19+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
+"X-Generator: KBabel 1.3.1\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Melyik USB-kulcsot szeretné formázni?"
+
+#: ../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 ""
+"A(z) \"%s\" USB-eszköz formázása következik. Ez a tevékenység minden\n"
+"adatot törölni fog az eszközről. Bizonyosodjon meg arról, hogy a\n"
+"kijelölt eszköz valóban a formázni kívánt USB-kulcs. Javasolt a\n"
+"művelet időtartamára eltávolítani a többi USB-s tárolóeszközt."
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "A kulcs nem írható."
+
+#: ../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 ""
+"Úgy tűnik, az USB-kulcson be van kapcsolva az írásvédelem. Távolítsa el\n"
+"az eszközt, kapcsolja ki az írásvédelmet, majd tegye be újra az eszközt."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Újra"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Folytatás USB-kulcs nélkül"
+
+#: ../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 ""
+"Úgy tűnik, az USB-kulcson be van kapcsolva az írásvédelem, de az\n"
+"eszközt jelenleg nem lehet biztonságosan eltávolítani.\n"
+"\n"
+"\n"
+"Kattintson a gombra a gép újraindításához, távolítsa el az eszközt,\n"
+"kapcsolja ki az írásvédelmet, tegye be a kulcsot ismét, majd indítsa\n"
+"el újra a Mandrake Move rendszert."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Újraindítás"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -31,8 +98,18 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
+"Az USB-kulcson nincsen érvényes windowsos (FAT) partíció.\n"
+"A folytatáshoz szükség van egyre (így lehetőség lesz a\n"
+"fájloknak más rendszerekből (például Windows) való elérésére\n"
+"és módosítására). Tegyen be egy olyan USB-kulcsot, amely\n"
+"tartalmaz windowsos partíciót.\n"
+"\n"
+"\n"
+"Továbbléphet USB-kulcs nélkül is - normál, CD-ről futó\n"
+"Mandrake-rendszerként így is használhatja a Mandrake\n"
+"Move rendszert."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -47,138 +124,114 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
-
-#: ../move/move.pm:423
-#, c-format
-msgid "Need a key to save your data"
-msgstr ""
-
-#: ../move/move.pm:425
-#, 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
-#, fuzzy, c-format
-msgid "Key isn't writable"
-msgstr "Az XawTV program nincsen telepítve."
-
-#: ../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"
+"A rendszerben nem található USB-kulcs. Ha behelyez egy USB-kulcsot,\n"
+"akkor a Mandrake Move el tudja menteni az Ön saját könyvtárában\n"
+"levő adatokat valamint a rendszer beállításait, amelyek\n"
+"felhasználhatók lesznek a gép következő indításakor vagy egy másik\n"
+"gépen. Ha most helyez be egy ilyen eszközt, várjon néhány\n"
+"másodpercet a következő ellenőrzés elkezdése előtt.\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 ""
+"Továbbléphet USB-kulcs nélkül is - normál, CD-ről futó\n"
+"Mandrake-rendszerként így is használhatja a Mandrake\n"
+"Move rendszert."
 
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
+#: ../move/move.pm:494
 #, c-format
-msgid "Reboot"
-msgstr "Újraindítás"
+msgid "Need a key to save your data"
+msgstr "Szükség van egy kulcsra az adatok mentéséhez"
 
-#: ../move/move.pm:453
+#: ../move/move.pm:496
 #, 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
-#, fuzzy, c-format
-msgid "Retry"
-msgstr "Visszatöltés"
+msgid "Detect USB key again"
+msgstr "USB-kulcs ismételt felismerése"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
-msgstr ""
+msgstr "Az USB-kulcs beállítása"
 
-#: ../move/move.pm:466
-#, fuzzy, c-format
+#: ../move/move.pm:517
+#, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "Biztonsági szint beállítása..."
+msgstr ""
+"Kis türelmet - a rendszer beállítási fájljainak elhelyezése az USB-kulcson..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
+"Adja meg felhasználói információit - a jelszó a képernyővédőhöz lesz "
+"használva"
 
-#: ../move/move.pm:498
-#, fuzzy, c-format
+#: ../move/move.pm:556
+#, c-format
 msgid "Auto configuration"
-msgstr "Egyéni beállítás"
+msgstr "Automatikus beállítás"
 
-#: ../move/move.pm:498
-#, fuzzy, c-format
+#: ../move/move.pm:556
+#, c-format
 msgid "Please wait, detecting and configuring devices..."
-msgstr "Biztonsági szint beállítása..."
-
-#: ../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
+msgstr "Kis türelmet - az eszközök azonosítása és beállítása..."
+
+#: ../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 "Hiba"
 
-#: ../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"
@@ -187,12 +240,12 @@ msgstr ""
 "Hiba történt, de nem lett megfelelően lekezelve.\n"
 "Csak akkor lépjen tovább, ha biztos abban, hogy ez nem fog gondot okozni."
 
-#: ../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 "Hiba lépett fel"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -211,43 +264,68 @@ msgid ""
 "a look at log files in console #3 and #4 to try to\n"
 "guess what's happening."
 msgstr ""
+"Hiba történt:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"Ezt okozhatja például egy, az USB-kulcson levő sérült\n"
+"rendszerbeállítási fájl - ebben az esetben a fájl\n"
+"eltávolítása, majd a Mandrake Move újraindítása megoldja\n"
+"a problémát. Ehhez kattintson a megfelelő gombra.\n"
+"\n"
+"\n"
+"Érdemes lehet továbbá eltávolítani az USB-kulcsot, majd\n"
+"újraindítást végezni, vagy esetleg megvizsgálni a kulcs\n"
+"tartalmát más operációs rendszerben. Megnézheti a rendszer\n"
+"naplóbejegyzéseit is a 3-as és a 4-es konzolon, hogy\n"
+"információt kaphasson a probléma okáról."
 
-#: ../move/move.pm:622
-#, fuzzy, c-format
+#: ../move/move.pm:681
+#, c-format
 msgid "Remove system config files"
-msgstr "El szeretné távolítani a loopback fájlt?"
+msgstr "Rendszerbeállítási fájlok eltávolítása"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
-msgstr ""
+msgstr "Újraindítás"
 
-#: ../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 ""
+msgstr "Csak CD-ROM-támogatás nélkül futtatható"
 
-#: ../move/tree/mdk_totem:81
-#, fuzzy, c-format
+#: ../move/tree/mdk_totem:71
+#, c-format
 msgid "Kill those programs"
-msgstr "hozzáférés az X-es programokhoz"
+msgstr "Azon programok lezárása"
 
-#: ../move/tree/mdk_totem:82
-#, fuzzy, c-format
+#: ../move/tree/mdk_totem:72
+#, c-format
 msgid "No CDROM support"
-msgstr "Rádiótámogatás:"
+msgstr "Nincs CD-ROM-támogatás"
 
-#: ../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 "Olvassa el figyelmesen!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
+"Nem használhat másik CD-t, amikor a következő programok futnak: \n"
+"%s"
 
 #: ../move/tree/mdk_totem:101
 #, c-format
 msgid "Copying to memory to allow removing the CDROM"
-msgstr ""
+msgstr "Memóriába másolás a CD eltávolíthatósága érdekében"
 
 #: Xconfig/card.pm:13
 #, c-format
@@ -294,22 +372,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB vagy több"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X-kiszolgáló"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Válasszon egy X-kiszolgálót"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "A többképernyős mód beállítása"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -318,80 +396,80 @@ msgstr ""
 "A grafikus kártya lehetővé teszi több képernyő használatát.\n"
 "Mit szeretne tenni?"
 
-#: Xconfig/card.pm:251
-#, fuzzy, c-format
-msgid "Can't install XFree package: %s"
-msgstr "A(z) %s csomag telepítése"
+#: Xconfig/card.pm:255
+#, c-format
+msgid "Can't install Xorg package: %s"
+msgstr "Az Xorg csomag nem telepíthető: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Válassza ki a grafikus kártyán található memória mennyiségét"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree-beállítások"
+msgid "Xorg configuration"
+msgstr "Xorg-beállítások"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Melyik XFree grafikus rendszert kívánja használni?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Melyik Xorg grafikus rendszert kívánja használni?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "A képernyők egymástól független beállítása"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "A Xinerama kiterjesztés használata"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Csak a(z) \"%s\"%s kártya beállítása"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s hardveres 3D-s gyorsítással"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s hardveres 3D-s gyorsítással"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "A kártya támogat hardveres 3D-s gyorsítást az XFree %s verzióval."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "A kártya támogat hardveres 3D-s gyorsítást az Xorg %s verzióval."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s KÍSÉRLETI JELLEGŰ hardveres 3D-s gyorsítással"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s KÍSÉRLETI JELLEGŰ hardveres 3D-s gyorsítással"
 
-#: 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 ""
-"A kártya támogat hardveres 3D-s gyorsítást az XFree %s verzióban,\n"
-"DE EZ KÍSÉRLETI JELLEGŰ, HASZNÁLATA AKÁR A GÉP LEFAGYÁSÁHOZ IS VEZETHET!"
+"A kártya támogat hardveres 3D-s gyorsítást az Xorg %s verzióban,\n"
+"DE EZ KÍSÉRLETI JELLEGŰ, HASZNÁLATA AKÁR A GÉP LEFAGYÁSÁHOZ IS VEZETHET."
 
-#: 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 "Egyéni"
 
-#: 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 "Kilépés"
@@ -401,12 +479,12 @@ msgstr "Kilépés"
 msgid "Graphic Card"
 msgstr "Grafikus kártya"
 
-#: 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 "Felbontás"
@@ -416,14 +494,19 @@ msgstr "Felbontás"
 msgid "Test"
 msgstr "Teszt"
 
-#: 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 "Beállítások"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr "Az Xorg beállítási fájlja hibás, ezért figyelmen kívül lesz hagyva."
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -436,38 +519,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 "A monitor kiválasztása"
+msgstr "Válasszon monitort ehhez a képernyőhöz: #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "A monitor kiválasztása"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug and Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Általános"
 
-#: 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 "Gyártó"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "A Plug'n Play-felderítés sikertelen. Válasszon ki egy monitort."
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -490,12 +573,12 @@ msgstr ""
 "Ha nem ismeri a monitor jellemzőit, válasszon egy biztonságosan\n"
 "alacsony értéket!"
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vízszintes frissítés"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Függőleges frissítés"
@@ -520,58 +603,60 @@ msgstr "65 ezer szín (16 bites)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millió szín (24 bites)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Felbontások"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Válassza ki a felbontást és a színmélységet"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikus kártya: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: 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 "Segítség"
@@ -666,8 +751,8 @@ msgstr "Felbontás: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86-meghajtó: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg-meghajtó: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -678,10 +763,10 @@ msgstr "Indítás grafikus módban"
 #, 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 ""
-"Beállítható, hogy rendszerindításkor a grafikus felület (az XFree) "
+"Beállítható, hogy rendszerindításkor a grafikus felület (az Xorg) "
 "automatikusan elinduljon.\n"
 "Szeretné, ha a grafikus felület elindulna a rendszer indításakor?"
 
@@ -711,20 +796,59 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Milyen normát használ a televízió?"
 
-#: 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 "Kis türelmet..."
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "A rendszerindító program telepítése folyamatban"
 
-#: 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 ""
+"A LILO új kötetazonosítót készül adni a(z) %s lemeznek. NT, 2000 vagy XP\n"
+"verziójú Windows esetén egy indítólemez kötetazonosítójának módosítása\n"
+"súlyos rendszerhibának lesz véve. Ez a figyelmeztetés nem vonatkozik sem\n"
+"a Windows 95 illetve 98 verzióra, sem pedig az NT adatlemezeire.\n"
+"\n"
+"Szeretné folytatni az azonosító-módosítást?"
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "A rendszerbetöltő telepítése nem sikerült. A hiba a következő:"
+
+#: 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 ""
+"Lehet, hogy módosítani kell az Open Firmware rendszerindítási eszköz\n"
+" beállításain a rendszerindító program használatához. Ha újraindítás után\n"
+" nem jelenik meg a prompt, nyomja le a Command-Option-O-F-et induláskor\n"
+" és írja be ezt: setenv boot-device %s,\\\\:tbxi\n"
+" Majd gépelje be ezt: shut-down\n"
+"A következő indítás után meg kell jelennie a promptnak."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -741,62 +865,52 @@ msgstr ""
 "\n"
 "Melyik meghajtóról végzi a rendszer indítását?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "A lemezmeghajtó legelső szektora (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "A gyökérpartíció első szektora"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Hajlékonylemez"
 
-#: 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 "Kihagyás"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "A SILO telepítése"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "A LILO/GRUB telepítése"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Hová kerüljön a rendszerindító program (bootloader)?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "A rendszerindítási partíció első szektora"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "A rendszerindítás beállításai"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Rendszerindítási beállítások"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "A fizikai memória mérete MB-ban"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
@@ -804,213 +918,208 @@ msgstr ""
 "\"A parancssorban átadható paraméterek korlátozása\" beállításnak jelszó "
 "nélkül nincs értelme"
 
-#: 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 "A jelszavak nem egyeznek"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "Próbálja meg újra"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "A használni kívánt rendszerbetöltő"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "A rendszerindító program telepítése"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Rendszerindítási eszköz"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Várakozási idő az alapértelmezett rendszer betöltése előtt"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI bekapcsolása"
 
-#: any.pm:232 help.pm:768
-#, fuzzy, c-format
+#: any.pm:260
+#, c-format
 msgid "Force no APIC"
 msgstr "APIC ne legyen használva"
 
-#: any.pm:234
-#, fuzzy, c-format
+#: any.pm:262
+#, c-format
 msgid "Force No Local APIC"
-msgstr "APIC ne legyen használva"
+msgstr "Helyi APIC ne legyen használva"
 
-#: 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 "Jelszó"
 
-#: 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 "Jelszó (még egyszer)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "A parancssorban átadható paraméterek korlátozása"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "korlátozás"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "A /tmp törlése minden újraindulásnál"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "RAM-méret, ha szükséges (felismert: %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Több profil engedélyezése"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Indítási üzenet"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Késleltetés Open Firmware-nél"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Várakozási idő rendszerindításkor"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CD-ről történhessen rendszerindítás?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
-msgstr "OF-ről történhet rendszerindítás?"
+msgstr "OF-ről történhessen rendszerindítás?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Az alapértelmezett op. rendszer?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Indítófájl"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Gyökér"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Hozzáfűzés"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Képernyőmód"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Indítási RAM-diszk"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Hálózati profil"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Címke"
 
-#: 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 "Alapértelmezés"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Az indítási RAM-diszk mérete"
 
-#: 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 "A címke nem lehet üres"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Meg kell adni egy kernelfájlt"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Meg kell adni egy gyökérpartíciót"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Már van ilyen nevű címke"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Milyen bejegyzést szeretne felvenni?"
 
-#: 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 "Egyéb op. rendszer (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Egyéb op. rendszer (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Egyéb op. rendszer (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1019,52 +1128,52 @@ msgstr ""
 "Itt láthatók az indítási menü jelenlegi bejegyzései.\n"
 "Új bejegyzések vehetők fel, illetve módosíthatók a meglevők."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "hozzáférés az X-es programokhoz"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "hozzáférés az RPM-eszközökhöz"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" engedélyezése"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "hozzáférés az adminisztrációs fájlokhoz"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "hozzáférés a hálózati eszközökhöz"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "hozzáférés a fordítási eszközökhöz"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(már fel van véve: %s)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Ez a jelszó túl egyszerű"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Adjon meg egy felhasználónevet"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1072,22 +1181,22 @@ msgstr ""
 "A felhasználónév csak a következőket tartalmazhatja: kisbetűk, számok, \"-\" "
 "és \"_\""
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "A felhasználónév túl hosszú"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Már létezik ilyen felhasználónév"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Felhasználó felvétele"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1096,75 +1205,79 @@ msgstr ""
 "Adjon meg egy felhasználónevet\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 "Kész"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Név elfogadása"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Valódi név"
 
-#: 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 "Felhasználónév"
+msgid "Login name"
+msgstr "Bejelentkezési név"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Parancsértelmező"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Ikon"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Automatikus bejelentkezés"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Beállítható, hogy rendszerindításkor egy felhasználó automatikusan "
 "bejelentkezzen."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Szeretné használni ezt a lehetőséget?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Adja meg az alapértelmezett felhasználónevet:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Válassza ki a használni kívánt ablakkezelőt:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Válasszon nyelvet."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Nyelvválasztás"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1175,48 +1288,57 @@ msgstr ""
 "mely nyelveket szeretné telepíteni. Ezek a telepítés befejeződése\n"
 "utáni újraindítást követően lesznek elérhetők."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Unicode használata alapértelmezésben"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Az összes nyelv"
 
-#: 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 "Ország/terület"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Válassza ki az országot."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Itt található az elérhető országok listája"
 
-#: 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 "Egyéb"
+msgid "Other Countries"
+msgstr "Egyéb országok"
 
-#: any.pm:833
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Beviteli módszer:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Nincs"
+
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Nincs megosztás"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Az összes felhasználó engedélyezése"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1234,21 +1356,24 @@ msgstr ""
 "\n"
 "Az \"Egyéni\" opció használatával felhasználónkénti beállítás lehetséges.\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: a hagyományos UNIX-os fájlmegosztási rendszer - Macintosh és Windows "
+"alatt kevésbé támogatott."
 
-#: 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: Windows, Mac OS X és Linux alatt használatos fájlmegosztási módszer."
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
@@ -1256,12 +1381,22 @@ msgstr ""
 "Exportálás NFS-sel vagy Sambával végezhető. Válassza ki, melyiket kívánja "
 "használni."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "UserDrake indítása"
 
-#: 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 "Bezárás"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1270,92 +1405,200 @@ msgstr ""
 "A felhasználónkénti megosztás a \"fileshare\" csoportot használja.\n"
 "A UserDrake programmal lehet felhasználót felvenni ebbe a csoportba."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Helyi fájlok"
+msgid "Local file"
+msgstr "Helyi fájl"
 
-#: 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 "Windowsos tartomány"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "Active Directory SFU-val"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Active Directory Winbinddal"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Helyi fájl:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr "Helyi fájlok használata minden azonosításhoz"
+
+#: 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 ""
+"LDAP használatát írja elő az azonosítási műveletek egy részéhez vagy "
+"mindegyikükhöz. Az LDAP a szervezeten belüli információk bizonyos részét "
+"gyűjti egy helyre."
+
+#: 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 ""
+"Lehetővé teszi számítógépek csoportjának ugyanazon Network Information "
+"Service-tartományban való üzemeltetését közös jelszóval és csoportfájllal."
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windowsos tartomány:"
+
+#: authentication.pm:33
 #, c-format
-msgid "Active Directory"
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
 msgstr ""
+"A Winbind lehetővé teszi egy rendszer számára, hogy információkat kérdezzen "
+"le és felhasználóazonosítást végezzen egy windowsos tartományban."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory SFU-val:"
 
-#: authentication.pm:38
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+"A Kerberos egy hálózati azonosítási szolgáltatásokat nyújtó biztonságos "
+"rendszer."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory Winbinddal:"
+
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "LDAP-alapú azonosítás"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAP alap-DN"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP-kiszolgáló"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "egyszerű"
+
+#: 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 "biztonsági rendszer (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "felhasználóazonosítás"
+msgstr "Azonosítás - Active Directory"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Tartomány"
 
-#: 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 "Kiszolgáló"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
-msgstr ""
+msgstr "LDAP-felhasználók adatbázisa"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Névtelen BIND használata "
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "Az LDAP-felhasználó böngészheti az Active Directoryt"
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "Jelszó szükséges"
+msgstr "A felhasználó jelszava"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Titkosítás"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "NIS-alapú azonosítás"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS-tartomány"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "NIS-kiszolgáló"
 
-#: 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 "
@@ -1386,22 +1629,32 @@ msgstr ""
 "A 'wbinfo -t' parancs használatával letesztelhető, hogy a hozzáférés "
 "(illetve a létrehozott gépazonosító) működik-e."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Hitelesítési Windows-tartomány"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Tartományadminisztrátor felhasználói neve"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Tartományadminisztrátor jelszava"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Idmap használata az UID/SID tárolására"
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Alapértelmezett Idmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Nem lehet broadcast-ot használni NIS tartomány nélkül"
@@ -1410,10 +1663,9 @@ msgstr "Nem lehet broadcast-ot használni NIS tartomány nélkül"
 # only the ascii charset will be available on most machines
 # 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
-#, fuzzy, c-format
+#: bootloader.pm:673
+#, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
 "\n"
@@ -1421,65 +1673,64 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Udvozoljuk a(z) %s rendszerinditoban!\n"
+"Udvozoljuk a rendszerinditoban!\n"
 "\n"
 "Valasszon egy operacios rendszert a listabol, vagy varjon\n"
-"%d masodpercig, amig az alapertelmezett elindul.\n"
+"amig az alapertelmezett elindul.\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, grafikus menüvel"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO, szöveges menüvel"
 
-#: 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 "nincs elég hely a /boot partíción"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "A rendszerindító program nem tehető %s partícióra\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
+"A rendszerindító beállításait frissíteni kell, mivel a partíciók számozása "
+"módosult."
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
+"A rendszerindító nem telepíthető. Indítsa el a rendszert egy helyreállítási "
+"lemezzel, majd válassza ezt: \"%s\"."
 
-#: bootloader.pm:1222
-#, fuzzy, c-format
+#: bootloader.pm:1327
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "Rendszerindító telepítése"
+msgstr "Rendszerindító újratelepítése"
 
 #: common.pm:125
 #, c-format
@@ -1536,76 +1787,79 @@ msgstr "nincs \"kdesu\""
 msgid "consolehelper missing"
 msgstr "nincs \"consolehelper\""
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "Franciaország"
 
-#: 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 "Belgium"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Cseh Köztársaság"
 
-#: 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 "Németország"
 
-#: 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 "Görögország"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Norvégia"
 
-#: 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 "Svédország"
 
-#: 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 "Hollandia"
 
-#: 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 "Olaszország"
 
-#: 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 "Ausztria"
 
-#: 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 "Amerikai Egyesült Államok"
 
-#: 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"
@@ -1619,66 +1873,60 @@ msgstr ""
 "állítva WebDAV-kiszolgálónak). Ha szeretne felvenni WebDAV csatolási\n"
 "pontokat, válassza az \"Új\" funkciót."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Új"
 
-#: 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 "Leválasztás"
 
-#: 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 "Csatolás"
 
-#: 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 "Csatolási pont"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Adja meg a WebDAV-kiszolgáló URL-jét"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "Az URL-nek http:// vagy https:// kezdetűnek kell lenni"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Kiszolgáló: "
 
-#: 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 "Csatolási pont: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Beállítások: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Olvassa el figyelmesen!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Először készítsen biztonsági mentést az adatokról"
 
-#: 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 "
@@ -1688,17 +1936,17 @@ msgstr ""
 "Ha az aboot-ot fogja használni, először ellenőrizze, hogy maradt-e elég\n"
 "hely (legalább 2048 szektor) a lemez elején"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Varázsló"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Válasszon"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1709,180 +1957,186 @@ msgstr ""
 "Célszerű először átméretezni a partíciót\n"
 "(kattintson a partícióra, majd az \"Átméretezés\" gombra)."
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Kattintson egy partícióra"
 
-#: 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 "Részletek"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Merevlemez nem található"
 
-#: 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 "Naplózott fájlrendszer"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Lapozóterület (swap)"
 
-#: 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 "Egyéb"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Üres"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Fájlrendszer-típusok:"
 
-#: 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 "Használja inkább ezt: \"%s\""
 
-#: 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 "Típus"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Létrehozás"
 
 #. -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 "Törlés"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Használja először a \"Leválasztás\"-t"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Válasszon egy másik partíciót"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Válasszon egy partíciót"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Kilépés"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Visszavonás"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Átváltás normál módba"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Átváltás szakértői módba"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Kívánja folytatni a műveletet?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Kilépés mentés nélkül"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Ki akar lépni a programból a partíciós tábla mentése nélkül?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "El szeretné menteni az /etc/fstab fájlban végrehajtott módosításokat?"
 
-#: 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 ""
 "A partíciós tábla változásai csak a gép újraindítása után lépnek érvénybe"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Teljes törlés"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Automatikus helyfoglalás"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Egyéb"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Merevlemez-jellemzők"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Mindegyik elsődleges partíció foglalt"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Nem hozható létre több partíció"
 
-#: 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 "
@@ -1891,37 +2145,37 @@ msgstr ""
 "További partíciók létrehozásához törölni kell egyet (hogy egy kiterjesztett "
 "partíciót létre lehessen hozni)"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "A partíciós tábla mentése"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Partíciós tábla visszatöltése"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "A partíciós tábla helyreállítása"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "A partíciós tábla újraolvasása"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
-msgstr "Cserélhető lemez automatikus csatolása"
+msgstr "Cserélhető adathordozó automatikus csatolása"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Fájlválasztás"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1930,23 +2184,23 @@ msgstr ""
 "A partíciós tábla két példányának mérete eltér.\n"
 "Mégis kívánja folytatni a műveletet?"
 
-#: 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 "Figyelmeztetés"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1955,92 +2209,92 @@ msgstr ""
 "Helyezzen be egy floppylemezt a meghajtóba!\n"
 "A lemezen található adatok elvesznek"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "A partíciós tábla helyrehozásának megkísérlése..."
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Részletes információ"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Áthelyezés"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formázás"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Hozzáadás RAID-hez"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Hozzáadás LVM-hez"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Eltávolítás RAID-ből"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Eltávolítás LVM-ből"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID módosítása"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Loopback-hez használva"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Új partíció létrehozása"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Kezdőszektor: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Méret (MB): "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "A fájlrendszer típusa: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Beállítások: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "A logikai kötet neve "
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2052,44 +2306,44 @@ msgstr ""
 "Távolítson el egy elsődleges partíciót és hozzon létre egy kiterjesztett "
 "partíciót."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
-msgstr "El szeretné távolítani a loopback fájlt?"
+msgstr "El szeretné távolítani a loopback-fájlt?"
 
-#: 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 ""
 "A(z) %s partíció típusának módosítása után a partíción levő adatok elvesznek"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "A partíciótípus megváltoztatása"
 
-#: 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 "Melyik fájlrendszert szeretné?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Konvertálás Ext2-ről Ext3-ra"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
-msgstr "Hová szeretné csatolni a(z) %s loopback fájlt?"
+msgstr "Hová szeretné csatolni a(z) %s loopback-fájlt?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hová szeretné csatolni a(z) %s eszközt?"
 
-#: 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"
@@ -2098,49 +2352,49 @@ msgstr ""
 "Nem lehet megszüntetni a csatolási pontot, mert ez egy loopback\n"
 "partíció. Először távolítsa el a loopback-et."
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Hová szeretné csatolni ezt: \"%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 "Átméretezés"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "A FAT fájlrendszer jellemzőinek kiszámítása"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Ezt a partíciót nem lehet átméretezni"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Készítsen biztonsági mentést erről a partícióról"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "A(z) %s partíció átméretezésekor a partíción található adatok elvesznek"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Adja meg az új méretet"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Az új méret (MB-ban): "
 
-#: 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"
@@ -2150,148 +2404,143 @@ msgstr ""
 "indításnál \n"
 "fájlrendszer-ellenőrzés lesz végezve"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Melyik lemezre szeretné áthelyezni?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Szektor"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Melyik szektorra szeretné áthelyezni?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Áthelyezés"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Partíció áthelyezése..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Válassza ki azt a RAID-et, amelyikhez hozzá szeretné adni a lemezt"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "új"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Válassza ki azt az LVM-et, amelyhez hozzá szeretné adni a lemezt"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "Az LVM neve?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Ez a partíció nem használható loopback-hez"
 
-#: 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 "A loopback fájl neve: "
+msgstr "A loopback-fájl neve: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Adjon meg egy fájlnevet"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
 "Ez a fájl már egy másik loopback-hez van rendelve, válasszon egy másikat"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "A fájl már létezik, használjam?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Csatolási (mount) opciók"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Vegyes"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "eszköz"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "szint"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "szeletméret"
+msgid "chunk size in KiB"
+msgstr "szeletméret kilobájtban (KiB)"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Vigyázat! Ez a művelet adatvesztést okozhat."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Milyen típusú partícionálást szeretne?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Szükség van a(z) %s csomagra. Szeretné telepíteni?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "A változások csak a rendszer újraindításakor lépnek életbe"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "A(z) \"%s\" meghajtó partíciótáblájának mentése következik!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "A(z) %s partíció formázásakor a partíción található adatok elvesznek!"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Fájlok áthelyezése az új partícióra"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Fájlok elrejtése"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2300,53 +2549,53 @@ msgstr ""
 "A(z) %s könyvtár már tartalmaz adatot\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Fájlok áthelyezése az új partícióra"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "%s másolása"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "a(z) %s partíció jelenleg \"%s\"-ként ismert"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Eszköz: "
 
-#: diskdrake/interactive.pm:1156
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:1157
+#, c-format
 msgid "Devfs name: "
-msgstr "Gépnév: "
+msgstr "Devfs-név: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
-msgstr ""
+msgstr "Kötetcímke: "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS-meghajtó betűjele: %s (ez csak egy tipp)\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 "Típus: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Név: "
@@ -2374,7 +2623,7 @@ msgstr "A(z) %d. cilindertől a(z) %d.-ig\n"
 #: diskdrake/interactive.pm:1180
 #, c-format
 msgid "Number of logical extents: %d"
-msgstr ""
+msgstr "Logikai kiterjedések száma: %d"
 
 #: diskdrake/interactive.pm:1181
 #, c-format
@@ -2393,8 +2642,8 @@ msgstr "Csatolva\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
@@ -2402,7 +2651,7 @@ msgid ""
 "Loopback file(s):\n"
 "   %s\n"
 msgstr ""
-"Loopback fájl(ok):\n"
+"Loopback-fájl(ok):\n"
 "   %s\n"
 
 #: diskdrake/interactive.pm:1187
@@ -2421,8 +2670,8 @@ msgstr "%s. szint\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "A szelet mérete: %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "A szelet mérete: %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2432,7 +2681,7 @@ msgstr "RAID lemezek: %s\n"
 #: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Loopback file name: %s"
-msgstr "A loopback fájl neve: %s"
+msgstr "A loopback-fájl neve: %s"
 
 #: diskdrake/interactive.pm:1196
 #, c-format
@@ -2495,40 +2744,40 @@ msgstr "A partíciós tábla típusa: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "csatorna: %d, id: %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Fájlrendszer-titkosítási kulcs"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Válasszon fájlrendszer-titkosítási kulcsot"
 
-#: 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 ""
 "Ez a titkosítási kulcs túl egyszerű (legalább %d karakter hosszúnak kell "
 "lennie)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "A titkosítási kulcsok nem egyeznek"
 
-#: 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 "Titkosítási kulcs"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Titkosítási kulcs (még egyszer)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "A típus megváltoztatása"
@@ -2561,7 +2810,7 @@ msgstr ""
 "Adja meg a gép eléréséhez szükséges felhasználónevet, jelszót és "
 "tartománynevet."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Felhasználónév"
@@ -2576,27 +2825,72 @@ msgstr "Kiszolgálók keresése"
 msgid "Search new servers"
 msgstr "Új kiszolgálók keresése"
 
-#: 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 "A(z) %s csomagot telepíteni kell. Szeretné telepíteni?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Hiányzik a(z) \"%s\" nevű kötelező csomag"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Csomagok telepítése..."
 
-#: do_pkgs.pm:217
-#, fuzzy, c-format
+#: do_pkgs.pm:216
+#, c-format
 msgid "Removing packages..."
-msgstr "%s eltávolítása..."
+msgstr "Csomagok eltávolítása..."
+
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "A(z) %s partíció csatolása"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "a(z) %s partíció ide történő csatolása sikertelen: %s"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "%s ellenőrzése"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "hiba történt a(z) %s leválasztásakor: %s"
 
-#: fs.pm:416
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "A(z) %s lapozópartíció bekapcsolása"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "A(z) %s partíció formázása"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "%s fájl létrehozása és formázása"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "A(z) %s eszköz nem formázható %s típusúra"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formázás sikertelen a(z) %s eszközön"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2605,7 +2899,7 @@ msgstr ""
 "Az inode-ok elérési időpontjai ne legyenek frissítve ezen a fájlrendszeren\n"
 "(például hírkiszolgálók esetén gyorsabb hozzáférést biztosíthat a hírekhez)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2614,14 +2908,14 @@ msgstr ""
 "Csak explicit módon csatolható, vagyis a '-a' opció\n"
 "hatására nem kerül csatolásra a fájlrendszer."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "A fájlrendszerben levő karakter- illetve blokkeszközök ne legyenek "
 "értelmezve."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2633,7 +2927,7 @@ msgstr ""
 "Ez akkor lehet hasznos, ha egy kiszolgálón vannak olyan fájlrendszerek is,\n"
 "amelyek más architektúrákhoz tartozó bináris programokat tartalmaznak."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2646,17 +2940,17 @@ msgstr ""
 "telepítve\n"
 "az suidperl(1).)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "A fájlrendszer csak-olvasható módon való csatolása."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "A fájlrendszer összes I/O művelete szinkron módon történjen."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2676,65 +2970,25 @@ msgstr ""
 "opciók\n"
 "esetén: 'user,exec,dev,suid'."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Írási jog adása a normál felhasználóknak"
 
-#: fs.pm:448
-#, fuzzy, c-format
-msgid "Give read-only access to ordinary users"
-msgstr "Írási jog adása a normál felhasználóknak"
-
-#: 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 formázás sikertelen a(z) %s eszközön"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "A(z) %s eszköz nem formázható %s típusúra"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "A(z) %s partíció formázása"
-
-#: fs.pm:666
+#: fs/mount_options.pm:144
 #, c-format
-msgid "Creating and formatting file %s"
-msgstr "%s fájl létrehozása és formázása"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "A(z) %s partíció csatolása"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "a(z) %s partíció ide történő csatolása sikertelen: %s"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "%s ellenőrzése"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "hiba történt a(z) %s leválasztásakor: %s"
+msgid "Give read-only access to ordinary users"
+msgstr "Olvasási jog adása a normál felhasználóknak"
 
-#: fs.pm:824
+#: fs/type.pm:364
 #, c-format
-msgid "Enabling swap partition %s"
-msgstr "A(z) %s lapozópartíció bekapcsolása"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Nem lehet JFS-t használni 16 MB-nál kisebb partíción"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "egyszerű"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Nem lehet ReiserFS-t használni 32 MB-nál kisebb partíción"
 
 #: fsedit.pm:25
 #, c-format
@@ -2746,7 +3000,7 @@ msgstr "/usr-rel"
 msgid "server"
 msgstr "kiszolgáló"
 
-#: 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"
@@ -2764,32 +3018,22 @@ msgstr ""
 "\n"
 "Törölni szeretné az összes partíciót?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Nem lehet JFS-t használni 16 MB-nál kisebb partíción"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Nem lehet ReiserFS-t használni 32 MB-nál kisebb partíción"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "A csatolási pontoknak /-rel kell kezdődni"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "A csatolási pontoknak betűkből és számokból kell állni"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Már van egy partíció amelynek %s a csatolási pontja\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2800,23 +3044,23 @@ msgstr ""
 "Egyik rendszerindító program sem tudja ezt kezelni /boot partíció nélkül,\n"
 "ezért mindenképpen hozzon létre egy /boot partíciót."
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Nem használható LVM logikai kötet a(z) %s csatolási ponthoz"
 
-#: fsedit.pm:553
-#, fuzzy, c-format
+#: fsedit.pm:394
+#, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
 "The bootloader is not able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"Szoftveres RAID partíciót választott ki gyökérpartíciónak (/).\n"
-"Egyik rendszerindító program sem tudja ezt kezelni /boot partíció nélkül,\n"
+"LVM-es logikai kötetet választott ki gyökérfájlrendszernek (/).\n"
+"A rendszerindító program ezt nem tudja kezelni /boot partíció nélkül,\n"
 "ezért mindenképpen hozzon létre egy /boot partíciót."
 
-#: 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 "
@@ -2825,12 +3069,12 @@ msgstr ""
 "Elképzelhető, hogy a LILO nem lesz telepíthető (mivel a LILO nem kezeli a "
 "több fizikai köteten levő logikai köteteket)."
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Ennek a könyvtárnak a gyökér-fájlrendszeren belül kell maradnia"
 
-#: 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 "
@@ -2839,133 +3083,127 @@ msgstr ""
 "Valódi fájlrendszert (Ext2, Ext3, ReiserFS, XFS vagy JFS) kell használni "
 "ennél a csatolási pontnál\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Titkosított fájlrendszer nem használható ehhez a csatolási ponthoz: %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Nincs elég szabad terület az automatikus helyfoglaláshoz"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Nincs mit tenni"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Hiba történt %s írásra való megnyitásánál: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Floppy"
 
-#: 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 "Lemez"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CD-ROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "CD-/DVD-írók"
 
-#: 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 "Szalag"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Videokártya"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Tévékártya"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Egyéb multimédia-eszközök"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Hangkártya"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Web-kamera"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Processzorok"
 
-#: harddrake/data.pm:183
-#, fuzzy, c-format
+#: harddrake/data.pm:191
+#, c-format
 msgid "ISDN adapters"
-msgstr "ISDN-kártya"
+msgstr "ISDN-kártyák"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet-kártya"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
-msgstr ""
+msgstr "ADSL-kártyák"
 
-#: harddrake/data.pm:230
-#, fuzzy, c-format
+#: harddrake/data.pm:243
+#, c-format
 msgid "AGP controllers"
-msgstr "USB-vezérlők"
+msgstr "AGP-vezérlők"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Hidak és rendszervezérlők"
 
-#: 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 "Nyomtató"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Egér"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2977,9 +3215,9 @@ msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE-/ATA-vezérlők"
 
 #: harddrake/data.pm:290
-#, fuzzy, c-format
+#, c-format
 msgid "SATA controllers"
-msgstr "USB-vezérlők"
+msgstr "SATA-vezérlők"
 
 #: harddrake/data.pm:299
 #, c-format
@@ -2988,51 +3226,73 @@ msgstr "Firewire-vezérlők"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA-vezérlők"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI-vezérlők"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB-vezérlők"
 
-#: harddrake/data.pm:326
-#, fuzzy, c-format
+#: harddrake/data.pm:339
+#, c-format
 msgid "USB ports"
-msgstr "USB nyomtató"
+msgstr "USB-portok"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus-vezérlők"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Billentyűzet"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Egér"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Lapolvasó"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Ismeretlen/Egyéb"
 
-#: 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 "Kis türelmet - a beállítások módosítása"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Nincs alternatív meghajtó"
 
 # a 2. %s egy drivert jelöl
-#: 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 "
@@ -3041,12 +3301,12 @@ msgstr ""
 "Nincs ismert OSS/ALSA alternatív meghajtó a hangkártyához (%s) - a kártya "
 "jelenleg ezt a meghajtót használja: \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Hangbeállítások"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3055,7 +3315,7 @@ msgstr ""
 "Itt kiválaszthat egy alternatív meghajtót (OSS vagy ALSA) a hangkártyához (%"
 "s)."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3068,7 +3328,7 @@ msgstr ""
 "A hangkártya jelenleg a(z) %s\"%s\" meghajtót használja (a kártya "
 "alapértelmezett meghajtója: \"%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 "
@@ -3103,24 +3363,24 @@ msgstr ""
 " - ALSA-hívásokkal, amelyek fejlettebb funkciókat valósítanak meg, de ehhez "
 "szükség van az ALSA-könyvtár használatára.\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 "Meghajtó:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Problémaelhárítás"
 
-#: 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 ""
 "A régi \"%s\" meghajtóval gondok lehetnek.\n"
 "\n"
@@ -3128,13 +3388,13 @@ msgstr ""
 "\n"
 "Az új \"%s\" meghajtó csak a következő indítástól kezdve lesz használva."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Nincs nyílt forrású meghajtó"
 
 # a 2. %s egy drivert jelöl
-#: 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 "
@@ -3143,32 +3403,33 @@ msgstr ""
 "Nincs szabadon használható meghajtó a hangkártyához (%s), viszont létezik "
 "kötött licencelésű meghajtó: \"%s\"."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Nincs ismert meghajtó"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Nincs ismert meghajtó a hangkártyához (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Ismeretlen meghajtó"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Hiba: a hangkártya meghajtója (%s) nem elérhető"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Hangprobléma elhárítása"
 
-#: 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"
@@ -3212,17 +3473,18 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\": kiírja, hogy melyik program használja a\n"
 "hangkártyát\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Szeretnék meghajtót választani"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Tetszőleges meghajtó kiválasztása"
 
-#: 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 "
@@ -3306,73 +3568,71 @@ msgid "enable radio support"
 msgstr "Rádiótámogatás bekapcsolása"
 
 #: help.pm:11
-#, fuzzy, c-format
+#, 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 ""
 "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
-"egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban szereplő\n"
-"feltételeket, akkor jelölje be a(z) \"%s\" opciót. Ha nem fogadja el\n"
-"valamelyik feltételt, kapcsolja ki a számítógépet."
+"egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+"szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
+"Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
+"\"%s\" gombra - ezzel újraindítja a számítógépet."
 
-#: 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 "Elfogadom"
 
 #: help.pm:17
-#, fuzzy, 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"
+#, c-format
+msgid ""
+"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 ""
 "A Linux többfelhasználós rendszer; ez azt jelenti, hogy minden\n"
 "felhasználónak lehetnek például külön beállításai és saját fájljai.\n"
-"Ezzel kapcsolatosan további információkat a felhasználói kézikönyvből\n"
-"lehet megtudni. A \"root\" nevű felhasználótól (ez az azonosító a\n"
-"rendszergazdát jelöli) eltérően az itt felvett felhasználóknak csak a\n"
-"saját fájljaikat és a saját beállításaikat lesz joguk módosítani - az\n"
-"esetleges véletlen vagy rosszindulatú rendszermódosítások elkerülése\n"
-"érdekében.\n"
-"Javasolt legalább egy \"normál\" felhasználót felvenni az Ön saját\n"
+"A \"root\" nevű felhasználótól (ez az azonosító a rendszergazdát\n"
+"jelöli) eltérően az itt felvett felhasználóknak csak a saját fájljaikat\n"
+"és a saját beállításaikat lesz joguk módosítani - az esetleges véletlen\n"
+"vagy rosszindulatú rendszermódosítások elkerülése érdekében.\n"
+"Létre kell hoznia legalább egy \"normál\" felhasználót az Ön saját\n"
 "használatára. Ezen normál felhasználói azonosítóval érdemes elvégezni\n"
 "az olyan tevékenységeket, amelyek nem igényelnek rendszergazdai\n"
 "jogosultságot. Bár nagyon praktikus minden alkalommal rendszergazdaként\n"
@@ -3407,23 +3667,28 @@ msgstr ""
 "felhasználói azonosítót és ablakkezelőt, majd kattintson a(z) \"%s\"\n"
 "gombra. Ellenkező esetben távolítsa el a kijelölést a(z) \"%s\" opció mellől."
 
-#: 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 "Felhasználónév"
+
+#: 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 "Következő"
 
-#: 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 "Speciális"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3488,36 +3753,46 @@ msgstr ""
 "SCSI-azonosító\", \"b\" jelentése: \"a második legalacsonyabb\n"
 "SCSI-azonosító\", ..."
 
-#: help.pm:86
-#, fuzzy, c-format
+#: 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 ""
 "A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"
 "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
-"aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt."
+"aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt.\n"
+"Ha a szóban forgó lemez nincs kéznél, akkor kattintson a(z) \"%s\" gombra,\n"
+"így az adott csomagok nem lesznek telepítve."
 
-#: help.pm:91
-#, fuzzy, c-format
+#: 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"
@@ -3527,9 +3802,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"
@@ -3539,34 +3824,31 @@ 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 ""
 "Most meg kell adnia, mely programokat kívánja telepíteni a rendszerére.\n"
 "Több ezer program létezik Mandrakelinuxhoz; a kezelésük megkönnyítése\n"
 "érdekében a programok (hasonlóság alapján) csoportokba lettek sorolva.\n"
 "\n"
-"A csomagok a gép lehetséges felhasználási területei szerint csoportokba\n"
-"vannak rendezve. A Mandrakelinux rendszerben négy előredefiniált\n"
-"telepítési osztály van meghatározva. Ezeket a telepítési osztályokat\n"
-"felfoghatja úgy is, mint csomagok gyűjteményét. A különböző csoportokban\n"
-"levő csomagok keverhetők is, tehát egy \"Munkaállomás\" típusú telepítés\n"
-"tartalmazhat olyan alkalmazásokat is, amelyek csak a \"Fejlesztés\"\n"
-"csoportban vannak benne.\n"
+"A Mandrakelinux rendszerben négy előredefiniált csomagkategória van\n"
+"meghatározva. A különböző kategóriákban levő csomagok keverhetők is,\n"
+"tehát egy \"Munkaállomás\" típusú telepítés tartalmazhat olyan\n"
+"alkalmazásokat is, amelyek csak a \"Kiszolgáló\" kategóriában vannak\n"
+"benne.\n"
 "\n"
 "  - \"%s\": ha munkaállomásként tervezi használni a gépet, akkor\n"
-"válogasson a \"Munkaállomás\" csoportban szereplő alkalmazások közül.\n"
+"válogasson a \"Munkaállomás\" kategóriában szereplő alkalmazások közül.\n"
 "\n"
 "  - \"%s\": ha a gép programozásra is lesz használva, akkor\n"
-"válassza ki a kívánt csomagokat a csoportból.\n"
+"válassza ki a kívánt csomagokat a kategóriából. A speciális \"LSB\"\n"
+"csoport telepítése esetén a rendszer úgy lesz beállítva, hogy megfeleljen\n"
+"a Linux Standard Base specifikációnak. Az \"LSB\" csoport kijelölése\n"
+"esetén az alapértelmezett 2.6 verziójú kernel helyett a 2.4 verzió kerül\n"
+"telepítésre - annak érdekében, hogy 100 százalékos legyen az LSB\n"
+"szabványnak való megfelelés. Ha nem jelöli ki az \"LSB\" csoportot,\n"
+"abban az esetben egy közel 100 százalékosan LSB-megfelelő rendszer\n"
+"lesz telepítve.\n"
 "\n"
 "  - \"%s\": ha a gép kiszolgálóként lesz használva, válassza ki,\n"
 "hogy a gyakrabban használt szolgáltatások közül melyeket kívánja\n"
@@ -3576,106 +3858,106 @@ msgstr ""
 "Ha szeretne grafikus felületet, akkor legalább egyet ki kell választani.\n"
 "\n"
 "Ha az egérkurzort egy csoport neve fölé viszi, akkor megjelenik egy rövid\n"
-"magyarázat az adott csoportról. Ha telepítéskor az összes csoport\n"
-"kijelölését megszünteti (frissítésre ez nem vonatkozik), akkor a telepítő\n"
-"választási lehetőséget fog felkínálni a minimális telepítésre vonatkozóan.\n"
-"A következő lehetőségek választhatók:\n"
-"\n"
-"  - \"%s\": grafikus rendszer a lehető legkevesebb csomag\n"
-"telepítésével.\n"
+"magyarázat az adott csoportról.\n"
 "\n"
-"  - \"%s\": az alaprendszer az alapvető programokkal\n"
-"és azok dokumentációjával. Megfelel például kiszolgáló telepítéséhez.\n"
-"\n"
-"  - \"%s\": a lehető legkevesebb csomag\n"
-"telepítése; csak parancssoros felülettel rendelkező Linux rendszer.\n"
-"Körülbelül 65 megabájt méretű telepítés.\n"
-"\n"
-"Bejelölheti a(z) \"%s\" opciót; ez akkor hasznos,\n"
-"ha Ön ismeri a felkínált csomagokat, illetve ha teljes mértékben\n"
-"ellenőrizni kívánja, mi lesz a gépre feltelepítve.\n"
+"Bejelölheti a(z) \"%s\" opciót; ez akkor hasznos, ha Ön ismeri a\n"
+"felkínált csomagokat, illetve ha teljes mértékben ellenőrizni kívánja,\n"
+"mi lesz a gépre feltelepítve.\n"
 "\n"
 "Ha a telepítést \"%s\" üzemmódban indította el, akkor megszüntetheti\n"
 "akár az összes csoport kijelölését is, hogy elkerülje új programok\n"
 "telepítését. Ez különösen akkor lehet hasznos, ha egy meglevő rendszert\n"
-"kíván helyreállítani vagy frissíteni."
+"kíván helyreállítani vagy frissíteni.\n"
+"\n"
+"Ha telepítéskor az összes csoport kijelölését megszünteti (frissítésre\n"
+"ez nem vonatkozik), akkor a telepítő választási lehetőséget fog felkínálni\n"
+"a minimális telepítésre vonatkozóan. A következő lehetőségek választhatók:\n"
+"\n"
+"  - \"%s\": grafikus rendszer a lehető legkevesebb csomag telepítésével.\n"
+"\n"
+"  - \"%s\": az alaprendszer az alapvető programokkal és azok\n"
+"dokumentációjával. Megfelel például kiszolgáló telepítéséhez.\n"
+"\n"
+"  - \"%s\": a lehető legkevesebb csomag telepítése; csak parancssoros\n"
+"felülettel rendelkező Linux-rendszer. Körülbelül 65 megabájt méretű "
+"telepítés."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Munkaállomás"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Fejlesztés"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafikus környezet"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Csomagok egyedi kiválasztása"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Frissítés"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "X-szel együtt"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Alapvető dokumentációval"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Valóban minimális telepítés"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Csomagok egyedi kiválasztása"
-
-#: help.pm:137 help.pm:602
+#: help.pm:149
 #, c-format
-msgid "Upgrade"
-msgstr "Frissítés"
-
-#: help.pm:140
-#, 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 ""
 "Ha egyedi csomagkiválasztást választott, megjelenik egy fa, amely az\n"
 "összes telepíthető programcsomagot tartalmazza csoportokba és\n"
@@ -3689,13 +3971,13 @@ msgstr ""
 "bizonyos csoportok tagjaként -, a telepítő megerősítést kér Öntől arra\n"
 "vonatkozóan, hogy valóban telepíteni kívánja-e azon kiszolgálószoftvereket.\n"
 "A Mandrakelinux rendszerben alapértelmezésben az összes feltelepített\n"
-"kiszolgálóprogram elindításra kerül a rendszer indulásakor. Még ha azok\n"
+"szolgáltatás elindításra kerül a rendszer indulásakor. Még ha azok\n"
 "biztonságosak is illetve nem rendelkeznek ismert problémákkal, akkor is\n"
 "előfordulhat, hogy utóbb biztonsági problémák merülnek fel velük\n"
-"kapcsolatban. Ha nem tudja, hogy egy bizonyos - telepítésre kijelölt -\n"
-"szolgáltatásnak mi a feladata illetve miért kerül telepítésre, akkor\n"
-"kattintson a(z) \"%s\" gombra. Ha a(z) \"%s\" gombra kattint, akkor a\n"
-"felsorolt szolgáltatások telepítésre kerülnek, és alapértelmezés szerint\n"
+"kapcsolatban. Ha nem tudja, hogy egy bizonyos szolgáltatásnak mi a\n"
+"feladata illetve miért kerül telepítésre, akkor kattintson a(z)\n"
+"\"%s\" gombra. Ha a(z) \"%s\" gombra kattint, akkor a felsorolt\n"
+"szolgáltatások telepítésre kerülnek, és alapértelmezés szerint\n"
 "automatikusan elindításra kerülnek majd rendszerindításkor.\n"
 "\n"
 "A(z) \"%s\" opcióval kikapcsolható az a figyelmeztetés,\n"
@@ -3712,192 +3994,137 @@ msgstr ""
 "több gépre szeretné ugyanazon csomagokat telepíteni. Az említett ikonra\n"
 "kattintva a telepítő megkéri Önt, hogy tegyen be egy floppyt, amely egy\n"
 "korábbi telepítés végén készült. Ha szeretné megtudni, hogyan lehet ilyen\n"
-"floppyt készíteni, tekintse meg a telepítés utolsó lépésében szereplő\n"
+"floppyt készíteni, akkor tekintse meg a telepítés utolsó lépésében szereplő\n"
 "második tippet."
 
-#: 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 "Nem"
 
-#: 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 "Igen"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Automatikus függőségek"
 
-#: help.pm:175
-#, fuzzy, 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 ""
-"Itt beállíthatja az internetkapcsolatot illetve a hálózati kapcsolatot.\n"
-"Ha szeretné a gépét az internetre vagy egy helyi hálózatra csatlakoztatni,\n"
-"akkor kattintson a(z) \"%s\" gombra. A telepítő felderíti a hálózati\n"
-"eszközöket és a modemeket. Ha a felderítés nem jár sikerrel, akkor\n"
-"kapcsolja ki a(z) \"%s\" opciót. Ha nem kívánja\n"
-"beállítani a hálózatot, vagy később kívánja azt beállítani, akkor\n"
-"kattintson a(z) \"%s\" gombra a következő lépésre való ugráshoz.\n"
-"\n"
-"A hálózat beállításakor az elérhető kapcsolattípusok a következők:\n"
-"hagyományos modem, ISDN-modem, ADSL-kapcsolat, kábelmodem, egyszerű helyi\n"
-"hálózati (LAN) kapcsolat (Ethernet).\n"
-"\n"
-"A beállítási lehetőségek itt nem kerülnek részletezésre. Szükség lesz\n"
-"bizonyos paraméterekre, mint például: IP-cím, alapértelmezett átjáró\n"
-"(gateway), DNS-kiszolgálók. Ezeket az internet-szolgáltatótól illetve a\n"
-"rendszeradminisztrátortól tudhatja meg.\n"
-"\n"
-"A beállításokkal kapcsolatban a felhasználói kézikönyv\n"
-"internetkapcsolatokkal foglalkozó fejezetéből szerezhet további\n"
-"információkat. A kapcsolat beállítását nem szükséges a telepítés közben\n"
-"elvégezni; a kézikönyv leírja, hogyan lehet azt megtenni egy feltelepített\n"
-"rendszeren."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Automatikus felderítés"
-
-#: 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\": a(z) \"%s\" gombra kattintva elindul a nyomtatóbeállítási\n"
 "varázsló. Nyomtatóbeállítással kapcsolatos további információkat a\n"
 "felhasználói kézikönyvből lehet szerezni. Az ott bemutatott felület hasonló\n"
 "ahhoz, ami a telepítéskor megjelenik."
 
-#: 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 "Beállítás"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
-"Ebben a párbeszédablakban lehet kijelölni az automatikusan elindítandó\n"
-"szolgáltatásokat.\n"
+"Ebben a párbeszédablakban lehet kijelölni a rendszerindításkor\n"
+"automatikusan elindítandó szolgáltatásokat.\n"
 "\n"
 "A telepítő megjeleníti a jelenleg telepített összes szolgáltatás listáját.\n"
 "Vizsgálja meg a listát alaposan, és törölje a kijelölést azok mellől,\n"
-"amelyek automatikus elindítására nincs szükség.\n"
+"amelyek rendszerindításkor való elindítására nincs szükség.\n"
 "\n"
 "Egy szolgáltatás kiválasztásakor megjelenik a hozzá tartozó rövid leírás.\n"
 "Ha nem tudja biztosan, hogy a szolgáltatásra szükség van-e vagy\n"
 "sem, akkor ne változtassa meg az alapértelmezett indítási módot.\n"
 "\n"
-"Gondosan járjon el, ha a gépet kiszolgálónak fogja használni,\n"
-"ne indítson el egy olyan szolgáltatást sem automatikusan, amelyre nincs\n"
-"szükség. A feleslegesen elindított szolgáltatások biztonsági kockázatot\n"
-"jelentenek. Csak a tényleges feladatot ellátó szolgáltatásokat engedélyezze."
+"Gondosan járjon el, ha a gépet kiszolgálónak fogja használni; ne\n"
+"indítson el egyetlen olyan szolgáltatást sem automatikusan, amelyre nincs\n"
+"szükség. Kiszolgáló esetén bizonyos szolgáltatások biztonsági kockázatot\n"
+"jelentenek. Csak a valóban szükséges szolgáltatásokat engedélyezze."
 
-#: help.pm:224
-#, fuzzy, c-format
+#: help.pm:206
+#, c-format
 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"
+"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 ""
 "A Linux az időt a GMT (Greenwich Mean Time) alapján kezeli - a\n"
 "kiválasztott időzónának megfelelő helyi időre konvertálja azt. Ha a gép\n"
 "alaplapjának órája helyi időre van állítva, akkor kapcsolja ki az\n"
-"időzónához való igazítást a(z) \"%s\" opció\n"
-"kikapcsolásával - ekkor a rendszeróra szerinti idő azonos lesz a gép órája\n"
-"szerintivel (azaz a két óra ugyanazon időzóna szerint mutatja az időt). Ez\n"
-"akkor hasznos, ha van a gépen más operációs rendszer is (például Windows).\n"
-"\n"
-"A(z) \"%s\" opció automatikusan beállítja az órát\n"
-"egy internetes időkiszolgálóhoz kapcsolódva. Ehhez szükség van egy "
-"beállított\n"
+"időzónához való igazítást a(z) \"%s\" opció kikapcsolásával -\n"
+"ekkor a rendszeróra szerinti idő azonos lesz a gép órája szerintivel\n"
+"(azaz a két óra ugyanazon időzóna szerint mutatja az időt). Ez\n"
+"akkor hasznos, ha van a gépen más operációs rendszer is.\n"
+"\n"
+"A(z) \"%s\" opció automatikusan beállítja az órát egy internetes\n"
+"időkiszolgálóhoz kapcsolódva. Ehhez szükség van egy beállított\n"
 "internetkapcsolatra. Az időkiszolgálók közül lehetőleg egy Önhöz közel\n"
 "levőt válasszon. Ez a funkció feltelepít az Ön gépére egy időkiszolgálót,\n"
 "amelyet a helyi hálózat többi gépe is használhat."
 
-#: 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 "A gép órája GMT-időt mutat"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Automatikus időszinkronizáció"
 
-#: help.pm:238
-#, fuzzy, c-format
+#: 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 ""
 "Grafikus kártya\n"
@@ -3906,42 +4133,44 @@ msgstr ""
 "Ha nem így történik, kiválaszthatja a grafikus kártyák listájából a\n"
 "megfelelőt.\n"
 "\n"
-"Ha több grafikus modul is elérhető az Ön kártyájához - 3D gyorsítással\n"
+"Ha több grafikus modul is elérhető az Ön kártyájához - 3D-gyorsítással\n"
 "illetve a nélkül -, akkor kiválaszthatja az Önnek leginkább megfelelőt."
 
-#: help.pm:249
-#, fuzzy, c-format
+#: help.pm:231
+#, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3950,21 +4179,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 ""
 "Az X (teljes néven: X Window System) a Linux grafikus felületét nyújtó\n"
 "rendszer. A Mandrakelinuxban levő grafikus környezetek (KDE, GNOME,\n"
@@ -3981,7 +4210,7 @@ msgstr ""
 "Ha nem így történik, kiválaszthatja a grafikus kártyák listájából a\n"
 "megfelelőt.\n"
 "\n"
-"Ha több grafikus modul is elérhető az Ön kártyájához - 3D gyorsítással\n"
+"Ha több grafikus modul is elérhető az Ön kártyájához - 3D-gyorsítással\n"
 "illetve a nélkül -, akkor kiválaszthatja az Önnek leginkább megfelelőt.\n"
 "\n"
 "\n"
@@ -3996,17 +4225,18 @@ msgstr ""
 "\n"
 "Felbontás\n"
 "\n"
-"Itt kiválaszthatja a kívánt felbontási és színmélységi értékeket az "
-"elérhető\n"
-"értékek listájából. Válassza ki az igényeinek legjobban megfelelő\n"
-"értékeket. A beállítások tetszőlegesen módosíthatók a telepítés után is.\n"
-"A képernyőn egy mintakép fog megjelenni a kiválasztott beállítások\n"
-"szemléltetésére.\n"
+"Itt kiválaszthatja a kívánt felbontási és színmélységi értékeket az\n"
+"elérhető értékek listájából. Válassza ki az igényeinek legjobban\n"
+"megfelelő értékeket. A beállítások tetszőlegesen módosíthatók a\n"
+"telepítés után is. A képernyőn egy mintakép fog megjelenni a\n"
+"kiválasztott beállítások szemléltetésére.\n"
 "\n"
 "\n"
 "\n"
 "Teszt\n"
 "\n"
+"Bizonyos hardverelemek esetén ez a bejegyzés nem jelenik meg.\n"
+"\n"
 "A rendszer megnyit egy grafikus képernyőt a kívánt felbontással, ha ez\n"
 "lehetséges. Ha látható a tesztelés közben megjelenő üzenet, akkor nyomja\n"
 "le a(z) \"%s\" gombot; a telepítő ekkor a következő lépésre ugrik. Ha\n"
@@ -4024,14 +4254,14 @@ msgstr ""
 "megfelelően beállítani a grafikus üzemmódot, akkor javasolt a(z) \"%s\"\n"
 "lehetőséget választani."
 
-#: 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"
@@ -4039,132 +4269,132 @@ msgstr ""
 "beállítja azt. Ha nem így történik, kiválaszthatja ebből a listából a\n"
 "monitor típusát."
 
-#: help.pm:311
-#, fuzzy, c-format
+#: 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 ""
 "Felbontás\n"
 "\n"
-"Itt kiválaszthatja a kívánt felbontási és színmélységi értékeket az "
-"elérhető\n"
-"értékek listájából. Válassza ki az igényeinek legjobban megfelelő\n"
+"Itt kiválaszthatja a kívánt felbontási és színmélységi értékeket az\n"
+"elérhető értékek listájából. Válassza ki az igényeinek legjobban megfelelő\n"
 "értékeket. A beállítások tetszőlegesen módosíthatók a telepítés után is.\n"
 "A képernyőn egy mintakép fog megjelenni a kiválasztott beállítások\n"
 "szemléltetésére."
 
-#: help.pm:319
-#, fuzzy, c-format
+#: 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 ""
-"Ha több grafikus modul is elérhető az Ön kártyájához - 3D gyorsítással\n"
+"Ha több grafikus modul is elérhető az Ön kártyájához - 3D-gyorsítással\n"
 "illetve a nélkül -, akkor kiválaszthatja az Önnek leginkább megfelelőt."
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Beállítások\n"
 "\n"
 "Itt beállítható, hogy rendszerindításkor grafikus üzemmódba váltson-e a\n"
-"rendszer. Ha a gép kiszolgálóként fog üzemelni, vagy nem sikerült "
-"megfelelően\n"
-"beállítani a grafikus üzemmódot, akkor a(z) \"%s\" lehetőséget érdemes "
-"választani."
-
-#: help.pm:332
-#, 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"
+"rendszer. Ha a gép kiszolgálóként fog üzemelni, vagy nem sikerült\n"
+"megfelelően beállítani a grafikus üzemmódot, akkor a(z) \"%s\"\n"
+"lehetőséget érdemes választani."
+
+#: help.pm:316
+#, c-format
+msgid ""
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Most kell megadni, hogy a Mandrakelinux telepítése a merevlemez melyik\n"
-"részére történjen. Ha a lemez még teljesen üres, vagy a korábban telepített\n"
-"operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra kell\n"
-"partícionálni a lemezt. A partícionálás a lemezterület logikai\n"
+"Ebben a lépésben kell megadni, hogy a Mandrakelinux telepítése a merevlemez\n"
+"melyik részére történjen. Ha a lemez még teljesen üres, vagy a korábban\n"
+"telepített operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra\n"
+"kell partícionálni a lemezt. A partícionálás a lemezterület logikai\n"
 "újrafelosztását jelenti - erre a Mandrakelinux telepítéséhez szükséges\n"
 "hely létrehozása érdekében van szükség.\n"
 "\n"
 "A partícionálás veszélyes művelet. Hiba esetén adatvesztéssel járhat\n"
 "(ha a lemez nem volt üres), ráadásul általában nincs lehetőség visszatérni\n"
 "egy korábbi állapothoz. Emiatt kezdő felhasználóknak sok nehézséget\n"
-"okozhat. A telepítő tartalmaz egy varázslót, amely megkönnyíti a művelet\n"
-"végrehajtását, de mielőtt használatba venné, olvassa végig a leírást.\n"
+"okozhat. A telepítő tartalmaz egy varázslót, amely egyszerűbbé teszi a\n"
+"művelet végrehajtását, de mielőtt használatba venné, olvassa végig a\n"
+"leírást.\n"
 "\n"
 "A lemezek tartalmától függően többféle lehetőség van:\n"
 "\n"
-"  - \"%s\": ez a lehetőség az üres meghajtók\n"
-"automatikus partícionálását jelenti. Ebben az esetben a telepítő nem tesz\n"
+"  - \"%s\": ez a lehetőség az üres meghajtók automatikus\n"
+"partícionálását jelenti. Ebben az esetben a telepítő nem tesz\n"
 "fel további kérdéseket.\n"
 "\n"
 "  - \"%s\": a varázsló talált egy vagy több\n"
@@ -4178,9 +4408,9 @@ msgstr ""
 "Windows úgy van feltelepítve a lemezre, hogy elfoglalja az összes\n"
 "elérhető területet, akkor annak egy részét fel kell szabadítani a Linux\n"
 "számára. Ez történhet a Windows-partíció törlésével (lásd \"A teljes\n"
-"lemez törlése\" lehetőséget) vagy átméretezésével (az utóbbi csak FAT\n"
-"partíció esetén javasolt).\n"
-"Az átméretezés FAT partíció esetén végrehajtható a lemezen levő adatok\n"
+"lemez törlése\" lehetőséget) vagy átméretezésével (az utóbbi a FAT\n"
+"és az NTFS típusú partíciókra vonatkozik).\n"
+"Az átméretezés végrehajtható a lemezen levő adatok\n"
 "elvesztése nélkül - feltéve, hogy azt megelőzően töredezettségmentesítve\n"
 "lett a kérdéses partíció. Javasolt továbbá az adatok mentése is.\n"
 "Ezen módszer a javasolt abban az esetben, ha a Mandrakelinuxt és a\n"
@@ -4199,8 +4429,9 @@ msgstr ""
 "\n"
 "Ha ezt a lehetőséget választja, a lemezen levő összes adat törlésre kerül.\n"
 "\n"
-"  - \"%s\": ez a funkció egyszerűen letöröl mindent\n"
-"a lemezről, és újrapartícionálja azt. A lemezen levő összes adat elvész.\n"
+"  - \"%s\": ez a funkció akkor használható, ha a Windows az\n"
+"egész lemezt elfoglalja. A funkció egyszerűen letöröl mindent\n"
+"a lemezről, és újrapartícionálja azt.\n"
 "\n"
 "Ha ezt a lehetőséget választja, a lemezen levő összes adat elvész.\n"
 "\n"
@@ -4212,52 +4443,53 @@ msgstr ""
 "funkciót. A DiskDrake program használatáról a felhasználói kézikönyv\n"
 "partíciókezelésről szóló szakaszában találhat további információt."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "A szabad terület felhasználása"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Már létező partíció használata"
 
-#: 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 "A windowsos partíción levő szabad hely felhasználása"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "A teljes lemez törlése"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "A Windows eltávolítása"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Egyéni lemezpartícionálás"
 
-#: help.pm:392
-#, fuzzy, c-format
+#: help.pm:377
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4265,16 +4497,22 @@ 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 ""
 "A telepítés befejeződött; a Linux rendszer készen áll a használatra.\n"
-"A rendszer újraindításához kattintson a(z) \"%s\" gombra. Miután a\n"
+"A rendszer újraindításához kattintson a(z) \"%s\" gombra. Ne\n"
+"feledkezzen meg a telepítőlemez eltávolításáról. Miután a\n"
 "gép elvégzi az indítási hardverteszteket, megjelenik a rendszerbetöltő\n"
 "menüje, amelyből kiválasztható, melyik operációs rendszer induljon el.\n"
 "\n"
@@ -4295,75 +4533,69 @@ msgstr ""
 "\n"
 "Ez a lehetőség jól használható akkor, amikor nagyobb számú azonos gépre\n"
 "kell a rendszert feltelepíteni. Az automatikus telepítéssel\n"
-"kapcsolatban a Mandrake honlapján találhatók további információk.\n"
+"kapcsolatban a Mandrakelinux honlapján találhatók további információk.\n"
 "\n"
 "  - \"%s\"(*): elmenti a telepítés során\n"
 "kiválasztott csomagok listáját. Ha egy újabb telepítés alkalmával fel\n"
 "kívánja használni az elmentett listát, akkor helyezze be az azt tartalmazó\n"
 "floppyt a telepítés megkezdésekor, majd - amikor a gép billentyűlenyomásra\n"
-"vár - nyomjon \"F1\"-et, ez után pedig írja be a következőt:\n"
-"linux defcfg=\"floppy\"\n"
+"vár - nyomja le az \"F1\" billentyűt, ez után pedig írja be a következőt:\n"
+"linux defcfg=\"floppy\" - utána pedig nyomja le az Enter billentyűt.\n"
 "\n"
 "\n"
 "(*) Ehhez szükség lesz egy FAT fájlrendszerre formázott floppyra.\n"
 "A formázás Linux alatt a következő paranccsal végezhető el:\n"
-"\"mformat a:\""
+"\"mformat a:\". Másik módszer a formázásra: \"fdformat /dev/fd0\", majd\n"
+"\"mkfs.vfat /dev/fd0\"."
 
-#: help.pm:418
-#, fuzzy, c-format
+#: help.pm:409
+#, c-format
 msgid "Generate auto-install floppy"
-msgstr "automatikus telepítőfloppy készítése"
+msgstr "Automatikus telepítőfloppy készítése"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Újrajátszás"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automatikus"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Csomagösszeállítás mentése"
 
-#: help.pm:421
-#, fuzzy, c-format
+#: help.pm:412
+#, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"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"
-"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"
+"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 ""
-"Az újonnan létrehozott partíciók csak a formázásukat követően lesznek\n"
-"használhatók (a \"formázás\" lényegében egy fájlrendszernek a partíción\n"
-"való létrehozását jelenti).\n"
-"\n"
-"Most újraformázhat bizonyos, már létező partíciókat (ha azok tartalmát\n"
-"teljesen le kívánja törölni). Ha ezt kívánja tenni, jelölje ki azon\n"
-"partíciókat is.\n"
+"Ha azt a lehetőséget választotta, hogy fel kíván használni bizonyos,\n"
+"már létező Linux-partíciókat, akkor itt lehetősége van bármelyikük\n"
+"újraformázására. A formázás letörli az adott partíció teljes tartalmát.\n"
+"Ha ezt kívánja tenni, akkor jelölje ki azon partíciókat is.\n"
 "\n"
 "Nem szükséges újraformázni az összes, korábban létrehozott partíciót.\n"
 "Az operációs rendszernek szánt partíció(ka)t mindenképpen le kell formázni\n"
@@ -4374,7 +4606,7 @@ msgstr ""
 "Gondosan ellenőrizze, mely partíciókat jelöli ki, mert a formázás során az\n"
 "adott partíciókon levő adatok törlődnek, és később nem nyerhetők vissza.\n"
 "\n"
-"Kattintson a(z) \"%s\" gombra a formázás megkezdéséhez.\n"
+"Kattintson a(z) \"%s\" gombra a formázások megkezdéséhez.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha más partícióra szeretné telepíteni a\n"
 "Mandrakelinux operációs rendszert.\n"
@@ -4382,29 +4614,29 @@ msgstr ""
 "Kattintson a(z) \"%s\" gombra, ha bizonyos partíciókat ellenőriztetni\n"
 "kíván (hibás blokkok keresése)."
 
-#: 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 "Előző"
 
-#: help.pm:447
-#, fuzzy, c-format
+#: help.pm:434
+#, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"
 "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
@@ -4422,45 +4654,48 @@ msgstr ""
 "kijelölt csomagokat, akkor nyomja le a(z) \"%s\" gombot. Ha nem kíván\n"
 "csomagokat telepíteni, akkor a(z) \"%s\" gombot nyomja le."
 
-#: 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 "Telepítés"
 
-#: help.pm:460
-#, fuzzy, c-format
+#: help.pm:447
+#, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 "Most kiválaszthat egy biztonsági szintet a gép számára. Alapszabály,\n"
-"hogy ha fontos adatok vannak tárolva a gépen, vagy a gép kapcsolódni fog\n"
-"az internetre, akkor érdemes magasabbra venni a biztonsági szintet. "
-"Magasabb\n"
-"szint esetén viszont általában nehézkesebb a gép használata.\n"
+"hogy ha fontos adatok vannak tárolva a gépen, vagy a gép kapcsolódik\n"
+"az internetre, akkor érdemes magasabbra venni a biztonsági szintet.\n"
+"Magasabb szint esetén viszont általában nehézkesebb a gép használata.\n"
+"\n"
+"Ha nem biztos benne, hogy mit volna érdemes választani, akkor válassza\n"
+"az alapértelmezés szerinti lehetőséget. A biztonsági szint később is\n"
+"módosítható a Mandrakelinux Vezérlőközpontban elérhető \"draksec\"\n"
+"eszközzel.\n"
 "\n"
-"Ha nem biztos benne, hogy mit volna érdemes választani, válassza az\n"
-"alapértelmezés szerinti lehetőséget."
+"A(z) \"%s\" mezőben megadandó a biztonságért felelős személy email-címe.\n"
+"A biztonsági üzenetek azon címre lesznek küldve."
 
-#: help.pm:472
-#, fuzzy, c-format
+#: help.pm:458
+#, c-format
 msgid "Security Administrator"
-msgstr "Biztonsági adminisztrátor:"
+msgstr "Biztonsági adminisztrátor"
 
-#: help.pm:475
-#, fuzzy, c-format
+#: help.pm:461
+#, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrakelinux system. If partitions have already been\n"
@@ -4533,9 +4768,9 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Most kell kiválasztani a Mandrakelinux rendszer telepítéséhez használni\n"
-"kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva (egy\n"
-"korábbi Linux-telepítés vagy valamilyen partícionálási segédprogram\n"
+"Ebben a lépésben kell kiválasztani a Mandrakelinux rendszer telepítéséhez\n"
+"használni kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva\n"
+"(egy korábbi Linux-telepítés vagy valamilyen partícionálási segédprogram\n"
 "által), akkor felhasználhatók a már létező partíciók. Ha viszont még nem\n"
 "léteznek, akkor először definiálni kell a partíciókat.\n"
 "\n"
@@ -4592,7 +4827,7 @@ msgstr ""
 "nyílbillentyűivel.\n"
 "\n"
 "Az összes funkció elérhető a billentyűzetről. A partíciók között a Tab\n"
-"billentyűvel és a fel/le nyilakkal lehet mozogni.\n"
+"billentyűvel és a Fel/Le nyilakkal lehet mozogni.\n"
 "\n"
 "Ha egy partíció ki van jelölve, használni lehet a következőket:\n"
 "\n"
@@ -4611,18 +4846,18 @@ msgstr ""
 "50 MB méretűre), akkor eltárolható lesz rajta például egy tartalék kernel\n"
 "illetve RAM-diszk képfájlok (image-ek) esetleges rendszerhibák esetére."
 
-#: help.pm:544
-#, fuzzy, c-format
+#: help.pm:530
+#, c-format
 msgid "Removable media auto-mounting"
-msgstr "Cserélhető lemez automatikus csatolása"
+msgstr "Cserélhető adathordozó automatikus csatolása"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Váltás a normál és a szakértői módok közt"
 
-#: help.pm:547
-#, fuzzy, c-format
+#: help.pm:533
+#, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
@@ -4662,7 +4897,8 @@ msgstr ""
 "\"windowsos név\", \"kapacitás\".\n"
 "\n"
 "A \"linuxos név\" formátuma a következő: \"a merevlemez típusa\",\n"
-"\"a lemez azonosítója\", \"a partíció azonosítója\" (például \"hda1\").\n"
+"\"a lemez azonosítója\", \"a partíció azonosítója\" (példa a linuxos\n"
+"névre: \"hda1\").\n"
 "\n"
 "Ha a lemez IDE-csatolós, akkor \"a merevlemez típusa\" \"hd\",\n"
 "ha pedig SCSI-csatolós, akkor \"sd\".\n"
@@ -4685,117 +4921,121 @@ msgstr ""
 "A \"windowsos név\" a meghajtó Windows alatt használt azonosítója\n"
 "(az első lemez vagy partíció neve \"C:\")."
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "\"%s\": ellenőrizze a jelenlegi országbeállítást. Ha az nem\n"
 "megfelelő, kattintson a(z) \"%s\" gombra és válasszon egy másik országot.\n"
 "Ha a kívánt ország nem szerepel az elsőként megjelenített listában, akkor\n"
 "kattintson a(z) \"%s\" gombra a teljes országlista megjelenítéséhez."
 
-#: help.pm:584
-#, fuzzy, c-format
+#: help.pm:569
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Erre a lépésre csak akkor kerül sor, ha a gépen már van linuxos partíció.\n"
 "\n"
 "Most közölnie kell a telepítővel, hogy új telepítést szeretne-e végezni\n"
-"vagy pedig egy meglevő Mandrakelinux rendszert kíván frissíteni:\n"
+"vagy pedig egy meglevő Mandrakelinux-rendszert kíván frissíteni:\n"
 "\n"
-"  - \"%s\": a korábbi rendszer felülírásra kerül. Ha szeretné\n"
-"módosítani a merevlemezek partícionálását vagy a fájlrendszereket,\n"
-"akkor ezt a lehetőséget használja. Attól függően, hogy milyen partíciók\n"
-"találhatók a gépen, bizonyos partíciók változatlan tartalommal\n"
-"megőrizhetők.\n"
+"  - \"%s\": a korábbi rendszer felülírásra kerül. Attól függően, hogy\n"
+"milyen partíciók találhatók a gépen, bizonyos partíciók (például a\n"
+"\"home\" nevű saját könyvtárakat tartalmazók) változatlan tartalommal\n"
+"megőrizhetők. Ha szeretné módosítani a merevlemezek partícionálását\n"
+"vagy a fájlrendszereket, akkor ezt a lehetőséget használja.\n"
 "\n"
-"  - \"%s\": lehetővé teszi egy korábbi Mandrakelinux telepítés\n"
+"  - \"%s\": lehetővé teszi egy korábbi Mandrakelinux-telepítés\n"
 "csomagjainak frissítését. A merevlemezek partícionálása változatlanul\n"
 "marad, a felhasználók adatai sem módosulnak. A többi beállítási lépés közül\n"
 "a legtöbb elérhető lesz - a folyamat hasonló a normál telepítéshez.\n"
 "\n"
-"Frissítés használata akkor javasolt, ha a számítógépen Mandrake\n"
-"Linux 8.1 vagy újabb kiadás van."
+"Frissítés használata akkor javasolt, ha a számítógépen\n"
+"Mandrakelinux 8.1 vagy újabb kiadás van."
 
-#: help.pm:605
-#, fuzzy, c-format
+#: help.pm:591
+#, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"A telepítő a kiválasztott alapnyelvtől függően automatikusan kiválaszt\n"
-"egy bizonyos billentyűzetbeállítást. Elképzelhető viszont, hogy Önnek nem a\n"
-"nyelvének megfelelő billentyűzete van; például ha Ön egy angolul beszélő\n"
-"magyar ember, akkor lehetséges, hogy magyar billentyűzete van.\n"
+"A telepítő a kiválasztott nyelvtől függően automatikusan kiválaszt\n"
+"egy bizonyos billentyűzetbeállítást. Ellenőrizze, hogy a kiválasztott\n"
+"beállítás megfelel-e Önnek; ha nem felel meg, akkor válasszon másikat.\n"
+"\n"
+"Elképzelhető, hogy Önnek nem a nyelvének megfelelő billentyűzete van;\n"
+"például ha Ön egy angolul beszélő magyar ember, akkor lehetséges,\n"
+"hogy magyar billentyűzete van.\n"
 "Hasonló helyzet adódhat, ha az Ön nyelve magyar, de Ön Quebecben\n"
 "tartózkodik - az Ön által beszélt nyelv nem feltétlenül egyezik meg a\n"
 "billentyűzet nyelvével. Ez a telepítési lépés lehetővé teszi a hasonló\n"
 "esetekre, hogy kiválasszon egy megfelelő billentyűzetet egy listából.\n"
 "\n"
-"Hogy megjelenjen a támogatott billentyűzetek teljes listája, kattintson\n"
+"Hogy megjelenjen a támogatott billentyűzetek listája, kattintson\n"
 "a(z) \"%s\" nyomógombra.\n"
 "\n"
 "Ha nem latin ábécére épülő billentyűzetkiosztást választ, akkor a\n"
 "következő lépésben kijelölhet egy billentyűkombinációt, amellyel\n"
 "majd a latin és a nem-latin kiosztások közt lehet váltani."
 
-#: help.pm:624
-#, fuzzy, c-format
+#: help.pm:609
+#, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4804,21 +5044,23 @@ 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 ""
-"A kiválasztott nyelv befolyásolja a dokumentációnak, a telepítőnek és a\n"
+"Az első lépés a nyelv kiválasztása.\n"
+"\n"
+"A kiválasztott nyelv befolyásolja a telepítőnek, a dokumentációnak és a\n"
 "rendszer többi részének a nyelvét is. Válassza ki a megfelelő földrajzi\n"
 "helyet, majd a kívánt nyelvet.\n"
 "\n"
@@ -4830,59 +5072,80 @@ msgstr ""
 "kiválasztását követően a Speciális részben jelölje be a(z) \"%s\"\n"
 "lehetőséget.\n"
 "\n"
+"Az UTF-8 (Unicode) szabvány támogatásáról: A Unicode egy új\n"
+"karakterkódolási szabvány az összes létező nyelv lefedésére.\n"
+"A Linux alatti teljes támogatása még fejlesztés alatt áll.\n"
+"A Mandrakelinux UTF-8-használatát befolyásolják a felhasználó\n"
+"által végzett beállítások:\n"
+"\n"
+"  - ha olyan nyelvet választ, amelyhez erősen kapcsolódik egy\n"
+"korábbi kódolási módszer (Latin1-nyelvek, orosz, japán, kínai,\n"
+"koreai, thai, görög, török, valamint a legtöbb, ISO-8859-2 kódolást\n"
+"használó nyelv), akkor alapértelmezésben ez a korábbi kódolás lesz\n"
+"használva\n"
+"\n"
+"  - egyéb nyelvek esetében a Unicode szabvány lesz használva\n"
+"alapértelmezésben\n"
+"\n"
+"  - ha kettő vagy több nyelv kerül telepítésre, és azok eltérő\n"
+"kódolást használnak, akkor a Unicode szabványt fogja használni az\n"
+"egész rendszer\n"
+"\n"
+"  - a felhasználó előírhatja, hogy az egész rendszer a Unicode-ot\n"
+"használja - ehhez a(z) \"%s\" lehetőséget kell választani (függetlenül\n"
+"a választott nyelvektől)\n"
+"\n"
 "Tetszőleges számú nyelv telepíthető az alapértelmezett nyelven felül.\n"
 "Telepítheti akár az összeset is - ehhez a(z) \"%s\" opciót kell\n"
 "használni. Egy nyelv támogatásának telepítése azt jelenti, hogy telepítésre\n"
 "kerülnek az adott nyelvhez kapcsolódó fordítások, betűkészletek,\n"
-"helyesírás-ellenőrzők és egyebek. A(z) \"%s\"\n"
-"opció használatával előírható, hogy a rendszer Unicode\n"
-"(UTF-8) kódolást használjon. Ez a funkció azonban még fejlesztés alatt áll,\n"
-"ezért nem biztos, hogy minden esetben megfelelően fog működni. Ha Ön\n"
-"egymástól eltérő kódolást igénylő nyelveket jelöl ki telepítésre, akkor a\n"
-"Unicode-támogatás mindenképpen telepítésre kerül.\n"
+"helyesírás-ellenőrzők és egyebek.\n"
 "\n"
-"A rendszerre telepített nyelvek közti váltáshoz a\n"
-"\"/usr/sbin/localedrake\" program használható. Rendszergazdai\n"
-"jogosultsággal az összes felhasználó nyelvbeállításait lehet módosítani,\n"
-"a nélkül pedig csak a saját beállításokat."
+"A rendszerre telepített nyelvek közti váltáshoz a \"localedrake\"\n"
+"program használható. Rendszergazdai jogosultsággal az összes felhasználó\n"
+"nyelvbeállításait lehet módosítani, normál felhasználóként futtatva\n"
+"pedig csak az adott felhasználó nyelvbeállításait."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "spanyol"
 
-#: help.pm:663
-#, fuzzy, c-format
+#: help.pm:650
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 "A telepítő általában felismeri, hogy hány gomb van az egéren. Ha ez nem így\n"
 "történik, akkor azt feltételezi, hogy Ön kétgombos egérrel rendelkezik,\n"
@@ -4891,9 +5154,18 @@ msgstr ""
 "jelenti (ha az emulálás be van állítva). A telepítő felismeri, hogy\n"
 "milyen fajtájú az egér: PS/2, soros vagy USB.\n"
 "\n"
+"Ha háromgombos, görgő nélküli egere van, akkor kiválaszthat egy \"%s\"\n"
+"egeret. A telepítő ekkor úgy állítja be az egeret, hogy emulálható\n"
+"legyen a görgő. Emulálási üzemmódban a görgő helyettesítéséhez\n"
+"nyomja le a középső egérgombot, majd mozgassa az egeret előre-hátra\n"
+"irányban.\n"
+"\n"
 "Ha Ön másféle egértípust szeretne megadni, válassza ki a megfelelő típust\n"
 "a listából.\n"
 "\n"
+"\"Általános\" egértípus kiválasztásához használja a(z) \"%s\" bejegyzést.\n"
+"Ez a legtöbb egérhez megfelel.\n"
+"\n"
 "Ha az alapértelmezettől eltérő egeret választ, akkor megjelenik egy\n"
 "tesztelési képernyő. Használja az egérgombokat és a görgőt, hogy\n"
 "ellenőrizze a beállítások helyességét és az egér helyes működését.\n"
@@ -4910,12 +5182,17 @@ msgstr ""
 "másrészt azt, hogy megfelelően mozog-e az egérkurzor a képernyőn az egér\n"
 "mozgatásakor."
 
-#: help.pm:691
-#, fuzzy, c-format
+#: help.pm:681
+#, c-format
 msgid "with Wheel emulation"
-msgstr "3 gomb, egérgörgő-emulációval"
+msgstr "görgő-emulációval"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Univerzális | Bármilyen PS/2- vagy USB-egér"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4924,16 +5201,16 @@ msgstr ""
 "Válassza ki a megfelelő portot. Például a windowsos \"COM1\" port\n"
 "neve Linux alatt \"ttyS0\"."
 
-#: help.pm:698
-#, fuzzy, c-format
+#: help.pm:688
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4942,27 +5219,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 ""
 "Ez a legkritikusabb pont a Linux rendszer biztonságára vonatkozóan:\n"
 "meg kell adni a \"root\" nevű felhasználó jelszavát. A \"root\" azonosító\n"
@@ -5000,222 +5276,86 @@ msgstr ""
 "hogy mit kellene megadni, kérdezze meg a rendszergazdát.\n"
 "\n"
 "Ha Önnek problémája van a jelszavak megjegyzésével kapcsolatban, vagy\n"
-"a számítógép nem fog kapcsolódni az internetre, vagy Ön megbízik\n"
+"a számítógép nem fog kapcsolódni az internetre és Ön megbízik\n"
 "mindenkiben, aki elérheti a gépet, abban az esetben elfogadható a(z)\n"
 "\"%s\" lehetőség választása."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "felhasználóazonosítás"
 
 #. -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 "Nincs jelszó"
 
-#: help.pm:736
-#, fuzzy, 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 ""
-"Ez a párbeszédablak lehetővé teszi a rendszerbetöltő beállítását:\n"
-"\n"
-"  - \"%s\": három lehetőség van:\n"
-"\n"
-"      - \"%s\": ha a GRUB-ot szeretné használni (szöveges menü).\n"
-"\n"
-"      - \"%s\": ha szöveges felületű LILO-t szeretne.\n"
-"\n"
-"      - \"%s\": ha grafikus felületű LILO-t szeretne.\n"
-"\n"
-"  - \"%s\": a legtöbb esetben nincs szükség az\n"
-"alapértelmezett érték (\"%s\") módosítására, de ha kívánja, a\n"
-"rendszerbetöltő telepíthető a második merevlemezre (\"%s\"),\n"
-"vagy akár floppylemezre (\"%s\").\n"
-"\n"
-"  - \"%s\": a gép\n"
-"(újra)indításakor ennyi ideje van a felhasználónak a rendszerbetöltő\n"
-"menüjének megjelenését követően arra, hogy kiválassza, melyik rendszert\n"
-"kívánja elindítani (ha nem az alapértelmezettet).\n"
-"\n"
-"Legyen óvatos: ha nem telepít rendszerbetöltőt (azaz a(z) \"%s\" gombot\n"
-"nyomja le), akkor biztosítania kell egy másféle módszert a Mandrakelinux\n"
-"rendszer elindítására. Csak akkor módosítsa az opciókat, ha biztos abban,\n"
-"hogy tisztában van a funkciójukkal.\n"
-"\n"
-"A párbeszédablak \"%s\" gombjára kattintva további opciók válnak\n"
-"elérhetővé - ezek a szakértő felhasználók számára lesznek lényegesek."
-
-#: 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 "Várakozási idő az alapértelmezett rendszer betöltése előtt"
-
-#: help.pm:771
+#: help.pm:725
 #, c-format
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-"Miután beállította az általános rendszerbetöltő-paramétereket, megjelenik\n"
-"a betöltési lehetőségek listája, amely rendszerindításkor lesz elérhető.\n"
-"\n"
-"Ha vannak más operációs rendszerek is a gépen, azok automatikusan fel\n"
-"lesznek véve a betöltési menübe. Az aktuális beállítások módosíthatók. Új\n"
-"elemet a(z) \"%s\" funkcióval lehet felvenni. Egy elem módosításához\n"
-"jelölje ki az elemet, majd kattintson a(z) \"%s\" gombra; eltávolításhoz\n"
-"pedig a kijelölést követően a(z) \"%s\" gombra. A módosítások a(z)\n"
-"\"%s\" gombbal érvényesíthetők.\n"
-"\n"
-"Ha valamelyik operációs rendszert nem akarja elérhetővé tenni, akkor\n"
-"törölheti annak rendszerbetöltési bejegyzéseit, de ebben az esetben\n"
-"később csak indítólemezzel tudja majd azt az operációs rendszert elindítani."
-
-#: 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 "Hozzáadás"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Módosítás"
-
-#: 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 "Eltávolítás"
-
-#: help.pm:787
-#, 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 ""
-"A LILO és a GRUB linuxos rendszerindító programok. Ez a fázis általában\n"
-"teljesen automatikus. A telepítő elemzi a lemez betöltőszektorát, és\n"
-"annak megfelelően cselekszik, hogy ott mit talál:\n"
+"A rendszerindító programot a számítógép indítja el a gép elindításakor,\n"
+"ezt követően ezen program végzi a rendszer elindítását. A rendszerindító\n"
+"program telepítése általában teljesen automatikus. A telepítő elemzi a\n"
+"lemez betöltőszektorát, és annak megfelelően cselekszik, hogy ott mit\n"
+"talál:\n"
 "\n"
 "  - Ha windowsos betöltőszektort talál, akkor azt helyettesíteni fogja egy\n"
-"GRUB/LILO betöltőszektorral. Ezért Önnek lehetősége lesz arra is, hogy\n"
+"GRUB-/LILO-betöltőszektorral. Így Önnek lehetősége lesz arra is, hogy\n"
 "Linuxt indítson, és arra is, hogy egy másik operációs rendszert.\n"
 "\n"
-"  - Ha GRUB vagy LILO betöltőszektort talál, helyettesíti azt egy új\n"
+"  - Ha GRUB- vagy LILO-betöltőszektort talál, helyettesíti azt egy új\n"
 "példánnyal.\n"
 "\n"
-"Ha a telepítő nem tud dönteni, akkor kérdést tesz fel Önnek a\n"
-"rendszerindító elhelyezésével kapcsolatban."
+"Ha a telepítő nem tudja meghatározni, hogy hova telepítendő a\n"
+"rendszerindító, akkor kérdést tesz fel Önnek azzal kapcsolatban.\n"
+"Általában \"%s\" a legbiztosabb hely. \"%s\" lehetőség választása\n"
+"esetén nem lesz telepítve rendszerindító. Ezt a lehetőséget csak\n"
+"akkor használja, ha biztos abban, hogy ezt szeretné."
 
-#: help.pm:803
-#, fuzzy, c-format
+#: help.pm:742
+#, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Itt lehet nyomtatórendszert választani a gép számára. Más operációs\n"
 "rendszerekben általában csak egy van, a Mandrakelinuxban viszont kettő is.\n"
@@ -5226,10 +5366,10 @@ msgstr ""
 "nyomtatóval, továbbá ha szeretné, hogy egyszerűen meg lehessen oldani a\n"
 "papírberagadási problémákat illetve ha nincsen hálózati nyomtatója. A(z)\n"
 "\"%s\" módszer csak a legegyszerűbb hálózati szolgáltatásokat nyújtja, és\n"
-"hálózaton eléggé lassú. Válassza a \"pdq\" módszert, ha nem rendelkezik\n"
-"komolyabb linuxos ismeretekkel.\n"
+"hálózaton viszonylag lassú. Ha Ön nem rendelkezik komolyabb linuxos\n"
+"ismeretekkel, akkor érdemes ezt a módszert választania.\n"
 "\n"
-"  - \"%s\": \"Common UNIX Printing System\", azaz általános UNIX\n"
+"  - \"%s\": \"Common UNIX Printing System\", azaz általános UNIX-os\n"
 "nyomtatórendszer. Helyi és távoli nyomtatókra való nyomtatáshoz remekül\n"
 "használható. Ez egy egyszerűen beállítható rendszer, és képes a régi\n"
 "\"lpd\" nyomtatórendszer kiszolgálójaként vagy klienseként funkcionálni -\n"
@@ -5243,20 +5383,25 @@ msgstr ""
 "\n"
 "Telepítés után lehetősége lesz a nyomtatórendszer lecserélésére (ha mégsem\n"
 "felel meg az itt kiválasztott) - ehhez a PrinterDrake programot kell\n"
-"elindítani a Mandrake Vezérlőközpontban, majd megfelelően módosítani kell\n"
-"a szakértői beállításokat."
+"elindítani a Mandrakelinux Vezérlőközpontban, majd rá kell kattintani a(z)\n"
+"\"%s\" gombra."
 
-#: 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 "Szakértő"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5292,240 +5437,74 @@ msgstr ""
 "Ha a telepítő nem tudja meghatározni a szükséges jellemzőket, akkor\n"
 "Önnek kell megadnia a meghajtóprogram paramétereit."
 
-#: help.pm:847
-#, fuzzy, 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 ""
-"További bejegyzéseket lehet felvenni a Yaboot-ba, például más operációs\n"
-"rendszereket, további kerneleket vagy hibajavítási kernelt.\n"
-"\n"
-"Más operációs rendszereknél a bejegyzés egy címkéből és az indítási\n"
-"partíció nevéből áll.\n"
-"\n"
-"Linux esetén a következő beállítások lehetnek:\n"
-"\n"
-"  - Címke: ezt a nevet a Yaboot-ba begépelve lehet majd elindítani a\n"
-"megadott operációs rendszert.\n"
-"\n"
-"  - Indítófájl: az elindítandó kernel neve. Általában \"vmlinux\",\n"
-"vagy ugyanez valamilyen kiterjesztéssel.\n"
-"\n"
-"  - Gyökér: a telepített Linux rendszer gyökérpartíciója (\"/\").\n"
-"\n"
-"  - Hozzáfűzés: Apple gépeknél ezt az opciót gyakran használják a\n"
-"videokártya inicializálásához illetve a gyakran hiányzó második és\n"
-"harmadik egérgomb billentyűzetről történő emulálásának beállításához.\n"
-"Néhány példa látható az alábbiakban:\n"
-"\n"
-"    video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"    video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-"  - Indítási RAM-diszk: a rendszerindítási eszköz elérhetővé válása előtt\n"
-"történő modulbetöltésre használható, továbbá indítási probléma esetén egy\n"
-"RAM-diszkes fájl betöltésére.\n"
-"\n"
-"  - Az indítási RAM-diszk mérete: az alapértelmezett RAM-diszk-méret\n"
-"általában 4096 kilobájt. Ha nagyobb méretet szeretne, használja ezt a\n"
-"lehetőséget.\n"
-"\n"
-"  - Írható-olvasható: általában a gyökérpartíció csatolása először\n"
-"csak-olvasható módban történik, hogy az aktiválás előtt ellenőrizni\n"
-"lehessen a fájlrendszer integritását. Ezzel az opcióval felülbírálható az\n"
-"alapértelmezés.\n"
-"\n"
-"  - NoVideo: ha például egy Apple gép videokártyáját nem sikerül működésre\n"
-"bírni, válassza ezt az opciót a \"novideo\" módú indításhoz (natív\n"
-"framebuffer-támogatással).\n"
-"\n"
-"  - Alapértelmezés: alapértelmezettnek jelöli a bejegyzést. A\n"
-"Yaboot-promptnál az alapértelmezett bejegyzés kiválasztásához elegendő\n"
-"megnyomni az Enter billentyűt. Ha megjeleníti a lehetőségek listáját (a\n"
-"Tab billentyűvel), akkor a szóban forgó bejegyzés mellett egy \"*\" jel\n"
-"lesz látható."
-
-#: help.pm:894
-#, fuzzy, 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 ""
-"A Yaboot egy rendszerindító program a \"NewWorld\" Macintosh gépekhez.\n"
-"Elindíthatók vele a gépen található Linux, MacOS és MacOS X példányok.\n"
-"Általában a telepítőprogram felismeri a MacOS és a MacOS X rendszereket, és\n"
-"létrehozza a megfelelő menübejegyzéseket. De ha nem így történik, akkor\n"
-"kézzel, utólag is létrehozható a megfelelő bejegyzés. Gondosan ellenőrizze\n"
-"a megadott paramétereket.\n"
-"\n"
-"A Yaboot legfontosabb paraméterei:\n"
-"\n"
-"  - Indítási üzenet: egyszerű szöveges üzenet, amely az indítási prompt\n"
-"előtt jelenik meg.\n"
-"\n"
-"  - Rendszerindítási eszköz: ezzel adható meg, hogy hova kerüljön a\n"
-"rendszerindításhoz szükséges információ. Általában egy előzőleg már\n"
-"létrehozott rendszerindítási partícióra mutat.\n"
-"\n"
-"  - Késleltetés Open Firmware-nél: a LILO-tól eltérően a Yaboot-nál kétféle\n"
-"várakozási idő létezik. Az elsőt másodpercben mérik, és akkor érvényes,\n"
-"amikor a CD, az OF-betöltés, a MacOS és a Linux közül választani lehet.\n"
-"\n"
-"  - Várakozási idő rendszerindításkor: ez a késleltetési idő a LILO-belihez\n"
-"hasonló jellegű. A Linux kiválasztása után ennyi tizedmásodpercig vár majd\n"
-"a program az alapértelmezett kernel betöltése előtt.\n"
-"\n"
-"  - CD-ről történhessen rendszerindítás?: ennek bejelölésének hatására a \"C"
-"\"\n"
-"is választható lesz (CD-ről való indítás) a rendszerindítási promptnál.\n"
-"\n"
-"  - OF-ről történhet rendszerindítás?: ennek bejelölésének hatására az\n"
-"\"N\" is választható lesz (Open Firmware-ről való indítás) a\n"
-"rendszerindítási promptnál.\n"
-"\n"
-"  - Az alapértelmezett op. rendszer?: itt lehet megadni, hogy melyik\n"
-"operációs rendszer induljon el az Open Firmware várakozási idejének\n"
-"letelte után."
-
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 "\"%s\": ha a telepítő hangkártyát észlel a gépben, az itt fog\n"
 "megjelenni. Ha az itt megjelenő hangkártya nem azonos a gépben levővel,\n"
 "akkor kattintson a gombra és válasszon egy másik meghajtóprogramot."
 
-#: 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 "Hangkártya"
 
-#: help.pm:932
-#, fuzzy, c-format
+#: help.pm:791
+#, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5535,10 +5514,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 ""
@@ -5573,21 +5554,25 @@ msgstr ""
 "megjelenni. Ha az itt megjelenő hangkártya nem azonos a gépben levővel,\n"
 "akkor kattintson a gombra és válasszon egy másik meghajtóprogramot.\n"
 "\n"
-"  - \"%s\": a telepítő alapértelmezésben \"800x600\"-as\n"
-"vagy \"1024x768\"-as felbontást állít be a grafikus felülethez. Ha ez nem\n"
-"felel meg Önnek, kattintson a(z) \"%s\" gombra a grafikus felület\n"
-"beállításainak módosításához.\n"
-"\n"
 "  - \"%s\": ha a telepítő tévékártyát észlel a gépben, az itt\n"
 "fog megjelenni. Ha a telepítő nem észleli a gépben levő tévékártyát,\n"
 "akkor kattintson a(z) \"%s\" gombra és állítsa be kézzel.\n"
 "\n"
-"  - \"%s\": ha a telepítő ISDN-kártyát észlel a gépben, az itt fog\n"
-"megjelenni. Ha a(z) \"%s\" gombra kattint, módosíthatja a kártya\n"
+"  - \"%s\": ha a(z) \"%s\" gombra kattint, módosíthatja a kártya\n"
 "paramétereit.\n"
 "\n"
+"  - \"%s\": a telepítő alapértelmezésben \"800x600\"-as\n"
+"vagy \"1024x768\"-as felbontást állít be a grafikus felülethez. Ha ez nem\n"
+"felel meg Önnek, akkor kattintson a(z) \"%s\" gombra a grafikus felület\n"
+"beállításainak módosításához.\n"
+"\n"
 "  - \"%s\": ha be szeretné állítani az internet vagy a helyi hálózat\n"
-"elérését most, akkor kattintson a gombra.\n"
+"elérését most, akkor kattintson a gombra. Információkat a nyomtatott\n"
+"dokumentációból szerezhet, vagy telepítés után a Mandrakelinux\n"
+"Vezérlőközpontban.\n"
+"\n"
+"  - \"%s\": lehetővé teszi a HTTP- és FTP-proxyk beállítását arra az\n"
+"esetre, ha a gép egy proxykiszolgáló mögött lesz.\n"
 "\n"
 "  - \"%s\": lehetővé teszi az egyik korábbi lépésben\n"
 "beállított biztonsági szint módosítását.\n"
@@ -5598,76 +5583,77 @@ msgstr ""
 "\n"
 "  - \"%s\": ha szeretné módosítani a rendszerbetöltő\n"
 "beállításait, kattintson a megfelelő gombra. Elsősorban a komolyabb\n"
-"ismeretekkel rendelkező felhasználóknak javasolt.\n"
+"ismeretekkel rendelkező felhasználóknak javasolt. Információkat a\n"
+"nyomtatott dokumentációból szerezhet, vagy telepítés után a\n"
+"Mandrakelinux Vezérlőközpontban a rendszerindítónál.\n"
 "\n"
 "  - \"%s\": itt részletesen beállítható, hogy mely\n"
 "szolgáltatások legyenek működtetve a gépen. Ha kiszolgálóként szeretné\n"
 "üzemeltetni a gépet, akkor érdemes átnézni ezt a részt."
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Billentyűzet"
-
-#: 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 "Időzóna"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Grafikus felület"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Tévékártya"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDN-kártya"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Grafikus felület"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Hálózat"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Proxyk"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Biztonsági szint"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Tűzfal"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Rendszerbetöltő"
 
-#: 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 "Szolgáltatások"
 
-#: help.pm:994
-#, fuzzy, c-format
+#: help.pm:858
+#, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Válassza ki azt a lemezt, amelyet törölni szeretne a Mandrakelinux\n"
-"partíció létrehozásához. Figyelem: a partíción található adatok elvesznek,\n"
-"és később nem nyerhetők vissza!"
+"Válassza ki azt a lemezt, amelyet törölni szeretne a\n"
+"Mandrakelinux-partíció létrehozásához. Figyelem: a lemezen\n"
+"található adatok elvesznek, és később nem nyerhetők vissza!"
 
-#: help.pm:999
-#, fuzzy, c-format
+#: help.pm:863
+#, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
@@ -5679,14 +5665,23 @@ msgid ""
 msgstr ""
 "Kattintson a(z) \"%s\" gombra, ha a lemezen található összes adatot\n"
 "és partíciót törölni szeretné. Figyelem! A(z) \"%s\" gomb megnyomása\n"
-"után nincs mód a törölt adatok és partíciók visszaállítására - "
-"természetesen\n"
-"akkor sem, ha egy Windows-partíció törlődött.\n"
+"után nincs mód a törölt adatok és partíciók visszaállítására -\n"
+"természetesen akkor sem, ha egy Windows-partíció törlődött.\n"
 "\n"
 "Kattintson a(z) \"%s\" gombra, ha nem kívánja végrehajtani a műveletet\n"
 "(a lemezen található partíciók és adatok ez esetben nem változnak)."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Következő ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Előző"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5697,12 +5692,85 @@ msgstr ""
 "azt jelenti, hogy az indítólemez nincs összhangban a telepítési médiummal. "
 "Készítsen egy újabb indítólemezt."
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Meg kell formázni ezt is: %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 ""
+"A rendszer a következő telepítési adathordozókat találta.\n"
+"Ha szeretné kihagyni valamelyiket, távolítsa el annak kijelölését."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Van további kiegészítő adathordozója?"
+
+#. -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 ""
+"A rendszer a következő adathordozókat találta - telepítéskor fel lesznek "
+"használva: %s.\n"
+"\n"
+"\n"
+"Van beállítandó kiegészítő telepítési adathordozója?"
+
+#: 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 "Hálózat (HTTP)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Hálózat (FTP)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Eszköz nem található"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Helyezze be a CD-t"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Helyezze be ismét az 1. CD-t"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "A tükörkiszolgáló címe?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "A tükörkiszolgálón nem található fejléclista"
+
+#. -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"
@@ -5725,7 +5793,8 @@ msgstr ""
 "\n"
 "Biztosan telepíteni szeretné a kiszolgálóprogramo(ka)t?\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"
@@ -5738,18 +5807,18 @@ msgstr ""
 "\n"
 "Szeretné eltávolítani ezeket a csomagokat?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 "Helyezzen egy FAT fájlrendszerre formázott floppyt a(z) \"%s\" meghajtóba"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Ezen a floppyn nincs FAT fájlrendszer"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5758,12 +5827,17 @@ msgstr ""
 "Ha fel akarja később használni ezt a csomagkijelölést, akkor a telepítést "
 "\"linux defcfg=floppy\" paraméterrel indítsa el."
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "Hiba a(z) %s fájl olvasása közben"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (korábban: %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5772,12 +5846,12 @@ msgstr ""
 "Hiba történt - nincs olyan meghajtó, amelyen új fájlrendszert lehetne "
 "létrehozni. Ellenőrizze a gépben található eszközöket."
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Rendszertelepítés"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Rendszerbeállítás"
@@ -5813,7 +5887,7 @@ msgstr ""
 "\n"
 "Ennek ellenére tovább szeretne lépni?"
 
-#: 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 "Szükség van egy FAT partícióra a /boot/efi ponthoz csatolva"
@@ -5872,7 +5946,7 @@ msgstr "Melyik partíciót szeretné átméretezni?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "A FAT-átméretező nem tudja kezelni a partíciót.\n"
 "A következő hiba keletkezett: %s"
@@ -5893,7 +5967,8 @@ msgstr ""
 "majd futtassa a \"defrag\" programot. Ennek végeztével indítsa el újra a "
 "Mandrakelinux telepítését."
 
-#: 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"
@@ -5919,53 +5994,53 @@ msgstr ""
 "Ha biztos abban, hogy folytatni szeretné a telepítést, nyomja meg az \"OK\"-"
 "t."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Mekkora helyet szeretne fenntartani a Windowsnak itt:"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "%s partíció"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Windowsos partíció átméretezése"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "A FAT átméretezése nem sikerült: %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 "Nincs átméretezhető FAT partíció, vagy nincs elég hely"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "A Windows(TM) eltávolítása"
 
-#: 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 "Több merevlemeze van. Melyikre telepítsem a Linuxot?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 "MINDEN létező partíció és rajtuk minden adat elvész a(z) \"%s\" meghajtón"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Az fdisk használata"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -5974,33 +6049,34 @@ msgstr ""
 "Most partícionálható a(z) %s.\n"
 "Ha kész, ne feledje elmenteni a változásokat a \"w\"-vel"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Nincs elég szabad hely a telepítéshez"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "A telepítő partícionálási varázslója a következőket javasolja:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partícionálási hiba: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "A hálózatkezelés elindítása"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "A hálózatkezelés leállítása"
 
-#: install_messages.pm:9
-#, fuzzy, c-format
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
+#, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -6017,7 +6093,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 "
@@ -6039,7 +6115,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"
@@ -6047,14 +6123,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"
@@ -6084,10 +6160,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"
@@ -6098,11 +6174,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"
@@ -6118,7 +6194,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Bevezetés\n"
 "\n"
@@ -6136,7 +6212,7 @@ msgstr ""
 "\n"
 "Kérjük, olvassa el jelen dokumentumot figyelmesen. Ezen dokumentum egy, a "
 "Szoftvertermékekre\n"
-"vonatkozó licencegyezmény Ön és a MandrakeSoft S.A. között.\n"
+"vonatkozó licencegyezmény Ön és a Mandrakesoft S.A. között.\n"
 "Ha a Szoftvertermékeket bármiféle módon telepíti, sokszorosítja vagy "
 "felhasználja,\n"
 "azzal Ön elfogadja jelen licenc kikötéseit és feltételeit, továbbá "
@@ -6162,7 +6238,7 @@ msgstr ""
 "állapotban állnak\n"
 "rendelkezésre. Garancia nincsen azokra - a törvények által engedélyezett "
 "mértékben.\n"
-"A MandrakeSoft S.A. - a törvények által engedélyezett mértékben - semmilyen "
+"A Mandrakesoft S.A. - a törvények által engedélyezett mértékben - semmilyen "
 "körülmények\n"
 "között sem vonható felelősségre a Szoftvertermékek használatából vagy "
 "használhatatlanságából\n"
@@ -6172,7 +6248,7 @@ msgstr ""
 "pénzügyi\n"
 "veszteség, jogi díjak illetve bírósági ítéletből származó büntetés, vagy "
 "bármilyen\n"
-"származékos veszteség); még abban az esetben sem, ha a MandrakeSoft S.A. "
+"származékos veszteség); még abban az esetben sem, ha a Mandrakesoft S.A. "
 "tájékoztatva lett\n"
 "az ilyesféle károk bekövetkezésének lehetőségéről.\n"
 "\n"
@@ -6180,7 +6256,7 @@ msgstr ""
 "BIRTOKLÁSÁVAL ILLETVE\n"
 "HASZNÁLATÁVAL KAPCSOLATBAN\n"
 "\n"
-"A MandrakeSoft S.A. és disztribútorai - a törvények által engedélyezett "
+"A Mandrakesoft S.A. és disztribútorai - a törvények által engedélyezett "
 "mértékben - semmilyen\n"
 "körülmények között sem vonhatók felelősségre az olyan - speciális, előre nem "
 "látott, közvetlen\n"
@@ -6192,7 +6268,7 @@ msgstr ""
 "károk a\n"
 "szoftverkomponensek birtoklásából vagy használatából illetve a helyi "
 "törvények által\n"
-"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrakelinux címről "
+"tiltott vagy korlátozott szoftverkomponenseknek egy Mandrakelinux-címről "
 "való\n"
 "letöltéséből származnak.\n"
 "Ezen korlátozott felelősség vonatkozik többek közt a Szoftvertermékekben "
@@ -6213,11 +6289,11 @@ msgstr ""
 "el figyelmesen\n"
 "a komponensre vonatkozó licenc kikötéseit és feltételeit. Egy komponens "
 "licencére vonatkozó\n"
-"kérdést nem a MandrakeSoft céghez, hanem az adott komponens szerzőjéhez kell "
+"kérdést nem a Mandrakesoft céghez, hanem az adott komponens szerzőjéhez kell "
 "irányítani.\n"
-"A MandrakeSoft S.A. által fejlesztett programok a GPL licenc hatálya alá "
+"A Mandrakesoft S.A. által fejlesztett programok a GPL licenc hatálya alá "
 "tartoznak.\n"
-"A MandrakeSoft S.A. által írt dokumentációs anyagokra egy speciális licenc "
+"A Mandrakesoft S.A. által írt dokumentációs anyagokra egy speciális licenc "
 "vonatkozik.\n"
 "További részletek a dokumentációban.\n"
 "\n"
@@ -6229,12 +6305,12 @@ msgstr ""
 "és a szoftverekre vonatkozó szellemi tulajdoni illetve szerzői jogi "
 "(copyright) törvények\n"
 "védelme alatt áll.\n"
-"A MandrakeSoft S.A. fenntartja a jogot arra, hogy módosítsa illetve "
+"A Mandrakesoft S.A. fenntartja a jogot arra, hogy módosítsa illetve "
 "átalakítsa a\n"
 "Szoftvertermékeket - teljes egészében vagy részben, bármilyen módon illetve "
 "bármilyen célra.\n"
 "A \"Mandrake\", a \"Mandrakelinux\" és az azokhoz tartozó logók a "
-"MandrakeSoft S.A. védjegyei.\n"
+"Mandrakesoft S.A. védjegyei.\n"
 "\n"
 "\n"
 "5. Vonatkozó törvények\n"
@@ -6253,10 +6329,10 @@ msgstr ""
 "megfelelő\n"
 "párizsi (Franciaország) bíróságra kerül.\n"
 "Ha jelen dokumentummal kapcsolatban kérdése van, vegye fel a kapcsolatot a "
-"MandrakeSoft S.A.\n"
+"Mandrakesoft S.A.\n"
 "céggel.\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"
@@ -6275,7 +6351,8 @@ msgstr ""
 "szabadalom vonatkozik-e az Ön esetére, akkor vizsgálja meg az Ön országában\n"
 "érvényes törvényeket."
 
-#: 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"
@@ -6338,8 +6415,8 @@ msgstr ""
 "meg, és a szoftvertermékekre vonatkozó szellemi és szerzői jogi\n"
 "törvények érvényesek rájuk.\n"
 
-#: install_messages.pm:128
-#, fuzzy, c-format
+#: install_messages.pm:131
+#, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -6356,11 +6433,12 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
-"Gratulálunk, a telepítés sikeresen befejeződött. Vegye ki az adathordozót,\n"
-"amiről a rendszer indítása történt (CD, floppylemez, ...), majd nyomja le\n"
-"az Enter billentyűt a rendszer újraindításához.\n"
+"Gratulálunk; a telepítés befejeződött. Vegye ki a rendszerindítási\n"
+"adathordozókat, majd nyomja le az Enter billentyűt a rendszer\n"
+"újraindításához.\n"
+"\n"
 "\n"
-"Az ehhez a Mandrakelinux verzióhoz elérhető javításokról a következő\n"
+"Az ehhez a Mandrakelinux-verzióhoz elérhető javításokról a következő\n"
 "helyen olvashat:\n"
 "\n"
 "\n"
@@ -6370,31 +6448,32 @@ msgstr ""
 "A rendszer beállításával kapcsolatban a Mandrakelinux hivatalos\n"
 "felhasználói kézikönyvében talál további információkat."
 
-#: 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 "A következő csatolási pont kétszer van megadva: %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 ""
 "Néhány fontos csomag telepítése nem sikerült.\n"
 "Ez azt jelenti, hogy a CD-meghajtó vagy a CD hibás.\n"
 "A CD-t egy, már feltelepített gépen a következő\n"
 "parancs segítségével tesztelheti le:\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+"\"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Nincs elérhető floppy-meghajtó"
@@ -6404,7 +6483,7 @@ msgstr "Nincs elérhető floppy-meghajtó"
 msgid "Entering step `%s'\n"
 msgstr "A következő lépés: \"%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"
@@ -6417,52 +6496,52 @@ msgstr ""
 "szöveges módú telepítéssel: CD-ről való rendszerindítást követően nyomjon\n"
 "\"F1\"-et, majd írja be azt, hogy \"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 "Csomag-csoportok kiválasztása"
 
-#: 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 "Összméret: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Hibás csomag"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Verzió: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Méret: "
 
-#: 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 "Fontosság: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Ez a csomag nem jelölhető ki illetve nem törölhető a kijelölése"
 
-#: install_steps_gtk.pm:381
-#, fuzzy, c-format
+#: install_steps_gtk.pm:350
+#, c-format
 msgid "due to missing %s"
-msgstr "nincs \"kdesu\""
+msgstr "\"%s\" hiánya miatt"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "\"%s\" igényei miatt"
@@ -6480,44 +6559,44 @@ msgstr "\"%s\" igényei miatt"
 # continues by not selecting a package which was selected by a promotion (not
 # asked by the user directly but caused by a package which has been upgraded thus
 # breaking existing packages, the promotion concerns this).
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "a legalkalmasabb \"%s\" keresése"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "\"%s\" megtartása érdekében"
 
-#: 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"
 msgstr ""
 "Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "A telepítő a következő csomagokat fogja telepíteni"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "A telepítő a következő csomagokat távolítja el"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ez egy kötelező csomag, nem lehet megszüntetni a kijelölését"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nem törölhető ennek a csomagnak a kijelölése, mert már telepítve van"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6526,221 +6605,225 @@ msgstr ""
 "Ezt a csomagot frissíteni kell.\n"
 "Biztos, hogy törölni kívánja a kijelölését?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 "Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő!"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automat. kijelölt csomagok mutatása"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Betöltés/floppyra mentés"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "A csomagkiválasztás frissítése"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Minimális telepítés"
 
-#: 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 "Válassza ki a telepítendő csomagokat"
 
-#: 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 "Telepítés"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Részletek nélkül"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Becslés"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Hátralevő idő "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Kis türelmet - a telepítés előkészítése folyik..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Részletek nélkül"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d csomag"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "A(z) %s csomag telepítése"
 
-#: 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 "Nem fogadom el"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
+# itt a \n valószínűleg feltétlen újsort jelent
+#: 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 ""
-"Cserélje ki a CD-t a meghajtóban!\n"
-"\n"
+"Cserélje ki a CD-t a meghajtóban.\n"
 "Tegye be a(z) \"%s\" feliratú lemezt, és nyomja meg az \"OK\" gombot.\n"
-"Ha nincs ilyen lemeze, nyomja meg a \"Mégsem\" gombot, így erről a CD-ről\n"
-"nem történik telepítés."
+"Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-"
+"ről nem történik telepítés."
 
-#: 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 "Hiba történt a csomagok rendezésekor:"
 
-#: 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 "Kívánja folytatni ettől függetlenül?"
 
-#: 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 "Hiba történt a csomagok telepítésekor:"
 
-#: 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 "nincs beállítva"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Szeretné helyreállítani a rendszert?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Licencegyezmény"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Verzióinformáció"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Válasszon billentyűzetkiosztást."
 
-#: 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 "Itt található az elérhető országok listája"
+msgstr "Itt található az elérhető billentyűzetek listája"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Telepítés/frissítés"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Új telepítés vagy frissítés?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Frissítés: %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Titkosítási kulcs ehhez: %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Adja meg az egér típusát."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Egér port"
 
-#: 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 "Válassza ki, hogy melyik soros porthoz csatlakozik az egere."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Egérgomb-emuláció"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "A 2. gomb emulálása"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "A 3. gomb emulálása"
 
-#: 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 "PCMCIA kártyák beállítása..."
 
-#: 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 "IDE beállítások"
+msgstr "IDE-beállítások"
 
-#: 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 "Nincs elérhető partíció"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Csatolási pontok keresése a partíciókon"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Válassza ki a csatolási pontokat"
 
-#: 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 "
@@ -6750,17 +6833,17 @@ msgstr ""
 "folytatható, de a rendszer indításához létre kell hozni egy rendszerindító "
 "partíciót a DiskDrake-kel."
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Válassza ki a formázandó partíciókat"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
-msgstr "Ellenőrizzem a rossz blokkokat?"
+msgstr "Ellenőrizve legyen, hogy vannak-e hibás blokkok?"
 
-#: 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, "
@@ -6769,34 +6852,47 @@ msgstr ""
 "A(z) \"%s\" fájlrendszer ellenőrzése hibákat eredményezett. Szeretné "
 "kijavítani a hibákat? (legyen óvatos, mivel ez adatvesztéshez is vezethet)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 "A lapozóterület mérete nem elég nagy. Növelje meg a telepítés befejezéséhez."
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "A rendelkezésre álló csomagok keresése és az RPM-adatbázis újraépítése..."
 
-#: 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 "A rendelkezésre álló csomagok keresése..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "A már telepített csomagok vizsgálata..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "A frissítendő csomagok keresése..."
 
-#: 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 ""
+"Kapcsolódás a Mandrakelinux webkiszolgálójához; az elérhető tükörkiszolgálók "
+"listájának lekérdezése..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6804,7 +6900,7 @@ msgid ""
 msgstr ""
 "A rendszeren nem maradt elég hely a telepítéshez vagy frissítéshez (%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"
@@ -6814,42 +6910,42 @@ msgstr ""
 "csomagkijelölést vagy a jelenlegi kijelölést szeretné elmenteni.\n"
 "A formátum ugyanaz, mint az automatikus telepítőfloppyknál."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Betöltés floppyról"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Mentés floppyra"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Csomagkijelölés"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Betöltés floppyról"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Tegye be a csomagkijelölést tartalmazó floppyt a meghajtóba"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "A kijelölt összméret nagyobb, mint a rendelkezésre álló hely"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "A telepítés típusa"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6858,22 +6954,22 @@ msgstr ""
 "Egyetlen csomagcsoportot sem jelölt ki.\n"
 "Válassza ki, milyen fajta minimális telepítést szeretne."
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Alapvető dokumentációval (javasolt)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Valóban minimális telepítés (urpmi sincs)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Mind"
 
-#: 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"
@@ -6886,17 +6982,17 @@ msgstr ""
 "Ha a felsoroltak közül néhány CD hiányzik, törölje a kijelölésüket, majd\n"
 "kattintson az OK gombra."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "A(z) \"%s\" címkéjű CD"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "A telepítés előkészítése"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6905,17 +7001,17 @@ msgstr ""
 "A(z) %s csomag telepítése\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Telepítés utáni beállítások"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Tegye be a frissítőmodulokat tartalmazó floppyt a(z) \"%s\" meghajtóba"
 
-#: 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"
@@ -6925,7 +7021,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 ""
 "Lehetősége van arra, hogy letöltse a disztribúció kiadása után frissített\n"
 "csomagokat. Ez általában biztonsági javításokat és hibajavításokat jelent.\n"
@@ -6934,186 +7030,168 @@ msgstr ""
 "\n"
 "Szeretné feltelepíteni a frissítéseket?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Kapcsolódás a Mandrakelinux webkiszolgálójához; az elérhető tükörkiszolgálók "
-"listájának lekérdezése..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Kapcsolatfelvétel a tükörkiszolgálóval; az elérhető csomagok listájának "
 "letöltése..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Nem sikerült kapcsolódni ehhez a tükörkiszolgálóhoz: %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Szeretné újra megpróbálni?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Melyik időzónát választja?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatikus időszinkronizáció (NTP-vel)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP-kiszolgáló"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Összefoglalás"
 
-#: 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 "Rendszer"
 
-#: 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 "Hardver"
 
-#: 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 "Távoli CUPS-kiszolgáló"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Nincs nyomtató"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Van ISA hangkártyája?"
 
-#: 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 ""
-"A hangkártya beállításához futtassa az \"sndconfig\" programot a telepítés "
-"után"
+"A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" "
+"programot a telepítés után."
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a "
-"telepítés után"
+"telepítés után."
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikus felület"
 
-#: 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 "Hálózat és internet"
 
-#: install_steps_interactive.pm:1020
-#, fuzzy, c-format
-msgid "Proxies"
-msgstr "Profil "
-
-#: install_steps_interactive.pm:1021
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1086
+#, c-format
 msgid "configured"
-msgstr "Beállítás újból"
+msgstr "beállítva"
 
-#: 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 "Biztonság"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "aktiválva"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Rendszerindítás"
 
 #. -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 ezen: %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 "Szolgáltatások: %d aktivált, %d regisztrált"
 
-#: 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 "Az X grafikus rendszert nem állította be. Biztosan megfelel így?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "A rendszergazdai jelszó és a hálózati azonosítási módszerek beállítása"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Rendszergazdai (root) jelszó beállítása"
 
-#: 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 "Ez a jelszó túl rövid (legalább %d karakter hosszúnak kell lennie)"
 
-#: 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 "Felhasználóazonosítás"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Rendszerbetöltő előkészítése..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7126,12 +7204,12 @@ msgstr ""
 "A telepítés folytatható, de a gép indításához\n"
 "BootX-re vagy egyéb módszerre lesz szükség."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Szeretné az aboot-ot használni?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7141,56 +7219,31 @@ msgstr ""
 "Próbáljam újra a telepítést akkor is, ha ez esetleg tönkreteszi az első\n"
 "partíciót?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Rendszerindító program telepítése"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "A rendszerbetöltő telepítése nem sikerült. A hiba a következő:"
-
-#: 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 ""
-"Lehet, hogy módosítani kell az Open Firmware rendszerindítási eszköz\n"
-" beállításain a rendszerindító program használatához. Ha újraindítás után\n"
-" nem jelenik meg a prompt, nyomja le a Command-Option-O-F-et induláskor\n"
-" és írja be ezt: setenv boot-device %s,\\\\:tbxi\n"
-" Majd gépelje be ezt: shut-down\n"
-"A következő indítás után meg kell jelennie a promptnak."
-
-#: 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 "
 "restricted to the administrator."
 msgstr ""
+"Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos "
+"partíción levő fájlokat."
 
-#: 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 "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba"
 
-#: install_steps_interactive.pm:1280
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1327
+#, c-format
 msgid "Please insert another floppy for drivers disk"
-msgstr "Tegye be a rendszerindító floppyt a(z) \"%s\" meghajtóba"
+msgstr "Tegyen be egy másik floppyt a meghajtóprogramok számára"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Automatikus telepítőfloppy készítése..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7201,12 +7254,12 @@ msgstr ""
 "\n"
 "Biztos, hogy ki akar lépni?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Automatikus telepítőfloppy készítése"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7227,7 +7280,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinux telepítés %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 "
@@ -7239,17 +7293,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Válasszon egy fájlt"
 
+#: 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 "Hozzáadás"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Módosítás"
+
+#: 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 "Eltávolítás"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Alapvető"
 
-#: 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 "Befejezés"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Végrehajtás"
@@ -7330,572 +7404,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Újraküldés"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "cseh (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "német"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak-féle"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "spanyol"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "finn"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "francia"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "norvég"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "lengyel"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "orosz"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "svéd"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "angol (UK) billentyűzet"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "USA-billentyűzet"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "albán"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "örmény (régi)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "örmény (írógép)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "örmény (fonetikus)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "arab"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "azerbajdzsáni (latin)"
 
-#: 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 "bengáli"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "bolgár (fonetikus)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "bolgár (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "brazil (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "boszniai"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "fehérorosz"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "svájci (német kiosztás)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "svájci (francia kiosztás)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "cseh (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "német (\"dead key\" nélkül)"
 
-#: 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 "dán"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak-féle (USA)"
 
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvorak-féle (norvég)"
-
 #: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Norwegian)"
-msgstr "Dvorak-féle (norvég)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr "Dvorak-féle (eszperantó)"
 
 #: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Swedish)"
-msgstr "Dvorak-féle (svéd)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
+msgstr "Dvorak-féle (norvég)"
 
 #: keyboard.pm:203
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
+msgstr "Dvorak-féle (svéd)"
+
+#: keyboard.pm:205
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "észt"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "grúz (\"orosz\" kiosztás)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "grúz (\"latin\" kiosztás)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "görög"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "görög (politon)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "gudzsarati"
 
-#: 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 "magyar"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "horvát"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "ír"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "izraeli"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "izraeli (fonetikus)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "iráni"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "izlandi"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "olasz"
 
-#: 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 "japán 106 billentyűs"
 
-#: 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 "koreai billentyűzet"
 
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "angol (UK) billentyűzet"
+#: keyboard.pm:234
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
+msgstr "kirgiz billentyűzet"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "latin-amerikai"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "laoszi"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "litván AZERTY (régi)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "litván AZERTY (új)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "litván \"számsor\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "litván \"fonetikus\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "lett"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "malayalam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "macedón"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "myanmar (burmai)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "mongol (cirill)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "máltai (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "máltai (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "holland"
 
-#: 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 "lengyel (qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "lengyel (qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "portugál"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "kanadai (Quebec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "román (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "román (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "orosz (fonetikus)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "saami (norvég)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "saami (svéd/finn)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "szlovén"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "szlovák (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "szlovák (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "szerb (cirill)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "szír"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "szír (fonetikus)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "telugu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "tamil (ISCII kiosztás)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "tamil (írógép-kiosztás)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "thaiföldi billentyűzet"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "tádzsik billentyűzet"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "török (hagyományos \"F\" modell)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "török (modern \"Q\" modell)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "ukrán"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA-billentyűzet (nemzetközi)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "üzbég (cirill)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "vietnámi \"számsor\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "jugoszláv (latin)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Jobb Alt gomb"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "A két Shift gomb egyszerre"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl és Shift gombok egyszerre"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock gomb"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Shift és CapsLock gombok egyszerre"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl és Alt gombok egyszerre"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt és Shift gombok egyszerre"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" gomb"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bal \"Windows\" gomb"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Jobb \"Windows\" gomb"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "A két Ctrl gomb egyszerre"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "A két Alt gomb egyszerre"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Bal Shift gomb"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Jobb Shift gomb"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Bal Alt gomb"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Bal Ctrl gomb"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Jobb Ctrl gomb"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7906,7 +8173,7 @@ msgstr ""
 "a különböző billentyűzetkiosztások (például: latin illetve nem-latin)\n"
 "közt lehet majd váltani."
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7917,1165 +8184,1189 @@ msgstr ""
 "Telepítés közben a jobb oldali Control (Ctrl) billentyűvel\n"
 "lehet váltani a különböző billentyűzetkiosztások közt."
 
-#: 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 "Afganisztán"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Egyesült Arab Emirátusok"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afganisztán"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua és 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 "Örményország"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Holland Antillák"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktisz"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentína"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
-msgstr "Amerikai Samoa"
+msgstr "Amerikai Szamoa"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Ausztrália"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbajdzsán"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosznia és Hercegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: 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 "Bahrein"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "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 "Brazília"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahama-szigetek"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
-msgstr "Bhutan"
+msgstr "Bhután"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet-sziget"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Fehéroroszország"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) -szigetek"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongó (Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Közép-Afrikai Köztársaság"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongó (Brazzaville)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Svájc"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Elefántcsontpart"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Cook-szigetek"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "Kína"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Szerbia és Montenegró"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Kuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Christmas-sziget"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Ciprus"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Dzsibuti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Dánia"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominika"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikai Köztársaság"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algéria"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Észtország"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egyiptom"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Nyugat-Szahara"
 
-#: 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 "Spanyolország"
 
-#: 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 "Finnország"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
-msgstr "Fiji"
+msgstr "Fidzsi-szigetek"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falkland-szigetek (Malvinas)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Mikronézia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Feröer-szigetek"
 
-#: 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 "Egyesült Királyság"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Grúzia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Francia Guiana"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Ghána"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltár"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Grönland"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Egyenlítői Guinea"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Dél-Georgia és a Dél-Sandwich-szigetek"
 
-#: 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
-#, fuzzy, c-format
-msgid "China (Hong Kong)"
-msgstr "Hong Kong"
+#: lang.pm:273
+#, c-format
+msgid "Hong Kong SAR (China)"
+msgstr "Kína (Hongkong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard- és McDonald-szigetek"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Horvátország"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Magyarország"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonézia"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Írország"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
-msgstr "Brit indiai óceáni terület"
+msgstr "Brit indiai-óceáni terület"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Irán"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Izland"
 
-#: 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án"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirgizisztán"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodzsa"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts és Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Korea (Észak-)"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuvait"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Kajmán-szigetek"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazahsztán"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laosz"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: 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 "Litvánia"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Lettország"
 
-#: 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 "Marokkó"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaszkár"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshall-szigetek"
 
-#: 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 "Északi Mariana-szigetek"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: 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 "Málta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldív-szigetek"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Mexikó"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: 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 "Új-Kaledónia"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolk-sziget"
 
-#: 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 "Nepál"
 
-#: 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 "Új-Zéland"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Omán"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Francia Polinézia"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Pápua Új-Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Fülöp-szigetek"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakisztán"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Lengyelország"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre és 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 "Palesztina"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugália"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
-msgstr "Reunion"
+msgstr "Réunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Románia"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Oroszország"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Szaúd-Arábia"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Salamon-szigetek"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Szudán"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Szingapúr"
 
-#: 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 "Szlovénia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard és Jan Mayen-szigetek"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Szlovákia"
 
-#: 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 "Szenegál"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Szomália"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome és Principe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Szíria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Szváziföld"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks és Caicos-szigetek"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Csád"
 
 # a déli féltekéről van szó
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Déli francia területek"
 
-#: 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 "Thaiföld"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tádzsikisztán"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Kelet-Timor"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Türkmenisztán"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunézia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Törökország"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad és Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzánia"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukrajna"
 
-#: 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 "Amerikai Egyesült Államok - kisebb külső szigetek"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Üzbegisztán"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vatikán"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent és Grenadines"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virgin-szigetek (brit)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virgin-szigetek (USA)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis és Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
-msgstr "Samoa"
+msgstr "Szamoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Jemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr ""
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Dél-Afrika"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Telepítenie kell a következő csomagokat: %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 "Üdvözöljük - %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Körkörös csatolás - %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Először törölje az összes logikai kötetet\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Paraméterek"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "EGYIK SEM"
@@ -9092,8 +9383,8 @@ msgstr "A modul összes paramétere beállítható itt."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "A telepítő %s %s csatolót talált"
+msgid "Found %s interfaces"
+msgstr "A telepítő %s csatolót talált"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9148,12 +9439,12 @@ msgid "Module options:"
 msgstr "A modul paraméterei:"
 
 #. -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 "Melyik %s-meghajtóprogramot próbáljam meg?"
 
-#: 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"
@@ -9170,17 +9461,17 @@ msgstr ""
 "információkat? Bizonyos körülmények esetén az automatikus felderítés\n"
 "a gép lefagyásához vezethet, de komolyabb kárt nem okozhat."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Automatikus felderítés"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Paraméterek megadása"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9239,14 +9530,14 @@ msgstr "Általános PS/2-es görgős egér"
 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
-#, fuzzy, c-format
+#: 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 "Automatikus IP-cím"
+msgstr "Automatikus"
 
 #: mouse.pm:39 mouse.pm:73
 #, c-format
@@ -9379,97 +9670,102 @@ msgid "3 buttons with Wheel emulation"
 msgstr "3 gomb, egérgörgő-emulációval"
 
 #: mouse.pm:86
-#, fuzzy, c-format
+#, c-format
 msgid "Universal"
-msgstr "Eltávolítás után"
+msgstr "Univerzális"
 
 #: mouse.pm:88
 #, c-format
 msgid "Any PS/2 & USB mice"
-msgstr ""
+msgstr "Bármilyen PS/2- vagy USB-egér"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Synaptics érintőpad"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "egyik sem"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "nincs egér"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Az egér letesztelése"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Az egér aktiválásához "
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOZGASSA AZ EGÉRGÖRGŐT!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
+msgid "use PPPoE"
 msgstr "PPPOE használata"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
+msgid "use PPTP"
 msgstr "PPTP használata"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "DHCP használata"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel Speed Touch USB"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
-#, fuzzy, c-format
+#, c-format
 msgid " - detected"
-msgstr "felismerve"
+msgstr " - felismerve"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
 msgstr "Sagem (PPPoA-t használó) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
+msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (DHCP-t használó) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Csatlakozás az internethez"
 
-#: 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 ""
 "Az ADSL-en keresztüli csatlakozás legtöbbször PPPOE-vel történik,\n"
 "de előfordul a PPTP és a DHCP is.\n"
 "A PPPOE-t válassza, ha nem biztos a válaszban."
 
-#: network/adsl.pm:41 network/netconnect.pm:766
-#, fuzzy, c-format
-msgid "ADSL connection type :"
-msgstr "ADSL-kapcsolat"
+#: network/adsl.pm:41 network/netconnect.pm:804
+#, c-format
+msgid "ADSL connection type:"
+msgstr "ADSL-kapcsolat típusa:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Webkiszolgáló"
@@ -9480,14 +9776,14 @@ msgid "Domain Name Server"
 msgstr "Tartománynév-kiszolgáló"
 
 #: network/drakfirewall.pm:22
-#, fuzzy, c-format
+#, c-format
 msgid "SSH server"
 msgstr "SSH-kiszolgáló"
 
 #: network/drakfirewall.pm:27
-#, fuzzy, c-format
+#, c-format
 msgid "FTP server"
-msgstr "NTP-kiszolgáló"
+msgstr "FTP-kiszolgáló"
 
 #: network/drakfirewall.pm:32
 #, c-format
@@ -9500,29 +9796,29 @@ msgid "POP and IMAP Server"
 msgstr "POP- és IMAP-kiszolgáló"
 
 #: network/drakfirewall.pm:42
-#, fuzzy, c-format
+#, c-format
 msgid "Telnet server"
-msgstr "X-kiszolgáló"
+msgstr "Telnet-kiszolgáló"
 
 #: network/drakfirewall.pm:48
-#, fuzzy, c-format
+#, c-format
 msgid "Samba server"
 msgstr "Samba-kiszolgáló"
 
 #: network/drakfirewall.pm:54
-#, fuzzy, c-format
+#, c-format
 msgid "CUPS server"
-msgstr "DNS-kiszolgáló"
+msgstr "CUPS-kiszolgáló"
 
 #: network/drakfirewall.pm:60
 #, c-format
 msgid "Echo request (ping)"
-msgstr ""
+msgstr "\"Echo\"-kérés (ping)"
 
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -9574,7 +9870,7 @@ msgstr ""
 "További információ a /etc/services fájlban."
 
 #: network/drakfirewall.pm:182
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Invalid port given: %s.\n"
 "The proper format is \"port/tcp\" or \"port/udp\", \n"
@@ -9584,7 +9880,9 @@ msgid ""
 msgstr ""
 "Helytelen port lett megadva: %s.\n"
 "A helyes formátum: \"port/tcp\" vagy \"port/udp\",\n"
-"ahol a \"port\" egy 1 és 65535 közti szám."
+"ahol a \"port\" egy 1 és 65535 közti szám.\n"
+"\n"
+"Port-tartomány is megadható (például 24300:24350/udp)."
 
 #: network/drakfirewall.pm:192
 #, c-format
@@ -9596,106 +9894,107 @@ msgstr "Minden (nincs tűzfal)"
 msgid "Other ports"
 msgstr "Egyéb portok"
 
-#: 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 ""
+msgstr "A listában nem szereplő - kézi szerkesztés"
 
-#: 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 "Nem tudom"
 
-#: 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
-#, fuzzy, c-format
+#: network/isdn.pm:170 network/netconnect.pm:388
+#, c-format
 msgid "USB"
-msgstr "LSB"
+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
-#, fuzzy, c-format
+#: 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 "kézi"
+msgstr "Kézi"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
-#, fuzzy, c-format
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
+#, c-format
 msgid "Manual choice"
-msgstr "kézi"
+msgstr "Kézi kiválasztás"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Belső ISDN-kártya"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
-msgstr ""
+msgstr "Alkalmi"
 
-#: network/netconnect.pm:98
-#, fuzzy, c-format
+#: network/netconnect.pm:99
+#, c-format
 msgid "Managed"
-msgstr "Nyelv"
+msgstr "Menedzselt"
 
-#: network/netconnect.pm:99
-#, fuzzy, c-format
+#: network/netconnect.pm:100
+#, c-format
 msgid "Master"
-msgstr "Mayotte"
+msgstr "Fő"
 
-#: network/netconnect.pm:100
-#, fuzzy, c-format
+#: network/netconnect.pm:101
+#, c-format
 msgid "Repeater"
-msgstr "Visszatöltés"
+msgstr "Ismétlő"
 
-#: network/netconnect.pm:101
-#, fuzzy, c-format
+#: network/netconnect.pm:102
+#, c-format
 msgid "Secondary"
-msgstr "másodlagos"
+msgstr "Másodlagos"
 
-#: network/netconnect.pm:102
-#, fuzzy, c-format
+#: network/netconnect.pm:103
+#, c-format
 msgid "Auto"
-msgstr "Szerző:"
+msgstr "Automatikus"
 
-#: 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 "Kézi beállítás"
 
-#: network/netconnect.pm:106
-#, fuzzy, c-format
+#: network/netconnect.pm:107
+#, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
-msgstr "Automatikus IP-cím"
+msgstr "Automatikus IP-cím (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
-msgstr ""
+msgstr "Automatikus IP-cím (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll a világ többi részén"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Európai protokoll (EDSS1)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9704,164 +10003,171 @@ msgstr ""
 "Protokoll a világ többi részén\n"
 "D csatorna nélkül (bérelt vonal)"
 
-#: network/netconnect.pm:147
-#, fuzzy, c-format
+#: network/netconnect.pm:151
+#, c-format
 msgid "Alcatel speedtouch USB modem"
-msgstr "Alcatel Speed Touch USB"
+msgstr "Alcatel Speedtouch USB-modem"
 
-#: network/netconnect.pm:148
-#, fuzzy, c-format
+#: network/netconnect.pm:152
+#, c-format
 msgid "Sagem USB modem"
-msgstr "Rendszermód"
+msgstr "Sagem USB-modem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
-msgstr ""
+msgstr "Bewan modem"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
-msgstr ""
+msgstr "ECI Hi-Focus modem"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
-msgstr ""
+msgstr "Dinamikus gépbeállítási protokoll (DHCP)"
 
-#: network/netconnect.pm:155
-#, fuzzy, c-format
+#: network/netconnect.pm:159
+#, c-format
 msgid "Manual TCP/IP configuration"
-msgstr "Kézi beállítás"
+msgstr "Kézi TCP/IP-beállítás"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
-msgstr ""
+msgstr "Pontból-pontba alagútprotokoll (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
-msgstr ""
+msgstr "PPP Ethernet felett (PPPOE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
-msgstr ""
+msgstr "PPP ATM felett (PPPoA)"
 
-#: network/netconnect.pm:162
-#, fuzzy, c-format
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr "DSL CAPI felett"
+
+# LLC: Logical Link Control
+#: network/netconnect.pm:167
+#, c-format
 msgid "Bridged Ethernet LLC"
-msgstr "Ethernet-kártya"
+msgstr "Bridge-es (hidas) Ethernet-LLC"
 
-#: network/netconnect.pm:163
-#, fuzzy, c-format
+# VC: virtual circuit
+#: network/netconnect.pm:168
+#, c-format
 msgid "Bridged Ethernet VC"
-msgstr "Ethernet-kártya"
+msgstr "Bridge-es (hidas) Ethernet-VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
-msgstr ""
+msgstr "Routeres (útválasztós) IP-LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
-msgstr ""
+msgstr "Routeres (útválasztós) IP-VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr ""
+msgid "PPPoA LLC"
+msgstr "PPPoA-LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr ""
+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 "Szkript-alapú"
 
-#: 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 "Terminál-alapú"
 
-#: 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
-#, fuzzy, c-format
+#: network/netconnect.pm:180 standalone/drakconnect:474
+#, c-format
 msgid "PAP/CHAP"
-msgstr "CHAP"
+msgstr "PAP/CHAP"
 
 # címfelirat
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Hálózat- és internetbeállítás"
 
-#: network/netconnect.pm:234
-#, fuzzy, c-format
+#: network/netconnect.pm:242
+#, c-format
 msgid "(detected on port %s)"
-msgstr "felismerve ezen a porton: %s"
+msgstr "(felismerve ezen a porton: %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
-#, fuzzy, c-format
+#: network/netconnect.pm:244
+#, c-format
 msgid "(detected %s)"
-msgstr "felismerve: %s"
+msgstr "(felismerve: %s)"
 
-#: network/netconnect.pm:236
-#, fuzzy, c-format
+#: network/netconnect.pm:244
+#, c-format
 msgid "(detected)"
-msgstr "felismerve"
+msgstr "(felismerve)"
 
-#: network/netconnect.pm:238
-#, fuzzy, c-format
+#: network/netconnect.pm:246
+#, c-format
 msgid "Modem connection"
-msgstr "Winmodemes kapcsolat"
+msgstr "Modemes kapcsolat"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN-kapcsolat"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL-kapcsolat"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Kábeles kapcsolat"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Helyi hálózatos kapcsolat"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
-#, fuzzy, c-format
+#: network/netconnect.pm:251 network/netconnect.pm:265
+#, c-format
 msgid "Wireless connection"
-msgstr "Kábeles kapcsolat"
+msgstr "Vezeték nélküli kapcsolat"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Válassza ki a beállítani kívánt eszközt"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9874,131 +10180,130 @@ msgstr ""
 "\n"
 "A továbblépéshez nyomja meg a(z) \"%s\" gombot."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "A kapcsolat beállítása"
 
-#: 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 "Töltse ki vagy ellenőrizze az alábbi mezőket"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Kártya IRQ"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kártya DMA"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Kártya IO"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Kártya IO_0"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Kártya IO_1"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Az Ön saját telefonszáma"
 
-#: 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 "A szolgáltató neve (pl.: provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "A szolgáltató telefonszáma"
 
-#: network/netconnect.pm:294
-#, fuzzy, c-format
+#: network/netconnect.pm:303
+#, c-format
 msgid "Provider DNS 1 (optional)"
-msgstr "Elsődleges DNS-kiszolgáló (nem kötelező)"
+msgstr "Szolgáltatói DNS 1 (nem kötelező)"
 
-#: network/netconnect.pm:295
-#, fuzzy, c-format
+#: network/netconnect.pm:304
+#, c-format
 msgid "Provider DNS 2 (optional)"
-msgstr "Másodlagos DNS-kiszolgáló (nem kötelező)"
+msgstr "Szolgáltatói DNS 2 (nem kötelező)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Tárcsázási mód"
 
-#: 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 "Csatlakozási sebesség"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "A csatlakozás várakozási ideje (másodpercben)"
 
-#: 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 "Felhasználónév"
 
-#: 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 "Jelszó"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
-#, fuzzy, c-format
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
+#, c-format
 msgid "Select the network interface to configure:"
-msgstr "Hálózati csatoló kiválasztása"
+msgstr "Válassza ki a beállítandó hálózati csatolót:"
 
-#: 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 "Hálózati eszköz"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Külső ISDN-modem"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Válasszon egy eszközt"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN-beállítások"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Milyen típusú kártyával rendelkezik?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10013,34 +10318,51 @@ msgstr ""
 "\n"
 "Ha PCMCIA kártyája van, tudnia kell a kártya \"IRQ\" és \"IO\" értékeit.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Folytatás"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Megszakítás"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Milyen ISDN-kártyája van?"
 
-#: 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 ""
+"Létezik CAPI-meghajtóprogram is ehhez a modemhez. Ez a CAPI-meghajtó több "
+"lehetőséget kínál, mint az ingyenes változat (például faxküldés). Melyik "
+"meghajtót szeretné használni?"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Meghajtó"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Melyik protokollt szeretné használni?"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10049,13 +10371,13 @@ msgstr ""
 "Adja meg a szolgáltatója nevét.\n"
 "Ha az nincs benne a listában, válassza az \"Unlisted\"-et."
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
-#, fuzzy, c-format
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
+#, c-format
 msgid "Provider:"
-msgstr "Profil: "
+msgstr "Szolgáltató:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10064,122 +10386,117 @@ msgstr ""
 "Az Ön modeme nem támogatott.\n"
 "Látogasson el a következő helyre: http://www.linmodems.org"
 
-#: network/netconnect.pm:462
-#, fuzzy, c-format
+#: network/netconnect.pm:482
+#, c-format
 msgid "Select the modem to configure:"
-msgstr "Hálózati csatoló kiválasztása"
-
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Csak a 2.4-es kerneleket támogatjuk."
+msgstr "Válassza ki a beállítandó modemet:"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Válassza ki, hogy melyik soros portra csatlakozik a modeme."
 
-#: network/netconnect.pm:539
-#, fuzzy, c-format
+#: network/netconnect.pm:561
+#, c-format
 msgid "Select your provider:"
-msgstr "Válassza ki a nyomtatási rendszert"
+msgstr "Válassza ki a szolgáltatót:"
 
-#: network/netconnect.pm:568
-#, fuzzy, c-format
+#: network/netconnect.pm:589
+#, c-format
 msgid "Dialup: account options"
-msgstr "Modemes csatlakozás beállításai"
+msgstr "Telefonos kapcsolat: azonosító-beállítások"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Csatlakozás neve"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Telefonszám"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Felhasználónév"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
-#, fuzzy, c-format
+#: network/netconnect.pm:609 network/netconnect.pm:642
+#, c-format
 msgid "Dialup: IP parameters"
-msgstr "Paraméterek"
+msgstr "Telefonos kapcsolat: IP-paraméterek"
 
-#: network/netconnect.pm:591
-#, fuzzy, c-format
+#: network/netconnect.pm:612
+#, c-format
 msgid "IP parameters"
-msgstr "Paraméterek"
+msgstr "IP-paraméterek"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IP-cím"
 
-#: network/netconnect.pm:593
-#, fuzzy, c-format
+#: network/netconnect.pm:614
+#, c-format
 msgid "Subnet mask"
-msgstr "Alhálózati maszk:"
+msgstr "Alhálózati maszk"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr ""
+msgstr "Telefonos kapcsolat: DNS-paraméterek"
 
-#: network/netconnect.pm:608
-#, fuzzy, c-format
+#: network/netconnect.pm:629
+#, c-format
 msgid "DNS"
-msgstr "NIS"
+msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "Tartománynév"
 
-#: 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 "Elsődleges DNS-kiszolgáló (nem kötelező)"
 
-#: 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 "Másodlagos DNS-kiszolgáló (nem kötelező)"
 
-#: network/netconnect.pm:612
-#, fuzzy, c-format
+#: network/netconnect.pm:633
+#, c-format
 msgid "Set hostname from IP"
-msgstr "A nyomtató gépneve vagy IP-címe"
+msgstr "Gépnév beállítása IP alapján"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Átjáró (gateway)"
 
-#: network/netconnect.pm:625
-#, fuzzy, c-format
+#: network/netconnect.pm:646
+#, c-format
 msgid "Gateway IP address"
-msgstr "IP-cím"
+msgstr "Az átjáró IP-címe"
 
-#: network/netconnect.pm:649
-#, fuzzy, c-format
+#: network/netconnect.pm:677
+#, c-format
 msgid "ADSL configuration"
-msgstr "A helyi hálózat beállítása"
+msgstr "ADSL-beállítás"
 
-#: network/netconnect.pm:681
-#, fuzzy, c-format
+#: network/netconnect.pm:717
+#, c-format
 msgid "Please choose your ADSL provider"
-msgstr "Válassza ki az országot."
+msgstr "Válassza ki az ADSL-szolgáltatót"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10190,32 +10507,32 @@ msgstr ""
 "Elérhetővé teheti floppyn vagy egy windowsos partíción keresztül,\n"
 "vagy átugorhatja a lépést és megteheti később."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Floppy használata"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windowsos partíció használata"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Később"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "A firmware másolása nem sikerült - %s nevű fájl nem található."
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "A firmware másolása megtörtént"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10228,22 +10545,22 @@ msgstr ""
 "%s\n"
 "majd másolja az mgmt.o fájlt a /usr/share/speedtouch helyre."
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
-msgstr ""
+msgstr "Virtuális útvonal-azonosító (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
-msgstr ""
+msgstr "Virtuális összeköttetés (circuit)-azonosító (VCI):"
 
-#: network/netconnect.pm:800
-#, fuzzy, c-format
-msgid "Encapsulation :"
-msgstr "Titkosítási kulcs"
+#: network/netconnect.pm:853
+#, c-format
+msgid "Encapsulation:"
+msgstr "Beágyazás:"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10251,51 +10568,57 @@ msgid ""
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
+"Az ECI Hi-Focus modem a bináris meghajtóprogramra vonatkozó terjesztési\n"
+"megszorítások miatt nem támogatott.\n"
+"\n"
+"A meghajtóprogramot innen lehet letölteni: http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Meghajtóprogram kézi betöltése"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
-"Figyelmeztetés: Ez az eszköz már be lett állítva internet-hozzáféréshez.\n"
-"Elég elfogadni a már meglevő beállításokat.\n"
-"A lenti mezők módosításával felül lehet bírálni a beállításokat."
+"Figyelmeztetés: ez az eszköz már be lett állítva internet-hozzáféréshez.\n"
+"A lenti mezők módosításával felül lehet bírálni a beállításokat.\n"
+"Szeretné módosítani az eszköz beállításait?"
 
-#: 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 ""
-"Gratulálunk! A hálózat és az internet-hozzáférés beállítása befejeződött.\n"
+"Gratulálunk! A hálózat- és internetelérés beállítása befejeződött.\n"
 "\n"
 
-#: network/netconnect.pm:871
-#, fuzzy, c-format
+#: network/netconnect.pm:929
+#, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "Zeroconf gépnév"
+msgstr "Zeroconf gépnévfeloldás"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
-#, fuzzy, c-format
+#: network/netconnect.pm:930 network/netconnect.pm:963
+#, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr "A(z) %s hálózati eszköz beállítása"
+msgstr "A(z) %s hálózati eszköz beállítása (meghajtó: %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
+"A következő protokollokkal lehet beállítani Ethernet-kapcsolatot. Válassza "
+"ki, melyiket szeretné használni."
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10306,89 +10629,95 @@ msgstr ""
 "Minden mezőbe IP-címet írjon pontozott decimális formátumban\n"
 "(például: 192.169.10.11)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Gépnév a DHCP-címből"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
-msgstr "DHCP gépnév"
+msgstr "DHCP-gépnév"
 
-#: 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 "Hálózati maszk"
 
-#: 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 "A hálózati kártya azonosítójának követése (laptopoknál hasznos)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hálózati hotplugging"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Indítás rendszerbetöltésnél"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-kliens"
 
-#: 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 "Az IP-cím formátuma 1.2.3.4 legyen"
 
-#: 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 "Figyelem: a(z) %s IP-cím általában fenntartott."
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
-#, fuzzy, c-format
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s már használatban van\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#, c-format
 msgid "Please enter the wireless parameters for this card:"
-msgstr "Adja meg a gépnevet vagy az IP-címet."
+msgstr "Adja meg a vezeték nélküli elérési paramétereket a kártyához:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
-#, fuzzy, c-format
+#: network/netconnect.pm:1033 standalone/drakconnect:380
+#, c-format
 msgid "Operating Mode"
-msgstr "Szakértői mód"
+msgstr "Üzemmód"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
-msgstr ""
+msgstr "Hálózati név (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
-#, fuzzy, c-format
+#: network/netconnect.pm:1036 standalone/drakconnect:382
+#, c-format
 msgid "Network ID"
-msgstr "Hálózat"
+msgstr "Hálózati azonosító"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
-msgstr ""
+msgstr "Üzemi frekvencia"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
-msgstr ""
+msgstr "Érzékenységi küszöb"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
-msgstr ""
+msgstr "Bitráta (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 "
@@ -10397,7 +10726,7 @@ msgstr ""
 "A frekvencia k, M vagy G utótagot kaphat (például a \"2,46G\" 2,46 GHz-es "
 "frekvenciát jelöl), vagy ehelyett ki lehet írni a nullákat."
 
-#: 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 "
@@ -10406,12 +10735,12 @@ msgstr ""
 "Az átviteli sebesség k, M vagy G utótagot kaphat (például \"11M\"), vagy "
 "ehelyett ki lehet írni a nullákat."
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
-msgstr ""
+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 "
@@ -10424,34 +10753,47 @@ msgid ""
 "fixed\n"
 "or off."
 msgstr ""
+"Az RTS/CTS minden csomagátvitel előtt elvégez egy kézfogást, így\n"
+"biztosítva, hogy a csatorna tiszta legyen. Ez többletterhelést okoz,\n"
+"viszont rejtett csomópontok illetve nagyszámú aktív csomópont esetén\n"
+"növeli a teljesítményt. Ez a paraméter beállítja azt a legkisebb\n"
+"csomagméretet, amelynél még küld RTS-t a csomópont. A maximális\n"
+"csomagmérettel megegyező érték kikapcsolja az eljárást. A paraméter\n"
+"beállítható automatikusra (auto), rögzítettre (fixed) és kikapcsoltra\n"
+"(off) is."
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
-#, fuzzy, c-format
+#: network/netconnect.pm:1070 standalone/drakconnect:397
+#, c-format
 msgid "Fragmentation"
-msgstr "Játékgép"
+msgstr "Töredezés"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
-msgstr ""
+msgstr "Az Iwconfig program extra argumentumai"
 
-#: 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 ""
+"Itt beállíthatók a vezeték nélküli elérés extra paraméterei, mint például\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (a \"nick\", vagyis\n"
+"a név már be van állítva a gép nevére).\n"
+"\n"
+"További információ az iwconfig(8) kézikönyvben."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
-msgstr ""
+msgstr "Az Iwspy program extra argumentumai"
 
-#: 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"
@@ -10462,13 +10804,21 @@ msgid ""
 "\n"
 "See iwpspy(8) man page for further information."
 msgstr ""
+"Az Iwspy program funkciója vezeték nélküli hálózati csatolók\n"
+"címlistáinak beállítása és kapcsolatminőségi információk lekérdezése\n"
+"azoktól.\n"
+"\n"
+"Ez az információ megegyezik a /proc/net/wireless fájlban levővel:\n"
+"kapcsolatminőség, jelerősség és zajszint.\n"
+"\n"
+"További információ az iwspy(8) kézikönyvben."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
-msgstr ""
+msgstr "Az Iwpriv program extra argumentumai"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10485,30 +10835,19 @@ msgid ""
 "\n"
 "See iwpriv(8) man page for further information."
 msgstr ""
+"Az Iwpriv lehetővé teszi egy vezeték nélküli hálózati csatoló\n"
+"opcionális paramétereinek beállítását.\n"
+"\n"
+"Az Iwpriv meghajtónként elkülönülten kezeli a paramétereket és\n"
+"beállításokat (szemben az Iwconfig programmal, amely általános\n"
+"beállításokat kezel).\n"
+"\n"
+"Elméletileg az eszközmeghajtók dokumentációja információt tartalmaz\n"
+"a csatoló parancsainak használatáról és hatásáról.\n"
+"\n"
+"További információ az iwpriv(8) kézikönyvben."
 
-#: 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 ""
-"Ethernet hálózati kártya nem található a gépben.\n"
-"Nem lehet beállítani ezt a kapcsolattípust."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Hálózati csatoló kiválasztása"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Válassza ki, hogy melyik hálózati csatolón keresztül szeretne csatlakozni az "
-"internetre."
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10520,84 +10859,91 @@ msgstr ""
 "A teljes nevet kell beírni, például: \"mybox.mylab.myco.com\".\n"
 "Megadhatja az átjáró (gateway) IP-címét is, ha van olyan."
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "Végül, de nem utolsósorban megadhatja a DNS-kiszolgálók IP-címeit."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
-#, fuzzy, c-format
+#: network/netconnect.pm:1169 standalone/drakconnect:997
+#, c-format
 msgid "Host name (optional)"
-msgstr "Gépnév-beállítás"
+msgstr "Gépnév (nem kötelező)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Gépnév"
 
-#: network/netconnect.pm:1089
-#, fuzzy, c-format
+#: network/netconnect.pm:1171
+#, c-format
 msgid "DNS server 1"
-msgstr "DNS-kiszolgáló"
+msgstr "DNS-kiszolgáló 1"
 
-#: network/netconnect.pm:1090
-#, fuzzy, c-format
+#: network/netconnect.pm:1172
+#, c-format
 msgid "DNS server 2"
-msgstr "DNS-kiszolgáló"
+msgstr "DNS-kiszolgáló 2"
 
-#: network/netconnect.pm:1091
-#, fuzzy, c-format
+#: network/netconnect.pm:1173
+#, c-format
 msgid "DNS server 3"
-msgstr "DNS-kiszolgáló"
+msgstr "DNS-kiszolgáló 3"
 
-#: network/netconnect.pm:1092
-#, fuzzy, c-format
+#: network/netconnect.pm:1174
+#, c-format
 msgid "Search domain"
-msgstr "NIS-tartomány"
+msgstr "Keresési tartomány"
 
-#: 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 ""
+"Alapértelmezésben a keresési tartomány a teljes gépnévből lesz meghatározva"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Átjáró (például %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Átjáró-eszköz"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "A DNS-kiszolgáló címének formátuma 1.2.3.4 legyen"
 
-#: 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 "Az átjáró címének formátuma 1.2.3.4 legyen"
 
-#: 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 ""
+"Ha kívánja, megadhat egy Zeroconf-gépnevet.\n"
+"Ezen a néven fogja nyilvánosságra hozni a gép azon megosztott\n"
+"erőforrásait, amelyeket nem a hálózat kezel.\n"
+"A legtöbb hálózaton ez nem szükséges."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf gépnév"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "A Zeroconf gépnév nem tartalmazhat pontot."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10608,35 +10954,56 @@ msgstr ""
 "Válassza ki azt, amelyiket használni szeretné.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Internetkapcsolat"
 
-#: 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 "A beállítás megtörtént. Szeretné érvényre juttatni a beállításokat?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Jöjjön létre a kapcsolat a rendszer indulásakor?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Rendszerindításkor automatikusan"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "A rendszertálcán levő hálózati alkalmazással"
+
+#: network/netconnect.pm:1262
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+"Kézzel (a csatoló ebben az esetben is aktiválva lesz rendszerindításkor)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Hogyan szeretné tárcsázni ezt a kapcsolatot?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "A hálózatot újra kell indítani. Szeretné újraindítani?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Hálózatbeállítás"
 
-#: 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 ""
@@ -10644,27 +11011,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 "Kipróbáljuk az internetkapcsolatot most?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "A kapcsolat ellenőrzése..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "A rendszer internetes kapcsolata létrejött."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Biztonsági okokból a kapcsolat most lebontásra kerül."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10673,7 +11040,7 @@ msgstr ""
 "Az internetkapcsolat feltehetően nem aktív.\n"
 "Próbálja meg újból elvégezni a kapcsolat beállítását."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10682,10 +11049,10 @@ msgstr ""
 "Annak elvégzése után érdemes újraindítani az X környezetet,\n"
 "hogy a gépnév módosításából eredő problémák elkerülhetők legyenek."
 
-#: 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 ""
@@ -10693,7 +11060,7 @@ msgstr ""
 "Tesztelje le a kapcsolatot a net_monitor vagy az mcc használatával. Ha a "
 "kapcsolat nem működik, esetleg indítsa el újra a beállítást."
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10705,34 +11072,36 @@ msgstr ""
 "Kattintson az OK gombra a beállítások megtartásához, vagy a Mégsem gombra\n"
 "a hálózat és az internetkapcsolat újbóli beállításához.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
+"Váratlan hiba történt:\n"
+"%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Proxy-beállítások"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "A proxy valami ilyen kell, hogy legyen: http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Az URL-nek ftp: vagy http: kezdetűnek kell lenni"
@@ -10751,7 +11120,7 @@ msgstr ""
 "Figyelmeztetés: Már létezik egy tűzfalbeállítás. Néhány kézi módosításra "
 "szükség lehet a telepítés után."
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -10768,12 +11137,12 @@ msgstr ""
 "\t\teth0 vagy eth1 - kábeles kapcsolat esetén\n"
 "\t\tippp+ - ISDN-kapcsolat esetén\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Tegye be a floppyt"
 
-#: 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 "
@@ -10782,22 +11151,22 @@ msgstr ""
 "Tegyen egy FAT fájlrendszerre formázott floppyt a(z) \"%s\" meghajtóba - a "
 "gyökerében a(z) \"%s\" fájllal -, majd nyomja le a(z) \"%s\" gombot."
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "A floppy nem elérhető - a(z) %s eszköz csatolása nem sikerült."
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "a csatolás nem sikerült: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "A kiterjesztett (extended) partíció nem támogatott ezen a platformon"
 
-#: 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"
@@ -10808,22 +11177,22 @@ msgstr ""
 "Az egyetlen megoldás az elsődleges partíciók áthelyezése úgy, hogy\n"
 "a kiterjesztett partíciók mellé kerüljön az üres hely."
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "A(z) %s fájlból való visszaállítás sikertelen: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Hibás mentésfájl"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Hiba a(z) %s fájl írása közben"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10842,27 +11211,27 @@ msgstr ""
 # 3: "very nice"
 # 2: "nice"
 # 1: "maybe"
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "nagyon fontos"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "fontos"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "erősen ajánlott"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "ajánlott"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "opcionális"
@@ -10877,7 +11246,7 @@ msgstr "(itt: %s)"
 msgid "(on this machine)"
 msgstr "(ezen a gépen)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Beállítva más gépeken"
@@ -10887,314 +11256,324 @@ msgstr "Beállítva más gépeken"
 msgid "On CUPS server \"%s\""
 msgstr "Ezen a CUPS-kiszolgálón: \"%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 " (alapértelmezés)"
 
-#: 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 (távoli kiszolgáló)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Távoli CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Ismeretlen modell"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Helyi nyomtató"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Távoli nyomtató"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Távoli CUPS-nyomtató"
 
-#: 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 "Távoli lpd-nyomtató"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Hálózati nyomtató (TCP-/aljazat-alapú)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT-nyomtató"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "NetWare-nyomtató"
 
-#: 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 "A nyomtatóeszköz URI-ja"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "A feladat kimenetének átirányítása egy parancsba"
 
-#: 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 "Ismeretlen modell"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Beállítva ezen a gépen"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " ezen a párhuzamos porton: #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", %s. USB nyomtató"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB nyomtató"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", többfunkciós eszköz ezen a párhuzamos porton: #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", többfunkciós eszköz egy párhuzamos porton"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", többfunkciós eszköz USB-n"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", többfunkciós eszköz HP JetDirect-en"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", többfunkciós eszköz"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", nyomtatás ide: %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " ezen az LPD kiszolgálón: \"%s\", nyomtató: \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP gép: \"%s\", port: %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " ezen az SMB/Windows kiszolgálón: \"%s\", megosztás: \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " ezen a Novell kiszolgálón: \"%s\", nyomtató: \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", ezzel a paranccsal: %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Párhuzamos port: #%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 "%s. USB nyomtató"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB nyomtató"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Többfunkciós eszköz ezen a párhuzamos porton: #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Többfunkciós eszköz egy párhuzamos porton"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Többfunkciós eszköz USB-n"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Többfunkciós eszköz HP JetDirect-en"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Többfunkciós eszköz"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Nyomtatás ide: %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD kiszolgáló: \"%s\", nyomtató: \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP gép: \"%s\", port: %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows kiszolgáló: \"%s\", megosztás: \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell kiszolgáló: \"%s\", nyomtató: \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Ezzel a paranccsal: %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 "\"Nyers\" nyomtató (nincs meghajtóprogram)"
 
-#: 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 "Helyi hálózat(ok)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "\"%s\" csatoló"
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Hálózat: %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Gép: %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"
 msgstr ""
 "A HP LaserJet 1000 eszközre bekapcsolás után fel kell tölteni a megfelelő "
 "firmware-t. Töltse le a windowsos meghajtócsomagot a HP weblapjáról (a "
-"nyomtató CD-jén levő firmware nem működik), ez után bontsa ki a '.exe' fájlt "
+"nyomtató CD-jén levő firmware nem működik), ez után bontsa ki a '.exe'-fájlt "
 "az 'unzip' programmal, majd keresse meg az így létrejött fájlok között az "
 "'sihp1000.img' fájlt (firmware). Másolja ez utóbbi fájlt a '/etc/printer' "
 "könyvtárba - ott megtalálja majd az automatikus feltöltőprogram, és feltölti "
 "azt a nyomtató minden bekapcsolásakor.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPS nyomtatóbeállítás"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -11203,7 +11582,7 @@ msgstr ""
 "Itt megadható, hogy a gép nyomtatói elérhetők legyenek-e távoli gépek "
 "számára, és ha igen, akkor melyek számára."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11212,43 +11591,38 @@ msgstr ""
 "Meghatározhatja azt is, hogy a távoli gépek nyomtatói automatikusan "
 "elérhetővé legyenek-e téve ezen a gépen."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "A gép nyomtatói elérhetők más gépek számára"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "A távoli gépeken elérhető nyomtatók automatikus megkeresése"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Nyomtatómegosztás a következő gépek/hálózatok felé: "
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Egyéni beállítás"
 
-#: 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 "Nincs távoli gép"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "További CUPS-kiszolgálók: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Nincs"
-
-#: 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 "
@@ -11270,20 +11644,20 @@ msgstr ""
 "nem kötelező) ahhoz, hogy a kiszolgálók nyomtatóinformációi elérhetővé "
 "váljanak."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Japán szövegnyomtatási üzemmód"
 
-#: 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 ""
 "Ezt bekapcsolva lehetővé válik japán szövegfájlok nyomtatása. Csak akkor "
@@ -11294,12 +11668,12 @@ msgstr ""
 "egy távoli gép nyomtatójára szeretne japán szöveget nyomtatni, akkor be kell "
 "kapcsolnia ezt az opciót azon a gépen."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "A CUPS-beállítások automatikus javítása"
 
-#: 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 "
@@ -11330,12 +11704,43 @@ msgstr ""
 "Ha ezek közül valamelyik problémát okoz Önnek, akkor kapcsolja ki az opciót. "
 "Ebben az esetben viszont Önnek kell figyelnie a fenti esetekre."
 
-#: 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 "Távoli CUPS-kiszolgáló, nincs helyi CUPS-szolgáltatás"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "Bekapcsolva"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Kikapcsolva"
+
+#: 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 ""
+"Ebben az üzemmódban a helyi CUPS-szolgáltatás ki lesz kapcsolva és a "
+"nyomtatási kérések közvetlenül a lentebb megadott kiszolgálóra kerülnek. "
+"Ezen üzemmód esetében helyi nyomtatósorok létrehozása nem lehetséges, "
+"továbbá amikor a megadott kiszolgáló nem üzemel, akkor a nyomtatás nem "
+"végezhető el."
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Helyi nyomtatók megosztása"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11344,29 +11749,29 @@ msgstr ""
 "A következő gépek illetve hálózatok számára legyenek elérhetők a helyi "
 "nyomtatók:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Gép/hálózat felvétele"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "A kijelölt gép/hálózat szerkesztése"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "A kijelölt gép/hálózat eltávolítása"
 
-#: 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 "A gép/hálózat IP-címe:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11375,33 +11780,33 @@ msgstr ""
 "Válassza ki, melyik hálózat illetve gép számára legyenek elérhetővé téve a "
 "helyi nyomtatók:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "A gép/hálózat IP-címe nincs megadva."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "A géphez/hálózathoz megadott IP-cím helytelen.\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 "Példák helyesen megadott IP-címekre:\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 ""
 "Ez a gép/hálózat már szerepel a listában; nem vehető fel még egyszer.\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 "Távoli CUPS-kiszolgálókon levő nyomtatók elérése"
 
-#: 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 "
@@ -11412,104 +11817,120 @@ msgstr ""
 "szeretné. Ezt csak akkor kell megtennie, ha a kiszolgálók nem tudatják a "
 "helyi hálózat gépeivel a nyomtatóinformációikat."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Kiszolgáló felvétele"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "A kijelölt kiszolgáló szerkesztése"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "A kijelölt kiszolgáló eltávolítása"
 
-#: 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 ""
 "Adja meg azon gép IP-címét és portszámát, amelynek a nyomtatóit használni "
 "szeretné."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Ha nincs megadva port, akkor 631 lesz az alapértelmezett érték."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "A kiszolgáló IP-címe nincs megadva."
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "A megadott IP-cím helytelen.\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 "A portnak egész számnak kell lennie!"
 
-#: 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 "Ez a kiszolgáló már szerepel a listában; nem vehető fel még egyszer.\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 "Bekapcsolva; a távoli kiszolgáló neve vagy IP-címe:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "A CUPS-kiszolgáló neve/IP-címe nincs megadva."
+
+#: 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 "A nyomtatóadatok beolvasása..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "A CUPS újraindítása..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Válassza ki a nyomtató csatlakozásának típusát"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Hogyan van a nyomtató csatlakoztatva?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11520,36 +11941,41 @@ msgstr ""
 "A távoli CUPS-nyomtatókat nem kell beállítani, azokat a program "
 "automatikusan felismeri."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
 "WARNING: No local network connection active, remote printers can neither be "
 "detected nor tested!"
 msgstr ""
+"\n"
+"Figyelmeztetés: mivel nincs aktív helyi hálózati kapcsolat, ezért a távoli "
+"nyomtatók felismerése és tesztelése nem lehetséges."
 
-#: printer/printerdrake.pm:515
-#, fuzzy, c-format
+#: printer/printerdrake.pm:619
+#, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "Automatikus nyomtatófelderítés (helyi, TCP/aljazat és SMB nyomtatók)"
+msgstr ""
+"Automatikus nyomtatófelderítés (helyi, TCP/aljazat, SMB-nyomtatók és eszköz-"
+"URI)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "A rendszer ellenőrzése..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "és egy ismeretlen nyomtató"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "és %d ismeretlen nyomtató"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11561,7 +11987,7 @@ msgstr ""
 "\n"
 "%s%s"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11573,7 +11999,7 @@ msgstr ""
 "\n"
 "%s%s"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11585,7 +12011,7 @@ msgstr ""
 "\n"
 "%s%s"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11594,7 +12020,7 @@ msgstr ""
 "\n"
 "Egy ismeretlen nyomtató közvetlenül csatlakozik a géphez"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11603,18 +12029,18 @@ msgstr ""
 "\n"
 "%d ismeretlen nyomtató közvetlenül csatlakozik a géphez"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Nem található olyan nyomtató, amely a géphez közvetlenül csatlakozna."
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (csatlakoztassa az összes nyomtatót, és kapcsolja be azokat)\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 "
@@ -11623,22 +12049,22 @@ msgstr ""
 "Szeretné lehetővé tenni a nyomtatást a fenti nyomtatókon vagy a helyi "
 "hálózat nyomtatóin?\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 "Szeretné lehetővé tenni a nyomtatást a helyi hálózat nyomtatóin?\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 "Szeretné lehetővé tenni a nyomtatást a fenti nyomtatókon?\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 "Biztosan be szeretné állítani a nyomtatást ezen a gépen?\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 "
@@ -11647,48 +12073,42 @@ msgstr ""
 "Megjegyzés: a nyomtató típusától és a nyomtatási rendszertől függően akár %d "
 "MByte összméretű további szoftver is telepítésre kerülhet."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Új nyomtatók keresése..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "A nyomtató beállítása..."
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "A(z) \"%s\" nyomtató beállítása..."
+msgid "Found printer on %s..."
+msgstr "A rendszer nyomtatót talált itt: %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 " itt: "
 
-#: 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 "A nyomtató típusának kiválasztása"
 
-#: 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 "Milyen típusú a nyomtató?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11701,7 +12121,7 @@ msgstr ""
 "A PrinterDrake nem tudta meghatározni, milyen modellazonosítójú eszköz a(z) "
 "\"%s\" nyomtató. Válassza ki a megfelelő modellt a listából."
 
-#: 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 "
@@ -11711,21 +12131,24 @@ msgstr ""
 "kompatibilis nyomtatót (információk a nyomtató kézikönyvében) vagy egy "
 "hasonlót."
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
 #, c-format
-msgid "Configuring applications..."
-msgstr "Alkalmazások beállítása..."
+msgid "Configuring printer on %s..."
+msgstr "Nyomtató beállítása (hely: %s)..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "A(z) \"%s\" nyomtató beállítása..."
+
+#: 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 "Nyomtató felvétele"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11748,7 +12171,7 @@ msgstr ""
 "Hozzáférést nyújt az elérhető nyomtatómeghajtókhoz és a meghajtóprogramok "
 "beállításaihoz, továbbá a nyomtatók kapcsolattípusát is képes beállítani."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11789,7 +12212,7 @@ msgstr ""
 "A folytatáshoz kattintson a \"Következő\" gombra. Ha viszont most nem "
 "kívánja telepíteni a nyomtatókat, akkor a \"Mégsem\" gombra kattintson."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11816,7 +12239,7 @@ msgstr ""
 "A folytatáshoz kattintson a \"Következő\" gombra. Ha viszont most nem "
 "kívánja telepíteni a nyomtatókat, akkor a \"Mégsem\" gombra kattintson."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -11853,7 +12276,7 @@ msgstr ""
 "A folytatáshoz kattintson a \"Következő\" gombra. Ha viszont most nem "
 "kívánja telepíteni a nyomtatókat, akkor a \"Mégsem\" gombra kattintson."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -11880,23 +12303,23 @@ msgstr ""
 "A folytatáshoz kattintson a \"Következő\" gombra. Ha viszont most nem "
 "kívánja telepíteni a nyomtatókat, akkor a \"Mégsem\" gombra kattintson."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "A helyi nyomtatók automatikus felderítése"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "A hálózatra csatlakoztatott nyomtatók automatikus felderítése"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "A windowsos gépekre csatlakoztatott nyomtatók automatikus felderítése"
 
-#: printer/printerdrake.pm:902
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1003
+#, c-format
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -11916,74 +12339,73 @@ msgstr ""
 "\n"
 "Ha szeretne egy új nyomtatót felvenni, vagy egy meglevőt eltávolítani "
 "illetve átnevezni, vagy ha szeretné módosítani az alapértelmezés szerinti "
-"beállításokat (papírforrás, nyomtatási minőség, ...), akkor használja a "
-"Mandrake Vezérlőközpont \"Hardver\" részében található \"Nyomtató\" "
-"alkalmazást."
-
-#: 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
-#, fuzzy, c-format
+"beállításokat (papírforrás, nyomtatási minőség, ...), akkor használja a(z) %"
+"s Vezérlőközpont \"Hardver\" részében található \"Nyomtatók\" alkalmazást."
+
+#: 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 "A(z) %s csomag telepítése"
+msgstr "Nem sikerült telepíteni a(z) %s csomagokat."
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
-msgstr ""
+msgstr "Windows/SMB-kiszolgáló automatikus felismerésének kihagyása"
 
-#: 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 "Automatikus nyomtatófelderítés"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Eszközök keresése..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", hálózati nyomtató: \"%s\", port: %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", nyomtató: \"%s\" ezen az SMB/Windows kiszolgálón: \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Felismert eszköz: %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 "Nyomtató ezen a párhuzamos porton: #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Hálózati nyomtató: \"%s\", port: %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Nyomtató: \"%s\" ezen az SMB/Windows kiszolgálón: \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Helyi nyomtató"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11997,32 +12419,32 @@ msgstr ""
 "LPT2:, ...), első USB nyomtató: /dev/usb/lp0, második USB nyomtató: /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Egy eszköz- vagy fájlnevet kell megadni."
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Nyomtató nem található."
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Helyi nyomtatók"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Az elérhető nyomtatók"
 
-#: 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 "A rendszer a következő nyomtatót találta. "
 
-#: 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 "
@@ -12031,18 +12453,18 @@ msgstr ""
 "Ha nem ezt szeretné beállítani, akkor adjon meg egy eszköznevet illetve "
 "fájlnevet a beviteli sorban"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Ehelyett megadhat egy eszköznevet illetve fájlnevet a beviteli sorban"
 
-#: 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 "A rendszer a következő nyomtatókat találta. "
 
-#: 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 "
@@ -12051,7 +12473,7 @@ msgstr ""
 "Válassza ki, melyik nyomtatót szeretné beállítani, vagy adjon meg egy "
 "eszköznevet illetve fájlnevet a beviteli sorban"
 
-#: 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 "
@@ -12060,7 +12482,7 @@ msgstr ""
 "Válassza ki, melyik nyomtatóra legyenek küldve a nyomtatási feladatok, vagy "
 "adjon meg egy eszköznevet illetve fájlnevet a beviteli sorban"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12071,12 +12493,12 @@ msgstr ""
 "felismerve, vagy ha Ön szeretné módosítani annak beállításait, akkor "
 "kapcsolja be a \"Kézi beállítás\" opciót."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Jelenleg nincs alternatív lehetőség"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12089,12 +12511,12 @@ msgstr ""
 "szeretné módosítani annak beállításait, akkor kapcsolja be a \"Kézi beállítás"
 "\" opciót."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Válassza ki, melyik nyomtatóra legyenek küldve a nyomtatási feladatok."
 
-#: 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 "
@@ -12103,12 +12525,12 @@ msgstr ""
 "Válassza ki, melyik portra van csatlakoztatva a nyomtató, vagy adjon meg egy "
 "eszköznevet illetve fájlnevet a beviteli sorban"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Válassza ki, melyik portra van csatlakoztatva a nyomtató."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12118,26 +12540,26 @@ msgstr ""
 "LPT2:, ...), első USB nyomtató: /dev/usb/lp0, második USB nyomtató: /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Ki kell választania illetve meg kell adnia egy nyomtatót vagy eszközt."
 
-#: 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
-#, fuzzy, c-format
+#: 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 "Megszakítás"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Távoli lpd nyomtató beállításai"
 
-#: 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 "
@@ -12146,63 +12568,63 @@ msgstr ""
 "Távoli lpd nyomtató használatához meg kell adni a nyomtatókiszolgáló nevét "
 "és a nyomtató nevét."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "A távoli gép neve"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "A távoli nyomtató neve"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "A távoli gép neve nem lehet üres!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "A távoli nyomtató neve nem lehet üres!"
 
-#: 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 "Információ"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Felismert modell: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "A hálózat vizsgálata..."
 
-#: 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 ", nyomtató: \"%s\" ezen a kiszolgálón: \"%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 "Nyomtató: \"%s\" ezen a kiszolgálón: \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) nyomtatási beállítások"
 
-#: 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 "
@@ -12215,7 +12637,7 @@ msgstr ""
 "gépnév!) és IP-címét, a megosztott nyomtató nevét, és egy megfelelő "
 "jogosultságokkal rendelkező felhasználó nevét, jelszavát és munkacsoportját."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12224,47 +12646,47 @@ msgstr ""
 " Ha a kívánt nyomtató fel lett ismerve, válassza ki a listából. Ha "
 "szükséges, adja meg a felhasználónevet, a jelszót és/vagy a munkacsoportot."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Az SMB-kiszolgáló neve"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "Az SMB-kiszolgáló IP-címe"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Megosztásnév"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Munkacsoport"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Automatikusan felderítve"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "A kiszolgáló nevét vagy IP-címét meg kell adni!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "A Samba megosztásnév üres!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "BIZTONSÁGI FIGYELMEZTETÉS"
 
-#: 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 "
@@ -12308,7 +12730,7 @@ msgstr ""
 "nyomtatást \"%s\" kapcsolattípussal a PrinterDrake programban.\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 "
@@ -12321,7 +12743,7 @@ msgstr ""
 "nyomtatást \"%s\" kapcsolattípussal a PrinterDrake programban.\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) "
@@ -12334,12 +12756,12 @@ msgstr ""
 "\n"
 "Valóban folytatni szeretné a nyomtató ilyen módon történő beállítását?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare nyomtatóbeállítások"
 
-#: 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 "
@@ -12352,42 +12774,42 @@ msgstr ""
 "gépnévvel!), a nyomtatási sor nevét, és egy megfelelő jogosultságokkal "
 "rendelkező felhasználói nevet és jelszót."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Nyomtatókiszolgáló"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "A nyomtatási sor neve"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Az NCP-kiszolgáló neve üres!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Az NCP-sor neve üres!"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", gép: \"%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 "Gép: \"%s\", port: %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP-/aljazat-alapú nyomtatási beállítások"
 
-#: 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 "
@@ -12397,7 +12819,7 @@ msgstr ""
 "gépnevet vagy IP-címet és az opcionális portszámot (alapértelmezés: 9100) a "
 "megfelelő mezőkben."
 
-#: 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 "
@@ -12411,27 +12833,27 @@ msgstr ""
 "9100; más kiszolgálókon ez más érték lehet. A hardver kézikönyvében "
 "valószínűleg talál további információt."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "A nyomtató gépneve illetve IP-címe üres."
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "A nyomtató gépneve vagy IP-címe"
 
-#: printer/printerdrake.pm:1704
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1819
+#, c-format
 msgid "Refreshing Device URI list..."
-msgstr "A nyomtatóadatok frissítése..."
+msgstr "Az eszközök URI-listájának frissítése..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "A nyomtatóeszköz URI-ja"
 
-#: 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 "
@@ -12442,17 +12864,17 @@ msgstr ""
 "felelnie a CUPS vagy a Foomatic előírásainak. Nem minden URI-típust támogat "
 "minden sorkezelő."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Érvényes URI-t kell megadni."
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Átirányítás egy parancsba"
 
-#: 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 "
@@ -12462,17 +12884,17 @@ msgstr ""
 "lesz küldve (ahelyett, hogy közvetlenül egy nyomtatóra lenne küldve)."
 
 # Pipe into command
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Parancs"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Meg kell adni egy parancsot."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12483,74 +12905,74 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 lapolvasóval, DeskJet 450, Sony IJP-V100), "
 "egy HP PhotoSmart vagy egy HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "A HPOJ csomag telepítése..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
-msgstr ""
+msgstr "A(z) %s eszközön csak nyomtatás lesz lehetséges."
 
-#: 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 "Az eszköz ellenőrzése és a HPOJ beállítása..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "A SANE csomagok telepítése..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
-msgstr ""
+msgstr "A(z) %s eszközön lapolvasás nem lesz lehetséges."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Az mtools csomagok telepítése..."
 
-#: printer/printerdrake.pm:1990
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2113
+#, c-format
 msgid "Photo memory card access on the %s will not be possible."
-msgstr "Fotókártya-elérés a HP többfunkciós eszközön"
+msgstr "A(z) %s eszközön fotókártya-elérés nem lesz lehetséges."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Lapolvasás a HP többfunkciós eszközön"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Fotókártya-elérés a HP többfunkciós eszközön"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "A nyomtatási port elérhetővé tétele a CUPS számára..."
 
-#: 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 "A nyomtató-adatbázis beolvasása..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Adja meg a nyomtatónevet és a megjegyzéseket"
 
-#: 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 ""
 "A nyomtató nevében csak angol betű, számjegy és az aláhúzás szerepelhet."
 
-#: 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"
@@ -12559,7 +12981,7 @@ msgstr ""
 "\"%s\" nevű nyomtató már létezik,\n"
 "felül szeretné írni annak beállításait?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12568,35 +12990,35 @@ msgstr ""
 "Minden nyomtatóhoz meg kell adni egy nevet (például: \"nyomtató\"). A Leírás "
 "és Hely mezőket nem kötelező kitölteni, csak tájékoztatási célt szolgálnak."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "A nyomtató neve"
 
-#: 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 "Leírás"
 
-#: 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 "Hely"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "A nyomtató-adatbázis előkészítése..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "A nyomtató típusa"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12622,18 +13044,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "A típus megfelelő"
 
-#: 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 "Típuskiválasztás kézzel"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12648,104 +13070,107 @@ msgstr ""
 "típusát. Ha egy nem megfelelő típus vagy a \"Nyers nyomtató\" bejegyzés van "
 "kijelölve, akkor keresse meg a megfelelő típust a listában."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
-msgstr ""
+msgstr "Gyártó által biztosított PPD-fájl telepítése"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
+"Minden PostScript-nyomtatóval szállítanak egy PPD-fájlt, amely leírja a "
+"nyomtató lehetőségeit és képességeit."
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
+"Ez a fájl általában a nyomtatóval szállított windowsos és macintoshos "
+"meghajtóprogramok lemezén van."
 
-#: 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 ""
+msgstr "A PPD-fájlok megtalálhatók a gyártó weboldalán is."
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
+"Ha van a gépen Windows telepítve, akkor a PPD-fájl megtalálható a windowsos "
+"partíción is."
 
-#: 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 "
 "makes all options of the printer available which are provided by the "
 "printer's hardware"
 msgstr ""
+"A nyomtató PPD-fájlját telepítve és azt a nyomtató beállításánál "
+"felhasználva elérhetővé válik a nyomtató által kínált összes lehetőség."
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
+"Itt kiválaszthatja a telepítendő PPD-fájlt, amely majd a nyomtató "
+"beállításához lesz felhasználva."
 
-#: printer/printerdrake.pm:2529
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2650
+#, c-format
 msgid "Install PPD file from"
-msgstr "RPM csomag telepítése"
+msgstr "PPD-fájl telepítése innen:"
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, fuzzy, 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
-#, fuzzy, c-format
+#: 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 "Floppy"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
-#, fuzzy, c-format
+#: 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 "Egyéb portok"
+msgstr "Egyéb hely"
 
-#: printer/printerdrake.pm:2548
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2669
+#, c-format
 msgid "Select PPD file"
-msgstr "Fájlválasztás"
+msgstr "PPD-fájl kiválasztása"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
-msgstr ""
+msgstr "\"%s\" nevű fájl nem létezik, vagy a fájl nem olvasható."
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
-msgstr ""
+msgstr "A(z) \"%s\" fájl nem felel meg a PPD-előírásoknak."
 
-#: printer/printerdrake.pm:2569
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2690
+#, c-format
 msgid "Installing PPD file..."
-msgstr "%s telepítése..."
+msgstr "PPD-fájl telepítése..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI windowsos nyomtató beállítása"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12763,12 +13188,12 @@ msgstr ""
 "nyomtatna - máskülönben a nyomtató nem fog működni. A kapcsolattípus-"
 "beállítást a meghajtóprogram figyelmen kívül hagyja."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark tintasugaras nyomtató beállítása"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12781,7 +13206,7 @@ msgstr ""
 "levőket nem. Csatlakoztassa a nyomtatót egy helyi portra, vagy állítsa azt "
 "be azon a gépen, amelyhez az csatlakoztatva van."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12804,30 +13229,54 @@ msgstr ""
 "\"lexmarkmaintain\"-nel, és szükség esetén módosítsa a fej-igazítási "
 "beállításokat ezzel a programmal."
 
-#: printer/printerdrake.pm:2746
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2874
+#, c-format
 msgid "Lexmark X125 configuration"
-msgstr "Lexmark tintasugaras nyomtató beállítása"
+msgstr "Lexmark X125 beállítása"
 
-#: printer/printerdrake.pm:2747
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2875
+#, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
 "USB, no printers on remote machines or print server boxes. Please connect "
 "your printer to a local USB port or configure it on the machine where it is "
 "connected to."
 msgstr ""
-"A Lexmark által biztosított tintasugarasnyomtató-meghajtóprogramok csak "
-"helyi nyomtatókat támogatnak, tehát távoli gépen vagy nyomtatókiszolgálón "
-"levőket nem. Csatlakoztassa a nyomtatót egy helyi portra, vagy állítsa azt "
-"be azon a gépen, amelyhez az csatlakoztatva van."
+"A nyomtató meghajtóprogramja csak helyi USB-s nyomtatókat támogat, tehát "
+"távoli gépen vagy nyomtatókiszolgálón levőket nem. Csatlakoztassa a "
+"nyomtatót egy helyi USB-portra, vagy állítsa azt be azon a gépen, amelyhez "
+"az csatlakoztatva van."
+
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G beállítása"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"A nyomtató meghajtóprogramja csak helyileg, az első párhuzamos portra "
+"csatlakoztatott nyomtatókat támogat, tehát távoli gépen vagy "
+"nyomtatókiszolgálón levőket illetve más porton levőket nem. Csatlakoztassa a "
+"nyomtatót az első párhuzamos portra, vagy állítsa azt be azon a gépen, "
+"amelyhez az csatlakoztatva van."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660 beállítása"
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Firmware-feltöltés a HP LaserJet 1000-hez"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12845,27 +13294,27 @@ msgstr ""
 "nyomtatási minőséget nagyon magasra állítja, akkor a nyomtatási idő "
 "jelentősen megnőhet."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Alapértelmezett nyomtatóbeállítások"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "A(z) %s értéknek egész számnak kell lennie."
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "A(z) %s értéknek számnak kell lennie!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "A(z) %s érték nem esik a megfelelő tartományba!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12874,12 +13323,12 @@ msgstr ""
 "Be szeretné állítani a(z) \"%s\"\n"
 "nyomtatót alapértelmezettnek?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Tesztoldalak"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12892,57 +13341,57 @@ msgstr ""
 "kevés memóriával ellátott lézernyomtatókon el sem fog készülni. Általában "
 "elég a normál tesztoldalt kinyomtatni."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Nem kell tesztoldal"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Normál tesztoldal"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Másféle tesztoldal (Letter)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Másféle tesztoldal (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Fényképes tesztoldal"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Ne nyomtasson tesztoldalt"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "A tesztoldal(ak) nyomtatása folyik..."
 
-#: printer/printerdrake.pm:3150
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3331
+#, c-format
 msgid "Could not install the %s package!"
-msgstr "A(z) %s csomag telepítése"
+msgstr "Nem sikerült telepíteni a(z) %s csomagot."
 
-#: printer/printerdrake.pm:3152
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3333
+#, c-format
 msgid "Skipping photo test page."
-msgstr "Fényképes tesztoldal"
+msgstr "Fényképes tesztoldal kihagyása."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12957,7 +13406,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12966,17 +13415,17 @@ msgstr ""
 "A tesztoldal(aka)t elküldtem a nyomtatóra.\n"
 "Eltarthat egy ideig, amíg a nyomtatás elindul.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Sikerült a nyomtatás?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "\"Nyers\" nyomtató"
 
-#: 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 "
@@ -12990,7 +13439,7 @@ msgstr ""
 "eszközök lehetővé teszik a nyomtató kijelölését és a beállítások egyszerű "
 "módosítását.\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 "
@@ -13001,8 +13450,8 @@ msgstr ""
 "párbeszédablakában is (a nyomtatási parancsot megadó mezőben), de ott ne "
 "adjon meg fájlnevet, mert a fájlt az alkalmazás fogja biztosítani.\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"
@@ -13015,7 +13464,7 @@ msgstr ""
 "bizonyos nyomtatási feladatra vonatkozóan. Egyszerűen adja hozzá a kívánt "
 "paramétereket a parancshoz, például: \"%s <fájl>\". "
 
-#: 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 "
@@ -13027,7 +13476,7 @@ msgstr ""
 "listája\" gombra.%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"
@@ -13036,7 +13485,7 @@ msgstr ""
 "Itt láthatók az aktuális nyomtató nyomtatási opciói:\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 "
@@ -13045,8 +13494,8 @@ msgstr ""
 "Egy fájl parancssorból (terminálablakból) való nyomtatásához használja a "
 "következő parancsot: \"%s <fájl>\".\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 "
@@ -13057,7 +13506,7 @@ msgstr ""
 "is (a nyomtatási parancsot megadó mezőben), de ott ne adjon meg fájlnevet, "
 "mert a fájlt az alkalmazás fogja biztosítani.\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 "
@@ -13066,7 +13515,7 @@ msgstr ""
 "Ha szeretne egy listát az aktuális nyomtatóhoz használható opciókról, akkor "
 "kattintson a \"Nyomtatási beállítások listája\" gombra."
 
-#: 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 "
@@ -13075,7 +13524,7 @@ msgstr ""
 "Egy fájl parancssorból (terminálablakból) való nyomtatásához használja a "
 "következő parancsot: \"%s <fájl>\" vagy ezt: \"%s <fájl>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13092,7 +13541,7 @@ msgstr ""
 "munkaasztalon, amellyel azonnali jelleggel leállítható az összes nyomtatási "
 "feladat. Ez például papírberagadás esetén hasznos.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13105,42 +13554,32 @@ msgstr ""
 "feladat beállításainak módosítását is. Adja hozzá a kívánt beállításokat a "
 "parancshoz, például: \"%s <fájl>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Nyomtatás/lapolvasás/fotókártyák ezen: \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Nyomtatás/lapolvasás ezen: \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Nyomtatás/fotókártya-hozzáférés ezen: \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Nyomtatás a(z) \"%s\" nyomtatóra"
 
-#: 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 "Bezárás"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Nyomtatási beállítások listája"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13151,7 +13590,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 ""
 "Az Ön többfunkciós eszközén automatikusan be lett állítva a lapolvasás. "
 "Lapolvasást parancssorból a \"scanimage\" programmal végezhet (\"scanimage -"
@@ -13161,9 +13602,11 @@ msgstr ""
 "végezhet lapolvasást. További információkat a \"man scanimage\" parancsnak a "
 "parancssorban való kiadásával szerezhet.\n"
 "\n"
-"Ehhez az eszközhöz ne használja a \"scannerdrake\" programot!"
+"A lapolvasásnak ezen az eszközön való beállításához nincs szükség a "
+"\"scannerdrake\" programra. Az említett programra csak abban az esetben van "
+"szükség, ha meg szeretné osztani a lapolvasót a hálózaton."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13187,18 +13630,13 @@ msgstr ""
 "további meghajtókhoz felhasználva. Az \"MtoolsFM\" programban a fájllisták "
 "jobb felső sarkában levő mező használatával lehet váltani a meghajtók közt."
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "A nyomtatóadatok beolvasása..."
-
-#: 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 "A nyomtatóbeállítások átvitele"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13213,7 +13651,7 @@ msgstr ""
 "de a nyomtatási feladatok nem kerülnek át.\n"
 "A következő okok miatt nem minden nyomtatási sor vihető át:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13222,7 +13660,7 @@ msgstr ""
 "A CUPS nem támogatja a Novell-alapú és a kötetlen parancsformátumú "
 "nyomtatókat.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13231,12 +13669,12 @@ msgstr ""
 "A PDQ csak a helyi nyomtatókat, a távoli LPD-nyomtatókat és az aljazat-/TCP-"
 "alapú nyomtatókat támogatja.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "Az LPD és az LPRng nem támogatja az IPP-nyomtatókat.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13245,7 +13683,7 @@ msgstr ""
 "Nem vihetők át azon nyomtatási sorok, amelyek nem ezzel a programmal és nem "
 "a \"foomatic-configure\"-rel készültek."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13253,10 +13691,10 @@ msgid ""
 "or with native CUPS drivers cannot be transferred."
 msgstr ""
 "\n"
-"Továbbá a gyártó által adott PPD fájlokkal beállított nyomtatók és a "
+"Továbbá a gyártó által adott PPD-fájlokkal beállított nyomtatók és a "
 "közvetlen CUPS-meghajtóval ellátott nyomtatók beállításai nem vihetők át."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13267,17 +13705,17 @@ msgstr ""
 "Jelölje ki az átviendő nyomtatókat, majd kattintson az \n"
 "\"Átvitel\" gombra."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Az átvitel kihagyása"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Átvitel"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13288,17 +13726,17 @@ msgstr ""
 "Kattintson az \"Átvitel\" gombra annak felülírásához.\n"
 "Esetleg adjon meg egy másik nevet vagy hagyja ki a nyomtatót."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Új nyomtatónév"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s átvitele..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13307,28 +13745,28 @@ msgstr ""
 "A korábbi alapértelmezett nyomtató (\"%s\") beállításai átvitelre kerültek. "
 "Az új %s nyomtatási rendszerben is ez legyen az alapértelmezett nyomtató?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "A nyomtatóadatok frissítése..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "A hálózat elindítása..."
 
-#: 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 "Hálózat beállítása most"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Hálózati funkciók nincsenek beállítva"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13341,13 +13779,13 @@ msgstr ""
 "hálózat beállítása nélkül, akkor nem lesz lehetősége a most beállítandó "
 "nyomtató használatára. Mit szeretne tenni?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Folytatás a hálózat beállítása nélkül"
 
-#: printer/printerdrake.pm:3547
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3735
+#, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network is accessible after booting your "
@@ -13355,13 +13793,13 @@ msgid ""
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
-"A telepítés közben végezhető hálózatbeállítás nem indítható el. A gép "
+"A telepítés közben végzett beállítással nem indítható el a hálózat. A gép "
 "újraindítása után vizsgálja meg, hogy a hálózat elérhető-e, és javítsa ki a "
-"beállításokat a Mandrake Vezérlőközpont \"Hálózat és internet\"/\"Kapcsolat"
-"\" részében, azután állítsa be a nyomtatót a Mandrake Vezérlőközpont "
-"\"Hardver\"/\"Nyomtató\" részében."
+"beállításokat a(z) %s Vezérlőközpont \"Hálózat és internet\"/\"Kapcsolatok "
+"kezelése\" részében, majd állítsa be a nyomtatót a(z) %s Vezérlőközpont "
+"\"Hardver\"/\"Nyomtatók\" részében."
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13372,27 +13810,27 @@ msgstr ""
 "Ellenőrizze a beállításokat és a hardvert, majd próbálkozzon újra a távoli "
 "nyomtató beállításával."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "A nyomtatási rendszer újraindítása..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "magas"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranoiás"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Nyomtatórendszer telepítése a következő biztonsági szinten: %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 %"
@@ -13417,12 +13855,12 @@ msgstr ""
 "\n"
 "Biztos abban, hogy be szeretne állítani nyomtatást ezen a gépen?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "A nyomtatási rendszer elindítása a rendszer indulásakor"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13444,69 +13882,172 @@ msgstr ""
 "\n"
 "Szeretné a nyomtatási rendszer automatikus indítását ismét bekapcsolni?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "A telepített szoftverek ellenőrzése..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "%s eltávolítása..."
 
-#: printer/printerdrake.pm:3665
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3847
+#, c-format
 msgid "Could not remove the %s printing system!"
-msgstr "Nyomtatási rendszer módosítása"
+msgstr "Nem sikerült eltávolítani a(z) %s nyomtatási rendszert."
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "%s telepítése..."
 
-#: printer/printerdrake.pm:3678
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3867
+#, c-format
 msgid "Could not install the %s printing system!"
-msgstr "Nyomtatási rendszer módosítása"
+msgstr "Nem sikerült telepíteni a(z) %s nyomtatási rendszert."
+
+#: 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 ""
+"Ebben az üzemmódban nincs helyi nyomtatási rendszer - a nyomtatási kérések "
+"közvetlenül a lentebb megadott kiszolgálóra kerülnek. Ezen üzemmód esetében "
+"helyi nyomtatósorok létrehozása nem lehetséges, továbbá amikor a megadott "
+"kiszolgáló nem üzemel, akkor a nyomtatás nem végezhető el."
+
+#: 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 ""
+"Ha szeretné használni ezt a módot, akkor adja meg a CUPS-kiszolgáló gépnevét "
+"vagy IP-címét, majd kattintson az \"OK\" gombra. Egyéb esetben kattintson a "
+"\"Kilépés\" gombra."
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "A távoli kiszolgáló neve vagy IP-címe:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Az alapértelmezett nyomtató beállítása..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Helyi CUPS nyomtatási rendszer vagy távoli CUPS-kiszolgáló?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "A CUPS nyomtatási rendszer kétféle módon használható: "
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. A CUPS nyomtatási rendszer futhat helyileg. "
+
+#: 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 ""
+"Ekkor a helyileg csatlakoztatott nyomtatók is használhatók és a távoli, a "
+"hálózat más CUPS-kiszolgálóin levő nyomtatókat is automatikusan felismeri a "
+"rendszer."
+
+#: 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 ""
+"Ennek a megközelítésnek az a hátránya, hogy a helyi gépen nagyobb az "
+"erőforrásigény: további szoftvercsomagokat kell telepíteni, a CUPS-"
+"szolgáltatásnak futnia kell a háttérben és memóriát is igényel, továbbá az "
+"IPP-port (631-es port) meg van nyitva. "
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr "2. Az összes nyomtatási kérés egy távoli CUPS-kiszolgálóra kerül. "
+
+#: 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 ""
+"Ebben az esetben a helyi erőforrásigény minimális. Nem fut CUPS-"
+"szolgáltatás, nincs megnyitott port, nincs szükség a helyi nyomtatósorok "
+"kezelésére szolgáló plusz szoftverre, vagyis kisebb memória- és lemezterület "
+"kerül felhasználásra. "
+
+#: 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 ""
+"A hátrány az, hogy ekkor nem lehet helyi nyomtatót létrehozni, továbbá "
+"amikor a megadott kiszolgáló nem üzemel, akkor a nyomtatás nem végezhető el."
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "Hogyan legyen beállítva a CUPS ezen a gépen?"
+
+#: 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 "Távoli kiszolgáló - adja meg a nevet vagy az IP-címet:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Helyi CUPS nyomtatási rendszer"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Válassza ki a nyomtatási rendszert"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Melyik nyomtatási rendszert (sorkezelőt) szeretné használni?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "A(z) \"%s\" nyomtató beállítása nem sikerült."
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "A Foomatic telepítése..."
 
-#: printer/printerdrake.pm:3818
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4124
+#, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
-"Nem sikerült telepíteni a lapolvasó(k) megosztásához szükséges csomagokat."
-
-#: printer/printerdrake.pm:3910
-#, fuzzy, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Nem sikerült telepíteni a lapolvasó-beállításhoz szükséges csomagokat."
+"Nem sikerült telepíteni a(z) %s csomagokat, ezért a(z) %s nem indítható."
 
-#: printer/printerdrake.pm:4011
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4314
+#, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
@@ -13516,196 +14057,161 @@ msgstr ""
 "módosításához, egy nyomtató alapértelmezetté tételéhez vagy az adatainak a "
 "lekérdezéséhez kattintson duplán a megfelelő nyomtatóra."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Az elérhető távoli CUPS-nyomtatók megjelenítése"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Nyomtatók listájának frissítése (az összes elérhető távoli CUPS-nyomtató "
 "megjelenítése érdekében)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS-beállítások"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Nyomtatási rendszer módosítása"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Normál mód"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Szakértői mód"
 
-#: 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 "Nyomtatóbeállítások"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "A nyomtatóbeállítás módosítása"
 
-#: 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 ""
-"Nyomtató: %s\n"
+"Nyomtató: %s%s\n"
 "Mit szeretne megváltoztatni ennél a nyomtatónál?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Ez a nyomtató le van tiltva"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Mehet!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "A nyomtató kapcsolódási típusa"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Nyomtatónév, leírás, hely"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "A nyomtató gyártója, típusa, meghajtóprogramja"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "A nyomtató gyártója, típusa"
 
-#: 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 "Legyen ez a nyomtató az alapértelmezett"
 
-#: 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 "A nyomtató felvétele a StarOffice/OpenOffice.org/GIMP programba"
+msgid "Enable Printer"
+msgstr "A nyomtató engedélyezése"
 
-#: 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 "A nyomtató eltávolítása a StarOffice/OpenOffice.org/GIMP programból"
+msgid "Disable Printer"
+msgstr "A nyomtató letiltása"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Tesztoldalak nyomtatása"
 
-#: 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 "Információ a nyomtató használatáról"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Nyomtató eltávolítása"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "A régi \"%s\" nyomtató eltávolítása..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "A nyomtató felvétele a StarOffice/OpenOffice.org/GIMP programba"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"A(z) \"%s\" nyomtató sikeresen fel lett véve a StarOffice/OpenOffice.org/"
-"GIMP programba."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"A(z) \"%s\" nyomtatót nem sikerült felvenni a StarOffice/OpenOffice.org/GIMP "
-"programba."
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "A nyomtató eltávolítása a StarOffice/OpenOffice.org/GIMP programból"
+msgid "Printer \"%s\" is now enabled."
+msgstr "A(z) \"%s\" nyomtató engedélyezése megtörtént."
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"A(z) \"%s\" nyomtató sikeresen el lett távolítva a StarOffice/OpenOffice.org/"
-"GIMP programból."
+msgid "Printer \"%s\" is now disabled."
+msgstr "A(z) \"%s\" nyomtató letiltása megtörtént."
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"A(z) \"%s\" nyomtatót nem sikerült eltávolítani a StarOffice/OpenOffice.org/"
-"GIMP programból."
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Biztosan el szeretné távolítani a(z) \"%s\" nyomtatót?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "A(z) \"%s\" nyomtató eltávolítása..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Az alapértelmezett nyomtató"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "A(z) \"%s\" nyomtató lesz ezután az alapértelmezett nyomtató."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Nem lehet partíciót felvenni a _formázott_ RAID md%d eszközön"
-
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "Az mkraid végrehajtása nem sikerült (talán hiányzik a raidtools?)"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "Nem lehet partíciót felvenni a _formázott_ RAID %s eszközön"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid sikertelen"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Nincs elég partíció a RAID %d szinthez\n"
@@ -13713,42 +14219,43 @@ msgstr "Nincs elég partíció a RAID %d szinthez\n"
 #: scanner.pm:96
 #, c-format
 msgid "Could not create directory /usr/share/sane/firmware!"
-msgstr ""
+msgstr "Nem sikerült létrehozni /usr/share/sane/firmware nevű könyvtárt."
 
 #: scanner.pm:107
 #, c-format
 msgid "Could not create link /usr/share/sane/%s!"
-msgstr ""
+msgstr "Nem sikerült létrehozni /usr/share/sane/%s nevű linket."
 
 #: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
+"Nem sikerült a(z) %s firmware-fájlt átmásolni ide: /usr/share/sane/firmware"
 
 #: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
-msgstr ""
+msgstr "Nem sikerült beállítani a(z) %s firmware-fájl jogosultságait."
 
-#: 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 ""
 "Nem sikerült telepíteni a lapolvasó(k) megosztásához szükséges csomagokat."
 
 #: scanner.pm:202
-#, fuzzy, c-format
+#, c-format
 msgid "Your scanner(s) will not be available for non-root users."
-msgstr "A lapolvasó(k) nem lesz(nek) elérhető(k) a hálózaton."
+msgstr "A lapolvasó(k) csak a rendszergazdák számára lesz(nek) elérhető(k)."
 
 #: security/help.pm:11
 #, c-format
@@ -13770,7 +14277,8 @@ msgstr "ICMP Echo elfogadása/elutasítása"
 msgid "Allow/Forbid autologin."
 msgstr "Automatikus bejelentkezés engedélyezése/letiltása"
 
-#: 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"
@@ -13785,22 +14293,22 @@ msgstr ""
 "\n"
 "Egyéb esetekben pedig csak a /etc/issue fájl engedélyezett."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Újraindítás engedélyezése/letiltása konzolfelhasználók számára"
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Távoli rendszergazdai bejelentkezés engedélyezése/letiltása"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Közvetlen rendszergazdai bejelentkezés engedélyezése/letiltása"
 
-#: 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 "
@@ -13809,7 +14317,20 @@ msgstr ""
 "A felhasználólista megjelenítésének engedélyezése/letiltása a\n"
 "bejelentkezéskezelőkben (KDM és 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 ""
+"A képernyő exportálásának engedélyezése/letiltása a\n"
+"rendszergazdai azonosítóról egy másikra való átlépéskor.\n"
+"\n"
+"További részletek: pam_xauth(8)."
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13828,7 +14349,7 @@ msgstr ""
 "\n"
 "- NONE érték esetén semmilyen kapcsolat nincs engedélyezve"
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -13837,7 +14358,8 @@ msgstr ""
 "Az argumentum megadja, hogy a klienseknek lehetőségük legyen-e kapcsolódni\n"
 "az X kiszolgálóhoz a hálózatról a 6000-es TCP porton vagy sem"
 
-#: 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"
@@ -13864,7 +14386,7 @@ msgstr ""
 "A szükséges szolgáltatások engedélyezése a /etc/hosts.allow fájl\n"
 "használatával végezhető (információ a hosts.allow(5) leírásban)."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13885,7 +14407,7 @@ msgstr ""
 "annak eldöntéséhez, hogy csomagtelepítéskor fel kell-e venni egy\n"
 "szolgáltatást (az alapján, hogy szerepel-e a fájlban)."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -13901,22 +14423,27 @@ msgstr ""
 "(1)\n"
 "leírásban)."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "A 12-es konzolra történő rendszernaplózás bekapcsolása/kikapcsolása"
 
-#: 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 ""
 "A 'DNS spoofing' (a névfeloldásnak az eredetitől eltérő rendszerrel való\n"
-"végeztetése) elleni védelem bekapcsolása/kikapcsolása. Ha az \"alert\"\n"
+"végeztetése) elleni védelem bekapcsolása/kikapcsolása. Ha az \"%s\"\n"
 "érték igazra van állítva, akkor a rendszernaplóba is ír."
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Biztonsági figyelmeztetések:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
@@ -13924,24 +14451,24 @@ msgstr ""
 "védelem\n"
 "bekapcsolása/kikapcsolása"
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 "A libsafe bekapcsolása/kikapcsolása, amennyiben megtalálható a rendszeren"
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 "A szokásostól eltérő IPv4-csomagok naplózásának bekapcsolása/kikapcsolása"
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Az msec óránkénti biztonsági ellenőrzéseinek bekapcsolása/kikapcsolása"
 
-#: 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."
@@ -13950,49 +14477,49 @@ msgstr ""
 "csoport tagjainak számára legyen lehetséges, vagy pedig bármely felhasználó\n"
 "számára"
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Jelszó használata a felhasználók azonosításához"
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 "Az Ethernet-kártyák 'promiscuous' (minden csomagot megtartó) üzemmódjának\n"
 "ellenőrzésének bekapcsolása/kikapcsolása"
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr "A napi biztonsági ellenőrzés bekapcsolása/kikapcsolása"
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr "Az sulogin(8) engedélyezése/letiltása egyfelhasználós szinten"
 
-#: 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 ""
 "Az adott név felvétele az msec-féle jelszóelévülés-kezelés alóli kivételként"
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "A jelszó élettartamának beállítása \"max\" napra és a módosítási haladék\n"
 "beállítása az \"inactive\" értékre"
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 "A jelszótörténeti lista méretének beállítása a jelszavak újrahasználásának\n"
 "megakadályozására"
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14001,20 +14528,20 @@ msgstr ""
 "A minimális jelszóhossz és a számjegyek illetve a nagybetűk minimális\n"
 "számának beállítása"
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "A rendszergazdához tartozó umask-érték beállítása"
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "Ha igenre van állítva: nyitott portok ellenőrzése"
 
-#: 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"
@@ -14030,7 +14557,7 @@ msgstr ""
 "\n"
 "- létezik-e a rendszergazdán kívül 0 azonosítójú felhasználó"
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
@@ -14039,61 +14566,62 @@ msgstr ""
 
 # prom. üzemmód: az eszköz nem csak a neki szóló csomagokat teszi be
 #  a pufferébe, hanem a más eszközöknek szólókat is
-#: 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 ""
 "Ha igenre van állítva: ellenőrzés, hogy a hálózati eszközök 'promiscuous'\n"
 "(minden csomagot megtartó) üzemmódban vannak-e"
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "Ha igenre van állítva: a napi biztonsági ellenőrzések végrehajtása"
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
-"Ha igenre van állítva: SGID fájlok létrehozásának/törlésének ellenőrzése"
+"Ha igenre van állítva: SGID-s fájlok létrehozásának/törlésének ellenőrzése"
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr ""
 "Ha igenre van állítva: ellenőrzés, hogy létezik-e üres jelszó a /etc/shadow\n"
 "fájlban"
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
-"Ha igenre van állítva: az SUID/SGID fájlok ellenőrzőösszegének ellenőrzése"
+"Ha igenre van állítva: az SUID-s/SGID-s fájlok ellenőrzőösszegének "
+"ellenőrzése"
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
-"Ha igenre van állítva: 'SUID root' fájlok létrehozásának/törlésének "
+"Ha igenre van állítva: 'SUID root'-os fájlok létrehozásának/törlésének "
 "ellenőrzése"
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "Ha igenre van állítva: figyelmeztetés a tulajdonos nélküli fájlokra"
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 "Ha igenre van állítva: a mindenki által írható fájlok/könyvtárak ellenőrzése"
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "Ha igenre van állítva: chkrootkit ellenőrzések elvégzése"
 
-#: 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."
@@ -14101,52 +14629,52 @@ msgstr ""
 "Ha be van állítva: a jelentés ezen email-címre való küldése; máskülönben a\n"
 "rendszergazdának"
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "Ha igenre van állítva: az ellenőrzés eredményének elküldése levélben"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
-msgstr ""
+msgstr "Levélküldés mellőzése, ha nincs mire figyelmeztetni"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr "Ha igenre van állítva: ellenőrzések elvégzése az RPM-adatbázison"
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 "Ha igenre van állítva: az ellenőrzés eredményének írása a rendszernaplóba"
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "Ha igenre van állítva: az ellenőrzés eredményének kiírása a konzolra"
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "A parancsértelmező parancstörténeti listájának méretének beállítása.\n"
 "A -1 érték jelentése: korlátlan."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 "A parancsértelmező várakozási idejének beállítása. A 0 érték jelentése:\n"
 "végtelen hosszúságú várakozási időtartam."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
-msgstr ""
+msgstr "A várakozási idő egysége a másodperc"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "A felhasználóhoz tartozó umask-érték beállítása"
@@ -14195,42 +14723,49 @@ msgstr ""
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+"A képernyő exportálása a rendszergazdai azonosítóról egy másikra való "
+"átlépéskor"
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "X Window-kapcsolatok engedélyezése"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "TCP-kapcsolatok engedélyezése az X Window rendszer számára"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "A tcp_wrappers által vezérelt összes szolgáltatás engedélyezése"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "A chkconfig figyelembe veszi-e az msec szabályait"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "A \"crontab\" és az \"at\" elérhetővé tétele a felhasználók számára"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Rendszernaplózás a 12-es konzolra"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr ""
 "'DNS spoofing' (a névfeloldásnak az eredetitől eltérő rendszerrel való\n"
 "végeztetése) elleni védelem"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr ""
@@ -14238,22 +14773,22 @@ msgstr ""
 "védelem\n"
 "bekapcsolása"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "A libsafe bekapcsolása, amennyiben megtalálható a rendszeren"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "A szokásostól eltérő IPv4-csomagok naplózásának bekapcsolása"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Az msec óránkénti biztonsági ellenőrzéseinek bekapcsolása"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
@@ -14261,82 +14796,82 @@ msgstr ""
 "csoport tagjainak számára legyen lehetséges, vagy pedig bármely felhasználó\n"
 "számára"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Jelszó használata a felhasználók azonosításához"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 "Az Ethernet-kártyák 'promiscuous' (minden csomagot megtartó) üzemmódjának\n"
 "ellenőrzése"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Napi biztonsági ellenőrzés"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8) egyfelhasználós szinten"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Nincs jelszóelévülés:"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr ""
 "A jelszavak lejáratához és az azonosítók deaktiválásához tartozó várakozási "
 "idők beállítása"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "A jelszótörténeti lista mérete"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 "A minimális jelszóhossz és a számjegyek illetve a nagybetűk minimális száma"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Rendszergazdai umask-érték"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "A parancsértelmező történeti listájának mérete"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "A parancsértelmező várakozási ideje"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Felhasználói umask-érték"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Nyitott portok ellenőrzése"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Ellenőrzés: létezik-e nem biztonságos azonosító"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr ""
@@ -14345,81 +14880,81 @@ msgstr ""
 
 # prom. üzemmód: az eszköz nem csak a neki szóló csomagokat teszi be
 #  a pufferébe, hanem a más eszközöknek szólókat is
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 "Ellenőrzés, hogy a hálózati eszközök 'promiscuous'\n"
 "(minden csomagot megtartó) üzemmódban vannak-e"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "A napi biztonsági ellenőrzések végrehajtása"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
-msgstr "SGID fájlok létrehozásának/törlésének ellenőrzése"
+msgstr "SGID-s fájlok létrehozásának/törlésének ellenőrzése"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Ellenőrzés, hogy létezik-e üres jelszó a /etc/shadow fájlban"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
-msgstr "Az SUID/SGID fájlok ellenőrzőösszegének ellenőrzése"
+msgstr "Az SUID-s/SGID-s fájlok ellenőrzőösszegének ellenőrzése"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
-msgstr "'SUID root' fájlok létrehozásának/törlésének ellenőrzése"
+msgstr "'SUID root'-os fájlok létrehozásának/törlésének ellenőrzése"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Figyelmeztetés a tulajdonos nélküli fájlokra"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "A mindenki által írható fájlok/könyvtárak ellenőrzése"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Chkrootkit ellenőrzések elvégzése"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "Ha nem szükséges, ne legyen email-küldés"
 
-#: 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 ""
 "Ha be van állítva: a jelentés ezen email-címre való küldése; máskülönben a\n"
 "rendszergazdának"
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Az ellenőrzés eredményének elküldése levélben"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Ellenőrzések elvégzése az RPM-adatbázison"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Az ellenőrzés eredményének írása a rendszernaplóba"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Az ellenőrzés eredményének kiírása a konzolra"
@@ -14595,6 +15130,9 @@ msgid ""
 "change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
+"A FAM egy fájlfigyelő szolgáltatás, amely értesítést küld a fájlok "
+"változásakor.\n"
+"A GNOME és a KDE is használja."
 
 #: services.pm:30
 #, c-format
@@ -14623,7 +15161,7 @@ msgstr ""
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
-"Az Apache egy WWW szerver. HTML fájlokat és CGI-t tesz elérhetővé\n"
+"Az Apache egy WWW-kiszolgáló. HTML-fájlokat és CGI-t tesz elérhetővé\n"
 "a hálózaton keresztül."
 
 #: services.pm:36
@@ -14692,9 +15230,9 @@ msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
-"Az lpd nyomtatószolgáltatás szükséges az lpr rendes működéséhez. Az lpd\n"
-"alapjában véve egy nyomtatószerver, elrendezi a nyomtatásokat a különböző\n"
-"nyomtatók között."
+"Az lpd nyomtatószolgáltatás szükséges az lpr helyes működéséhez. Az lpd\n"
+"alapjában véve egy nyomtatókiszolgáló, amely elrendezi a nyomtatásokat\n"
+"a különböző nyomtatók között."
 
 #: services.pm:52
 #, c-format
@@ -14751,16 +15289,16 @@ msgid ""
 "networks. This service provides NFS file locking functionality."
 msgstr ""
 "Az NFS egy népszerű, TCP/IP hálózaton használatos fájlmegosztási protokoll.\n"
-"Ez a szolgáltatás az NFS lock-olást oldja meg."
+"Ez a szolgáltatás az NFS-fájlzárolást biztosítja."
 
 #: services.pm:64
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "A NumLock automatikus bekapcsolása rendszerindításkor a konzolon és az\n"
-"XFree-ben."
+"Xorg rendszerben."
 
 #: services.pm:66
 #, c-format
@@ -14776,7 +15314,7 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 "A PCMCIA-támogatásra általában azoknak a laptop-felhasználóknak van\n"
-"szükségük, akik PCMCIA modemet vagy hálózati kártyát használnak a gépükben.\n"
+"szükségük, akik PCMCIA szabványú modemet vagy hálózati kártyát használnak.\n"
 "A szolgáltatás nem indul el, ha nincs beállítva, tehát nyugodtan fel lehet\n"
 "telepíteni olyan gépre is, ahol nincs rá szükség."
 
@@ -14788,9 +15326,10 @@ msgid ""
 "machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"A portmapper kezeli az RPC kapcsolatokat, ezekre többek között a NIS-nek és\n"
-"az NFS-nek van szüksége. A portmap szerverre csak a (NIS vagy NFS) szerver\n"
-"gépeken van szükség."
+"A portmapper kezeli az RPC-kapcsolatokat - ezekre többek között az\n"
+"NFS-nek és a NIS-nek van szüksége. A portmap szervernek futnia kell\n"
+"azokon a gépeken, amelyek az RPC mechanizmust használó protokollokhoz\n"
+"kapcsolódó szolgáltatást nyújtanak."
 
 #: services.pm:73
 #, c-format
@@ -14855,7 +15394,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 ""
 "Az rwho protokoll segítségével távoli felhasználók kaphatnak egy listát\n"
 "az rwho szolgáltatást futtató gép aktuális felhasználóiról (olyan, mint a\n"
@@ -14882,9 +15421,9 @@ msgstr "Az USB-eszközök meghajtóinak betöltése."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr ""
-"Elindítja az X betűtípus-kiszolgálóját (erre szükség van az XFree "
+"Elindítja az X betűtípus-kiszolgálóját (erre szükség van az Xorg "
 "használatához)."
 
 #: services.pm:117 services.pm:159
@@ -14929,7 +15468,7 @@ msgstr "leállítva"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Szolgáltatások és démonok"
 
 #: services.pm:221
@@ -14941,7 +15480,7 @@ msgstr ""
 "Nem érhető el további információ\n"
 "erről a szolgáltatásról."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Információ"
@@ -14956,718 +15495,1361 @@ msgstr "Indítás kérésre"
 msgid "On boot"
 msgstr "Rendszerindításkor"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
-msgstr "Start"
+msgstr "Indítás"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
-msgstr "Stop"
+msgstr "Leállítás"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
-#, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "Köszönjük, hogy a Mandrakelinux 9.2 rendszert választotta"
+#: share/advertising/01.pl:13
+#, c-format
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Mi a 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
-#, fuzzy, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "Üdvözöljük a Nyílt Forráskód világában"
+#: share/advertising/01.pl:15
+#, c-format
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Üdvözli a <b>Mandrakelinux</b>"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
 msgstr ""
+"A Mandrakelinux egy <b>Linux-disztribúció</b>, amely az alaprendszeren - a "
+"Linux kernelen alapuló <b>operációs rendszeren</b> - kívül tartalmaz "
+"<b>számos alkalmazást</b> is, megfelelve ezzel minden igénynek."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
+"A Mandrakelinux a leginkább <b>felhasználóbarát</b> Linux-disztribúció, "
+"továbbá az egyik <b>legelterjedtebb</b> is."
 
-#: share/advertising/dis-02.pl:13
-#, fuzzy, c-format
-msgid "<b>Discovery</b>"
-msgstr "Meghajtó"
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "<b>Nyílt forrás</b>"
+
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Üdvözöljük a <b>nyílt forráskód világában</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
+"A Mandrakelinux a nyílt forrás-modellt alkalmazza. Ez azt jelenti, hogy ez a "
+"verzió a <b>Mandrakesoft fejlesztőcsapata</b> és a Mandrakelinux "
+"fejlesztésében közreműködők <b>világméretű közössége</b> közti "
+"<b>együttműködés</b> eredménye."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
+"Szeretnénk <b>köszönetet mondani</b> mindazoknak, akik részt vettek ennek a "
+"verziónak a fejlesztésében."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr ""
+msgid "<b>The GPL</b>"
+msgstr "<b>A GPL</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
+"A disztribúcióban levő legtöbb szoftver, valamint az összes Mandrakelinux-"
+"eszköz a <b>General Public License</b> nevű licencet használja."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
+"A GPL a nyílt forrású fejlesztési modell lényegi része. <b>Szabadságot</b> "
+"biztosít mindenkinek a szoftver bármilyen módon való használatában, "
+"tanulmányozásában, terjesztésében és továbbfejlesztésében - azzal a "
+"feltétellel, hogy a továbbfejlesztés eredményei is terjesztésre kerülnek."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
+"Ennek az a legfőbb előnye, hogy a fejlesztők létszáma elvileg <b>korlátlan</"
+"b>, ami <b>nagyon jó minőségű</b> szoftvert eredményez."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:13
 #, c-format
-msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
-msgstr ""
+msgid "<b>Join the Community</b>"
+msgstr "<b>Csatlakozzon a közösséghez</b>"
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
+"A Mandrakelinux rendelkezik az egyik <b>legnagyobb</b> felhasználói és "
+"fejlesztői <b>közösséggel</b>. A közösség széles körű tevékenységet végez a "
+"hibakereséstől kezdve az alkalmazásfejlesztésig. A közösség "
+"<b>kulcsszerepet</b> játszik a Mandrakelinux világában."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
+"Ha szeretne <b>többet tudni</b> a dinamikus közösségünkről, akkor látogasson "
+"el a <b>www.mandrakelinux.com</b> weblapra. Ha szeretne <b>részt venni</b> a "
+"fejlesztésben, akkor a <b>www.mandrakelinux.com/en/cookerdevel.php3</b> "
+"weblapot ajánljuk."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "Internet"
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Letölthető verzió</b>"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:15
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
+"Jelenleg a <b>Mandrakelinux letölthető verziójának</b> telepítése folyik. "
+"Ezt az ingyenes verziót a Mandrakesoft <b>mindenki számára elérhetően</b> "
+"terjeszti."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
+"A letölthető verzió <b>nem tartalmazhat</b> minden, nem nyílt forráskódú "
+"szoftvert, ezért a következők nem találhatók meg benne:"
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "You can also:"
-msgstr ""
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgstr "\t- <b>zárt meghajtóprogramok</b> (például NVIDIA®- és ATI™-meghajtók)"
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/05.pl:19
 #, c-format
-msgid "\t- browse the Web"
+msgid ""
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
+"\t- <b>zárt szoftver</b> (például Acrobat® Reader®, RealPlayer®, Flash™)"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/05.pl:21
 #, c-format
-msgid "\t- chat"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
 msgstr ""
+"A többi Mandrakesoft-termékkel kínált <b>szolgáltatásokhoz</b> sem lesz "
+"hozzáférési lehetőség."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr ""
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery - az Ön első Linux-munkaasztala</b>"
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- create your own Web site"
-msgstr ""
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Ön most a <b>Mandrakelinux Discovery</b> terméket telepíti."
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- ..."
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
 msgstr ""
+"A Discovery a <b>legegyszerűbb</b> és leginkább <b>felhasználóbarát</b> "
+"Linux-rendszer. <b>Válogatott alkalmazásokat</b> tartalmaz irodai, "
+"multimédiás és internetes témakörben. A menüje feladatorientált, minden "
+"feladatra egy alkalmazással."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:13
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr ""
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack - a legerősebb Linux-munkaasztal</b>"
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr ""
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Ön most a <b>Mandrakelinux PowerPack</b> terméket telepíti."
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/07.pl:17
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
+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 ""
+"A PowerPack a Mandrakesoft által készített <b>linuxos munkaasztali termékek "
+"zászlóshajója</b>. A PowerPack <b>alkalmazások ezreit</b> tartalmazza - a "
+"legnépszerűbbeket és a legfejlettebbeket."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:13
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr ""
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "<b>PowerPack+ - Linux-megoldás munkaasztalra és kiszolgálóra</b>"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
-#, fuzzy, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "Mandrake Vezérlőközpont"
+#: share/advertising/08.pl:15
+#, c-format
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Ön most a <b>Mandrakelinux PowerPack+</b> terméket telepíti."
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/08.pl:17
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
 msgstr ""
+"A PowerPack+ egy <b>teljes Linux-megoldás</b> a kisebb és a közepes méretű "
+"<b>hálózatok</b> számára. A PowerPack+ <b>munkaasztali alkalmazások</b> "
+"ezreit tartalmazza, valamint professzionális <b>kiszolgáló-alkalmazások</b> "
+"széles skáláját."
+
+#: share/advertising/09.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft-termékek</b>"
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
+"A <b>Mandrakesoft</b> széles skálával rendelkezik <b>Mandrakelinux</b>-"
+"termékekből."
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
-#, fuzzy, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "Mandrake Vezérlőközpont"
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "A Mandrakelinux 10.1-termékek a következők:"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/09.pl:18
 #, c-format
-msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
-msgstr ""
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t- <b>Discovery</b> - az Ön első Linux-munkaasztala"
 
-#: 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/09.pl:19
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr ""
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t- <b>PowerPack</b> - a legerősebb Linux-munkaasztal"
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
-#, fuzzy, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Legyen Mandrake-szakértő (MandrakeExpert)"
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t- <b>PowerPack+</b> - Linux-megoldás munkaasztalra és kiszolgálóra"
 
-#: 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/09.pl:21
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
+"\t- <b>Mandrakelinux 10.1 az x86-64 architektúrához</b> - a Mandrakelinux-"
+"megoldás, amellyel a legtöbbet hozhatja ki 64 bites processzorából"
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
-#, fuzzy, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "hozzáférés a fordítási eszközökhöz"
+#: share/advertising/10.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Mandrakesoft-termékek (Nomad)</b>"
 
-#: 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/10.pl:15
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
+"A Mandrakesoft rendelkezik kettő olyan termékkel, amelyek lehetővé teszik a "
+"Mandrakelinux <b>bármely számítógépen</b> való, telepítés nélküli "
+"használatát:"
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
-#, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "Köszönjük, hogy a Mandrakelinux 9.2 rendszert választotta"
+#: share/advertising/10.pl:16
+#, c-format
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
+"\t- <b>Move</b> - Mandrakelinux-rendszer, amely teljes mértékben egy "
+"indítható CD-ről fut"
 
-#: 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/10.pl:17
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
+"\t- <b>GlobeTrotter</b> - Mandrakelinux-rendszer előre telepítve a tömör "
+"felépítésű LaCie Mobile Hard Drive lemezegységre."
+
+#: share/advertising/11.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<b>Mandrakesoft-termékek (professzionális megoldások)</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/11.pl:15
 #, c-format
-msgid "\t- Plus much more"
+msgid ""
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
+"A <b>professzionális igények</b> kielégítésére tervezett Mandrakesoft-"
+"termékek:"
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/11.pl:16
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
+"\t- <b>Corporate Desktop</b> - az üzleti célra szánt Mandrakelinux-"
+"munkaasztal"
 
-#: share/advertising/dis-11.pl:13
-#, fuzzy, c-format
-msgid "Do you require assistance?"
-msgstr "Van valamilyen %s csatoló?"
+#: share/advertising/11.pl:17
+#, c-format
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t- <b>Corporate Server</b> - Mandrakelinux-kiszolgálói megoldás"
 
-#: 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/11.pl:18
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
+"\t- <b>Multi-Network Firewall</b> - biztonsági megoldás Mandrakelinuxszal"
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/12.pl:13
+#, c-format
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>KDE környezet</b>"
+
+#: share/advertising/12.pl:15
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
+"A Discovery rendszerben használatba veheti a <b>KDE</b>-t, a legfejlettebb "
+"és leginkább felhasználóbarát <b>grafikus asztali környezetet</b>."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/12.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE 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 ""
+"A KDE olyan <b>egyszerűvé</b> teszi a Linux-beli <b>első lépéseket</b>, hogy "
+"ezután más operációs rendszer használatára nem lesz szükség."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/12.pl:19
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
+"A KDE tartalmaz számos <b>integrált alkalmazást</b> is, mint például a "
+"Konqueror nevű böngésző vagy a Kontact nevű személyi információkezelő."
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
+#, c-format
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Válassza ki a kedvenc munkaasztali környezetét</b>"
+
+#: share/advertising/13-a.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
+"A PowerPack rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
+"választani. A Mandrakesoft alapértelmezésként a <b>KDE</b> környezetet "
+"jelölte ki."
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
+"A KDE az egyik <b>legfejlettebb</b> és leginkább <b>felhasználóbarát</b> "
+"grafikus asztali környezet. Számos integrált alkalmazást tartalmaz."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
+"Javasoljuk, hogy próbálja ki a többit is (mint például <b>GNOME</b> vagy "
+"<b>IceWM</b>) és válassza ki az Önnek leginkább megfelelőt."
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
+"A PowerPack+ rendszerben lehetősége van <b>grafikus asztali környezetet</b> "
+"választani. A Mandrakesoft alapértelmezésként a <b>KDE</b> környezetet "
+"jelölte ki."
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "A Discovery rendszerben megtalálható az <b>OpenOffice.org</b> is."
+
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
+"Ez egy <b>teljes irodai alkalmazáscsomag</b>, amely tartalmaz "
+"szövegszerkesztőt, táblázatkezelőt, bemutatókészítőt és rajzolóprogramokat "
+"is."
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
+"Az OpenOffice.org a legtöbb típusú <b>Microsoft® Office</b>-dokumentumot "
+"(például Word-, Excel- és PowerPoint®-fájlok) tudja kezelni (beleértve a "
+"mentés képességét is)."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/15.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr ""
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/15.pl:15
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid ""
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
+"A Discovery tartalmazza a <b>Kontact</b> alkalmazást, az új KDE-alapú "
+"<b>munkacsoportos megoldást</b>."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
+"A teljes értékű <b>levelezőprogramon</b> kívül a Kontact tartalmaz "
+"<b>címjegyzékkezelőt</b>, <b>naptárt</b> és <b>jegyzetkészítőt</b> is."
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr "Ez a kommunikáció és az időkezelés legegyszerűbb módja."
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Böngészés az interneten</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
+"A Discovery elérést biztosít az <b>összes internetes szolgáltatáshoz</b>:"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t- a <b>web</b> böngészése: Konqueror"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t- <b>beszélgetés</b> a barátokkal: Kopete"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t- <b>fájlküldés</b>: KBear"
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t- ..."
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "<b>Használja ki a multimédiás lehetőségeket</b>"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr "A Discovery a <b>multimédiát</b> is egyszerűvé teszi:"
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t- <b>videók</b> lejátszása: Kaffeine"
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t- <b>zene</b> lejátszása: amaroK"
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t- <b>képek</b> szerkesztése és készítése: GIMP"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Alkalmazások széles skálája</b>"
+
+#: share/advertising/18.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>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
+"A Mandrakelinux menüjében <b>minden feladathoz</b> talál <b>egyszerűen "
+"használható</b> alkalmazásokat:"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
+"\t- irodai dokumentumok készítése, szerkesztése és megosztása: <b>OpenOffice."
+"org</b>"
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.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."
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
+"\t- személyi információkezelés: <b>Kontact</b> és <b>Evolution</b> integrált "
+"személyi információkezelők"
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t- a web böngészése: <b>Mozilla</b> és <b>Konqueror</b>"
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t- beszélgetés hálózaton keresztül: <b>Kopete</b>"
+
+#: share/advertising/18.pl:20
 #, 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."
-msgstr ""
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
+msgstr "\t- <b>hang-CD-k</b>, <b>zenefájlok</b> és <b>videók</b> lejátszása"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t- képek szerkesztése és készítése: <b>GIMP</b>"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Fejlesztőkörnyezetek</b>"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, 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."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
+"A PowerPack a legjobb eszközöket nyújtja saját alkalmazások "
+"<b>fejlesztéséhez</b>."
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
+"Használatba veheti a KDE fejlett, integrált <b>KDevelop</b> "
+"fejlesztőkörnyezetét, amellyel számos nyelven készíthet programokat."
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:19
 #, 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!"
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
+"A PowerPack tartalmazza a Linuxon elterjedten használt <b>GCC</b> "
+"fordítóprogramot és az ahhoz tartozó <b>GDB</b> nyomkövetőt."
 
-#: share/advertising/dwd-07.pl:13
-#, fuzzy, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "Legyen Mandrake-szakértő (MandrakeExpert)"
-
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
-#, fuzzy, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "Van valamilyen %s csatoló?"
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Fejlesztési szerkesztők</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:15
 #, c-format
-msgid "<b>Note</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
 msgstr ""
+"A PowerPack rendszerben a következő <b>népszerű szerkesztők</b> közül lehet "
+"választani:"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:16
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
 msgstr ""
+"\t- <b>Emacs</b>: testreszabható, valós idejű megjelenítést használó "
+"szerkesztő"
 
-#: 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 ""
+"\t- <b>XEmacs</b>: nyílt forrású szövegszerkesztő és alkalmazásfejlesztési "
+"rendszer"
 
-#: 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 ""
+"\t- <b>Vim</b>: fejlett szövegszerkesztő, a szabványos Vi fejlettebb "
+"változata"
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:13
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr ""
+msgid "<b>Development Languages</b>"
+msgstr "<b>Fejlesztési nyelvek</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 ""
+"<b>Nagy tudású eszközök</b> állnak rendelkezésre <b>programozási nyelvek "
+"tucatjaival</b> való alkalmazásfejlesztésre:"
 
-#: 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."
-msgstr ""
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t- az elterjedt <b>C nyelv</b>"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
-#, fuzzy, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "Válasszon fájlrendszer-titkosítási kulcsot"
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t- objektumorientált nyelvek:"
 
-#: 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 "\t- szkriptnyelvek:"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t- <b>Perl</b>"
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t- <b>Python</b>"
+
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#, c-format
+msgid "\t* And many more."
+msgstr "\t- és még sok egyéb"
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Fejlesztési eszközök</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 ""
+"A fejlett, integrált <b>KDevelop</b> fejlesztőkörnyezet és a Linuxon "
+"elterjedten használt <b>GCC</b> fordítóprogram használatával <b>számos "
+"különböző nyelven</b> (C, C++, Java™, Perl, Python, ...) lehet "
+"alkalmazásokat készíteni."
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Munkacsoportos kiszolgáló</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 ""
+"A PowerPack+ rendszer tartalmazza a nagy tudású <b>Kolab</b> "
+"<b>munkacsoportos kiszolgálót</b>, amely - a <b>Kontact</b> nevű kliensnek "
+"köszönhetően - lehetővé teszi a következőket:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/23.pl:16
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t- <b>e-mail</b> küldése és fogadása"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t- a <b>napirendek</b> és a <b>címjegyzékek</b> megosztása"
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t- <b>emlékeztetők</b> és <b>feladatlisták</b> kezelése"
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Kiszolgálók</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 ""
+"Erősítse meg üzleti hálózatát <b>professzionális kiszolgáló-megoldásokkal</"
+"b>, mint például:"
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:16
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
+"\t- <b>Samba</b>: fájl- és nyomtatószolgáltatások windowsos kliensekhez"
 
-#: 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 ""
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t- <b>Apache</b>: a legelterjedtebb webkiszolgáló"
 
-#: 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- <b>MySQL</b> és <b>PostgreSQL</b>: a legnépszerűbb nyílt forrású "
+"adatbáziskezelők"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
+"\t- <b>CVS</b>: Concurrent Versions System, a legelterjedtebb nyílt forrású "
+"hálózatfüggetlen verziókezelési rendszer"
 
-#: 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 ""
+"\t- <b>ProFTPD</b>: nagymértékben testreszabható GPL licencű FTP-kiszolgáló"
 
-#: 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>Postfix</b> és <b>Sendmail</b>: népszerű és nagy tudású "
+"levelezőkiszolgálók"
 
-#: 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 ""
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux Vezérlőközpont</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"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
+"A <b>Mandrakelinux Vezérlőközpont</b> a Mandrakelinux-beli számítógép-"
+"beállítási szoftvereszközök nélkülözhetetlen gyűjteménye."
 
-#: 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 ""
+"Komoly hasznát veheti ennek a <b>több mint 60</b> programot tartalmazó "
+"gyűjteménynek, amellyel <b>egyszerűen beállíthatja a rendszert</b>. "
+"Beállíthatók vele többek közt a hardvereszközök, a csatolási pontok, a "
+"hálózat- és internetelérés, valamint a gép biztonsági szintje."
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/26.pl:13
+#, c-format
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>A nyílt forrás-modell</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 ""
+"Mint mindenféle számítógép-programozás, a nyílt forráskódú szoftver "
+"fejlesztése is <b>igényel időt és embereket</b>. A nyílt forráskód "
+"filozófiájának tiszteletben tartásával a Mandrakesoft értéknövelt termékeket "
+"és szolgáltatásokat kínál a <b>Mandrakelinux fejlesztésének fenntartása</b> "
+"érdekében. Ha szeretné <b>támogatni a nyílt forráskód filozófiáját</b> és a "
+"Mandrakelinux fejlesztését, akkor <b>fontolja meg</b> valamely termékünk "
+"vagy szolgáltatásunk megvásárlását."
+
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Webes áruház</b>"
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:15
 #, 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 ""
+"Ha információt szeretne a Mandrakesoft termékeiről és szolgáltatásairól, "
+"akkor látogassa meg <b>webes áruházunkat</b>."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:17
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
+"Itt megtalálhatja az összes termékünket és szolgáltatásunkat, valamint külső "
+"cégek termékeit is."
 
-#: 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 ""
+"Az <b>újratervezett</b> weboldal nagyobb hatékonyságot és egyszerűbb "
+"használatot kínál."
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr ""
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Látogassa meg a <b>store.mandrakesoft.com</b> weboldalt"
+
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
+"A <b>Mandrakeclub</b> a <b>tökéletes kiegészítő</b> az Ön Mandrakelinux-"
+"rendszeréhez."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
+"Használja ki a Mandrakeclub-tagsággal járó <b>előnyöket</b>, mint például:"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:18
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
+"\t- <b>kedvezmények</b> webes áruházunk - <b>store.mandrakesoft.com</b> - "
+"termékeire és szolgáltatásaira"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
+"\t- hozzáférés <b>kereskedelmi alkalmazásokhoz</b> (például NVIDIA®- és ATI™-"
+"meghajtók)"
 
-#: share/advertising/ppp-07.pl:16
-#, fuzzy, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "Apache World Wide Web kiszolgáló"
+#: share/advertising/28.pl:20
+#, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t- a Mandrakelinux <b>felhasználói fórumainak</b> használata"
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
+"\t- <b>korábbi és elsőbbségi hozzáférés</b> - a nyilvános kiadás előtt - a "
+"Mandrakelinux <b>ISO-fájljaihoz</b>"
+
+#: share/advertising/29.pl:13
+#, c-format
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
+"A <b>Mandrakeonline</b> egy új szolgáltatás, amelyet a Mandrakesoft büszkén "
+"kínál vásárlóinak"
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
+"A Mandrakeonline széles körű szolgáltatásokat nyújt Mandrakelinux-rendszerek "
+"<b>egyszerűen végezhető frissítésére</b>:"
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
 msgstr ""
+"\t- <b>tökéletes</b> rendszerbiztonság (automatizált szoftverfrissítés)"
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
+"\t- <b>értesítés</b> a frissítésekről (e-mailben vagy egy, a munkaasztalon "
+"megjelenő alkalmazáson keresztül)"
+
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t- rugalmas, <b>ütemezett</b> frissítések"
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
+"\t- az <b>összes Mandrakelinux-rendszer</b> kezelése egyetlen azonosítóval"
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr ""
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
+"<b>Segítségre</b> van szüksége? A Mandrakesoft technikai szakértőit "
+"megtalálhatja a <b>technikai támogatási oldalunkon</b>: www.mandrakeexpert."
+"com."
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
+"A <b>képzett Mandrakelinux-szakértők</b> segítségének köszönhetően időt "
+"takaríthat meg."
 
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
+"Bármilyen, a Mandrakelinuxszal kapcsolatos kérdés esetén lehetősége van "
+"támogatási egységek vásárlására a <b>store.mandrakesoft.com</b> helyen."
+
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "Irodai munkaállomás"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:27
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), "
+"táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
+"(KSpread, Gnumeric), PDF-nézegetők, ..."
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Development tools</b>"
-msgstr "Fejlesztés"
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Játékgép"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimédiás munkaállomás"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internetes munkaállomás"
+
+#: 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 ""
+"Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:49
 #, c-format
-msgid "And of course the editors!"
-msgstr ""
+msgid "Network Computer (client)"
+msgstr "Hálózati számítógép (kliens)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Beállítás"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Segédprogramok a számítógép beállításához"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Parancssori eszközök"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ fejlesztőkönyvtárak, programok és include-fájlok"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "Csoportmunka-alkalmazás"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolab-kiszolgáló"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Tűzfal/útválasztó (router)"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet-átjáró"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Levelezés/hírek"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix email-kiszolgáló, Inn hírkiszolgáló"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Címtárkiszolgáló"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTP-kiszolgáló"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "DNS- és NIS-kiszolgáló"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Fájl- és nyomtatómegosztási kiszolgáló"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFS-kiszolgáló, Samba-kiszolgáló"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Adatbázis"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL és MySQL adatbázis-kiszolgáló"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Levelezés"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix email-kiszolgáló"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Kiszolgáló hálózati számítógépekhez"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-munkaállomás"
+
+#: 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 ""
+"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
+"eszközökkel együtt"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-munkaállomás"
 
-#: 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 ""
+"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Más grafikus környezetek"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "IceWM, WindowMaker, Enlightenment, Fvwm, ..."
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Segédprogramok"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH-kiszolgáló"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Webmin kiszolgáló távoli beállításhoz"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Hálózati programok/hálózatfigyelés"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft-varázslók"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Varázslók a kiszolgáló beállítására"
 
 #: standalone.pm:21
 #, c-format
@@ -15736,6 +16918,11 @@ msgid ""
 "  --splash          - enable to configure boot theme\n"
 "default mode: offer to configure autologin feature"
 msgstr ""
+"[--boot] [--splash]\n"
+"OPCIÓK:\n"
+"  --boot            - a rendszerindító beállítása\n"
+"  --splash          - a rendszerindítási téma beállítása\n"
+"alapértelmezett üzemmód: az automatikus bejelentkezés beállítása"
 
 #: standalone.pm:57
 #, c-format
@@ -15744,15 +16931,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 "[OPCIÓK] [PROGRAMNÉV]\n"
 "\n"
 "OPCIÓK:\n"
 "  --help            - jelen segítség megjelenítése\n"
-"  --report          - paraméter: programnév (a Mandrake-eszközök egyike)\n"
-"  --incident        - paraméter: programnév (a Mandrake-eszközök egyike)"
+"  --report          - programnév (a Mandrakelinux-eszközök egyike)\n"
+"  --incident        - programnév (a Mandrakelinux-eszközök egyike)"
 
 #: standalone.pm:63
 #, c-format
@@ -15764,9 +16951,15 @@ msgid ""
 "  --internet        - configure internet\n"
 "  --wizard          - like --add"
 msgstr ""
+"[--add]\n"
+"  --add             - \"hálózati csatoló felvétele\" varázsló\n"
+"  --del             - \"hálózati csatoló eltávolítása\" varázsló\n"
+"  --skip-wizard     - kapcsolatok kezelése\n"
+"  --internet        - az internet beállítása\n"
+"  --wizard          - mint a --add"
 
 #: standalone.pm:69
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Font Importation and monitoring application\n"
@@ -15774,7 +16967,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"
@@ -15782,11 +16975,12 @@ msgid ""
 "                 : name_of_application like  so for staroffice \n"
 "                 : and gs for ghostscript for only this one."
 msgstr ""
-"Betűkészletek telepítése és lekérdezése\n"
-"--windows_import : betűkészlet-importálás az összes elérhető windowsos\n"
-"                   partícióról\n"
+"\n"
+"Betűkészletek importálása és lekérdezése\n"
+"\n"
+"OPCIÓK:\n"
+"--windows_import : importálás az összes elérhető windowsos partícióról\n"
 "--xls_fonts      : a betűkészletek listázása (xlsfonts)\n"
-"--strong         : a betűkészletek szigorú ellenőrzése\n"
 "--install        : betűkészlet vagy betűkészlet-könyvtár telepítése\n"
 "--uninstall      : betűkészlet vagy betűkészlet-könyvtár eltávolítása\n"
 "--replace        : a már létező betűkészletek felülírása\n"
@@ -15800,7 +16994,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15814,7 +17008,7 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCIÓK]...\n"
-"A Mandrake terminálkiszolgáló (MTS) beállítása\n"
+"A Mandrakelinux terminálkiszolgáló (MTS) beállítása\n"
 "--enable         : az MTS bekapcsolása\n"
 "--disable        : az MTS kikapcsolása\n"
 "--start          : az MTS elindítása\n"
@@ -15824,9 +17018,9 @@ msgstr ""
 "--deluser        : létező rendszerfelhasználó eltávolítása az MTS-ből\n"
 "                   (felhasználónevet igényel)\n"
 "--addclient      : kliensgép felvétele az MTS-be (MAC-címet, IP-címet\n"
-"                   és NBI képmásnevet igényel)\n"
+"                   és NBI-képmásnevet igényel)\n"
 "--delclient      : kliensgép eltávolítása az MTS-ből (MAC-címet, IP-címet\n"
-"                   és NBI képmásnevet igényel)"
+"                   és NBI-képmásnevet igényel)"
 
 #: standalone.pm:96
 #, c-format
@@ -15906,7 +17100,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake felbontás"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -15917,28 +17111,28 @@ msgstr ""
 "Használat: %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 ""
 "Jelentkezzen ki, majd nyomja meg a Ctrl+Alt+BackSpace billentyűkombinációt"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "A módosítások érvénybe lépéséhez ki kell lépni, majd ismét belépni"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Terminálkiszolgáló nélkül értelmetlen"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s felhasználónevet igényel\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15947,79 +17141,75 @@ msgstr ""
 "%s: %s a következőket igényli: gépnév, MAC-cím, IP-cím, NBI képmásnév, "
 "vékony kliens (0/1), helyi beállítás (0/1)\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s gépnevet igényel\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
-#, fuzzy, c-format
 msgid "Terminal Server Configuration"
-msgstr "A Mandrake Terminal Server beállítása"
+msgstr "A terminálkiszolgáló beállítása"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "A kiszolgáló bekapcsolása"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "A kiszolgáló kikapcsolása"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "A kiszolgáló elindítása"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "A kiszolgáló leállítása"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
-msgstr "Etherboot floppy/ISO"
+msgstr "Etherboot-floppy/-ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Hálózati indítási fájlok"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Felhasználók felvétele/törlése"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Kliensek felvétele/törlése"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
-msgstr "Mandrake Varázsló"
+msgstr "Első indítási varázsló"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
+"\"%s\" beállítva bejelentkezéskezelőként; \"gdm\" felhasználó felvétele a /"
+"etc/passwd$$CLIENT$$ fájlba"
 
-#: 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"
@@ -16035,23 +17225,36 @@ msgid ""
 "    e) Ask you to make a boot floppy.\n"
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
+"\n"
+"Ez a varázsló a következőket teszi:\n"
+"\n"
+"  1. Megkérdi, vékony vagy teljes értékű klienseket kell-e kezelni.\n"
+"  2. Beállítja a DHCP-t.\n"
+"  3. Elkészíti az összes NBI-t.\n"
+"  4. Aktiválja a kiszolgálót.\n"
+"  5. Elindítja a kiszolgálót.\n"
+"  6. Szinkronizálja a \"shadow\" fájlokat, hogy az összes felhasználó\n"
+"     (beleértve a rendszergazdát is) fel legyen véve a shadow$$CLIENT$$\n"
+"     fájlba.\n"
+"  7. Megkérdi, készítsen-e rendszerindítási lemezt.\n"
+"  8. Vékony kliensek esetén megkérdi, újraindítsa-e a KDM-et.\n"
 
-#: standalone/drakTermServ:392
-#, fuzzy, c-format
+#: standalone/drakTermServ:367
+#, c-format
 msgid "Cancel Wizard"
-msgstr "A varázsló indítása"
+msgstr "Kilépés a varázslóból"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
-msgstr ""
+msgstr "Mentse el a dhcpd-beállításokat."
 
-#: standalone/drakTermServ:432
-#, fuzzy, c-format
+#: standalone/drakTermServ:407
+#, c-format
 msgid "Use thin clients."
-msgstr "Vékony kliensek engedélyezése"
+msgstr "Vékony kliensek használata."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16059,46 +17262,57 @@ msgid ""
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
+"Válassza ki az alapértelmezett klienstípust.\n"
+"A \"vékony\" kliensek mindent a kiszolgálón futtatnak (annak processzorát\n"
+"és memóriáját használva), de a kliens képernyőjét használva.\n"
+"A \"teljes értékű\" kliensek a saját processzorukat és memóriájukat\n"
+"használják, de a kiszolgáló fájlrendszerét."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
+"A kliens X rendszerbeli billentyűzetbeállításainak szinkronizálása a "
+"kiszolgálóval."
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
-msgstr ""
+msgstr "Hálózati indítási fájlok létrehozása az összes kernelhez"
 
-#: 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 "Ez több percig is eltarthat."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
-#, fuzzy, c-format
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
+#, c-format
 msgid "Done!"
 msgstr "Kész"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
+"A kiszolgáló felhasználólistájának szinkronizálása a kliens listájával, a "
+"rendszergazdát is beleértve."
 
-#: 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 ""
+"A vékony kliensekkel kapcsolatos módosítások érvénybe léptetéséhez újra kell "
+"indítani a bejelentkezéskezelőt. Szeretné újraindítani most?"
 
-#: standalone/drakTermServ:519
-#, fuzzy, c-format
+#: standalone/drakTermServ:493
+#, c-format
 msgid "Terminal Server Overview"
-msgstr "DrakTermServ - áttekintés"
+msgstr "Terminálkiszolgáló - áttekintés"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16122,7 +17336,7 @@ msgstr ""
 "        \tdhcpd.conf fájl használ) létrehozásához minimum egy teljes\n"
 "        \tkernelhez létre kell hozni Etherboot-képmást."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16157,7 +17371,7 @@ msgstr ""
 "        \tEgy lemez nélküli klienshez való dhcpd.conf-részlet általában a\n"
 "        \tkövetkezőképpen néz ki:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16168,14 +17382,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"
@@ -16204,13 +17418,13 @@ msgstr ""
 "        \tMegjegyzés: A \"#type\" bejegyzést csak a DrakTermServ\n"
 "        \thasználja. Egy kliens típusa \"thin\" (vékony kliens) vagy\n"
 "        \t\"fat\" (teljes értékű kliens) lehet. A vékony kliensek a\n"
-"        \tlegtöbb szoftvert a kiszolgálói oldalon futtatják (az xdmcp\n"
+"        \tlegtöbb szoftvert a kiszolgálói oldalon futtatják (az XDMCP\n"
 "        \tsegítségével), a teljes értékű kliensek pedig a kliensoldalon.\n"
 "        \tLétezik egy speciális inittab a vékony kliensek számára:\n"
 "        \t\"%s\". Vékony kliensek\n"
 "        \thasználata esetén a következő rendszerbeállítási fájlok\n"
-"        \tmódosításra kerülnek az xdmcp használatának érdekében:\n"
-"        \txdm-config, kdmrc, gdm.conf. Mivel az xdmcp használatának van\n"
+"        \tmódosításra kerülnek az XDMCP használatának érdekében:\n"
+"        \txdm-config, kdmrc, gdm.conf. Mivel az XDMCP használatának van\n"
 "        \tbiztonsági kockázata, ezért a hosts.deny és a hosts.allow\n"
 "        \tfájlok módosításra kerülnek a helyi alhálózathoz való\n"
 "        \thozzáférés korlátozása érdekében.\n"
@@ -16231,7 +17445,7 @@ msgstr ""
 "        \tMegjegyzés: Kliensek felvétele illetve módosítása után újra\n"
 "        \tkell indítani a kiszolgálót."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16262,7 +17476,7 @@ msgstr ""
 "\n"
 "        \tAz ALHÁLÓZAT/MASZK értéknek definiálva kell lenni a hálózaton."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16280,7 +17494,7 @@ msgstr ""
 "        \tmegfelelő rendszerfelhasználókat felveszi ezen fájlba illetve\n"
 "        \teltávolítja onnan."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16296,7 +17510,7 @@ msgstr ""
 "        \tkliensek beállításainak helyi kezelésével a DrakTermServ\n"
 "        \tsegítséget nyújt ezen fájlok elkészítéséhez."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16330,7 +17544,7 @@ msgstr ""
 "        \tkapcsolni a helyi beállításokat (a beállítási fájlok\n"
 "        \tmegtartásával)."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16340,7 +17554,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"
@@ -16366,7 +17580,7 @@ msgstr ""
 "        \tindítási képmások elérhetők legyenek a lemez nélküli kliensek\n"
 "        \tszámára.\n"
 "\n"
-"        \tA tftp beállítási fájlja általában a következőképpen néz ki:\n"
+"        \tA TFTP beállítási fájlja általában a következőképpen néz ki:\n"
 "\n"
 "        \tservice tftp\n"
 "        \t{\n"
@@ -16385,13 +17599,13 @@ msgstr ""
 "        \t/var/lib/tftpboot értékre (ahova az mkinitrd-net a képmásait\n"
 "        \thelyezi)."
 
-#: standalone/drakTermServ:615
-#, fuzzy, c-format
+#: 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"
@@ -16402,7 +17616,7 @@ msgid ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
-"        - Etherboot floppyk illetve CD-k létrehozása:\n"
+"        - Etherboot-floppyk illetve -CD-k létrehozása:\n"
 "        \tA lemez nélküli kliensgépeknek az indítási folyamat\n"
 "        \telindításához szükségük van NIC-beli ROM-képmásokra vagy egy\n"
 "        \tindítólemezre (floppy vagy CD). A DrakTermServ segítséget nyújt\n"
@@ -16412,65 +17626,66 @@ msgstr ""
 "        \tEgy alapvető példa egy indítási lemez kézzel való elkészítésére\n"
 "        \t(3Com 3c509 kártya esetére):\n"
 "\n"
-"        \tcat /usr/lib/etherboot/boot1a.bin \\\n"
-"        \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
+"        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
+"        \t\t/usr/share/etherboot/start16.bin \\\n"
+"        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Rendszerindító floppy"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
-msgstr "Rendszerindító ISO fájl"
+msgstr "Rendszerindító ISO-fájl"
 
-#: standalone/drakTermServ:654
-#, fuzzy, c-format
+#: standalone/drakTermServ:628
+#, c-format
 msgid "PXE Image"
-msgstr "Indítófájl"
+msgstr "PXE-képmás"
 
-#: standalone/drakTermServ:723
-#, fuzzy, c-format
+#: standalone/drakTermServ:696
+#, c-format
 msgid "Default kernel version"
-msgstr "A kernelverzió küldése"
+msgstr "Alapértelmezett kernelverzió"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Teljes kernel elkészítése -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Nincs kijelölve kernel."
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Egyetlen NIC-fájl készítése -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Nincs kijelölve NIC."
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Az összes kernel elkészítése -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Törlés"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Az összes NBI törlése"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16482,27 +17697,27 @@ msgstr ""
 "Távolítsa el a felhasználót, majd vegye fel újra a terminálkiszolgálóhoz,\n"
 "ha szeretné lehetővé tenni a belépést."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Felhasználó felvétele -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Felhasználó törlése"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "típus: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "helyi beállítás: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16511,67 +17726,67 @@ msgstr ""
 "A beállítások helyi\n"
 "kezelésének engedélyezése."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Hálózati indítási fájlok nem lettek létrehozva."
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Vékony kliens"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Vékony kliensek engedélyezése"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Kliens felvétele -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "típus: teljes értékű"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "típus: vékony"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "helyi beállítás: hamis"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "helyi beállítás: igaz"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Kliens szerkesztése"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Helyi beállítás kikapcsolása"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Kliens törlése"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd beállítása..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16581,77 +17796,80 @@ msgstr ""
 "bejelentkezéskezelőt. \n"
 "(service dm restart - a konzolon kiadva)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
+"A vékony kliensek nem támogatják az automatikus bejelentkezést. Szeretné "
+"kikapcsolni az automatikus bejelentkezést?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
-msgstr ""
+msgstr "Az összes kliens ezt fogja használni: %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Alhálózat:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Hálózati maszk:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Útválasztók:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Alhálózati maszk:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Broadcast-cím:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Tartománynév:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Névkiszolgálók:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Az IP-címtartomány kezdete:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Az IP-címtartomány vége:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
+"A terminálkiszolgálóval kapcsolatos részek hozzáfűzése a meglevő beállításhoz"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Beállítás mentése"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "A dhcpd kiszolgáló beállítása"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16662,105 +17880,99 @@ msgstr ""
 "rendszerből származik.\n"
 "Szükség esetén módosíthatja azokat."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dinamikus IP-cím-készlet:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Tegye be a floppyt:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "A floppy nem elérhető."
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "A floppyt most már ki lehet venni"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Nincs elérhető floppy-meghajtó."
 
-#: standalone/drakTermServ:1440
-#, fuzzy, c-format
+#: standalone/drakTermServ:1413
+#, c-format
 msgid "PXE image is %s/%s"
-msgstr "Az Etherboot ISO fájl: %s"
+msgstr "A PXE-képmás: %s/%s"
 
-#: standalone/drakTermServ:1442
-#, fuzzy, c-format
+#: standalone/drakTermServ:1415
+#, c-format
 msgid "Error writing %s/%s"
-msgstr "Hiba a(z) %s fájl írása közben"
+msgstr "Hiba a(z) %s/%s fájl írása közben"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
-msgstr "Az Etherboot ISO fájl: %s"
+msgstr "Az Etherboot-ISO-fájl: %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Valamilyen probléma merült fel. Az mkisofs telepítve van?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Először létre kell hozni ezt: /etc/dhcpd.conf"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
-msgstr ""
+msgstr "%s jelszava helytelen a terminálkiszolgálóban - újraírás...\n"
 
-#: standalone/drakTermServ:1647
-#, fuzzy, c-format
+#: standalone/drakTermServ:1615
+#, c-format
 msgid "%s is not a user..\n"
-msgstr "%s nem található\n"
+msgstr "%s nem felhasználó\n"
 
-#: standalone/drakTermServ:1648
-#, fuzzy, c-format
+#: standalone/drakTermServ:1616
+#, c-format
 msgid "%s is already a Terminal Server user\n"
-msgstr "%s már használatban van\n"
+msgstr "%s már terminálkiszolgáló-felhasználó\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
-msgstr ""
+msgstr "Nem sikerült felvenni a terminálkiszolgálóba a következőt: %s\n"
 
-#: standalone/drakTermServ:1652
-#, fuzzy, c-format
+#: standalone/drakTermServ:1620
+#, c-format
 msgid "%s added to Terminal Server\n"
-msgstr "Terminálkiszolgáló nélkül értelmetlen"
+msgstr "%s felvéve a terminálkiszolgálóba\n"
 
-#: standalone/drakTermServ:1698
-#, fuzzy, c-format
+#: standalone/drakTermServ:1666
+#, c-format
 msgid "Deleted %s...\n"
-msgstr "Felismert eszköz: %s"
+msgstr "%s törölve...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s nem található\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s már használatban van\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "A /etc/hosts.allow és a /etc/hosts.deny már be van állítva - nem lett "
 "módosítva"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "A beállítások módosultak - újrainduljon a ClusterNFS/dhcpd?"
@@ -16781,7 +17993,7 @@ msgid "Auto Install Configurator"
 msgstr "Az automatikus telepítés beállításai"
 
 #: standalone/drakautoinst:42
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -16806,7 +18018,7 @@ msgstr ""
 "nem lesznek automatikusan végrehajtva, bármit is választott Ön ezen gép "
 "telepítése során.\n"
 "\n"
-"Kívánja folytatni?"
+"A folytatáshoz nyomja le az \"OK\" gombot."
 
 #: standalone/drakautoinst:60
 #, c-format
@@ -16839,14 +18051,16 @@ msgid "Creating auto install floppy"
 msgstr "Automatikus telepítőfloppy készítése"
 
 #: standalone/drakautoinst:90
-#, fuzzy, c-format
+#, c-format
 msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba"
+msgstr ""
+"Tegyen egy másik üres floppyt a(z) \"%s\" meghajtóba (a meghajtóprogramok "
+"számára)"
 
 #: standalone/drakautoinst:91
-#, fuzzy, c-format
+#, c-format
 msgid "Creating auto install floppy (drivers disk)"
-msgstr "Automatikus telepítőfloppy készítése"
+msgstr "Automatikus telepítőfloppy készítése (meghajtóprogramok)"
 
 #: standalone/drakautoinst:158
 #, c-format
@@ -16861,8 +18075,8 @@ msgstr ""
 "\n"
 "Az automatikus telepítés paraméterei a bal oldalon érhetők el"
 
-#: 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 "Gratulálunk!"
@@ -16901,35 +18115,30 @@ msgstr "merevlemez"
 msgid "tape"
 msgstr "szalag"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Eszköz nem található"
-
-#: 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 ""
-"Az Expect egy kiterjesztés a Tcl szkriptnyelvhez. A használatával "
+"Az Expect egy kiterjesztés a TCL szkriptnyelvhez. A használatával "
 "létrehozhatók felhasználói beavatkozás nélküli interaktív munkafolyamatok."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "A rendszer jelszavának eltárolása a DrakBackup beállításai közt."
 
-#: 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 ""
-"Többszakaszos CD esetén csak az első szakasz törli a CD-RW adathordozót. "
-"Egyéb esetben a CD-RW adathordozó minden mentés előtt törlésre kerül."
+"Többszakaszos CD esetén csak az első szakasz törli a CD-RW-adathordozót. "
+"Egyéb esetben a CD-RW-adathordozó minden mentés előtt törlésre kerül."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16938,7 +18147,7 @@ msgstr ""
 "Ez az opció a módosult fájlok mentését jelenti. A működés pontos módja attól "
 "függ, hogy inkrementális vagy differenciális-e a mentés."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -16947,7 +18156,7 @@ msgstr ""
 "Inkrementális mentés esetén csak azok a fájlok kerülnek mentésre, amelyek "
 "módosultak vagy újonnan jöttek létre a legutóbbi mentés óta."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16956,17 +18165,16 @@ msgstr ""
 "Differenciális mentés esetén csak azok a fájlok kerülnek mentésre, amelyek "
 "módosultak vagy újonnan jöttek létre az eredeti alapmentés óta."
 
-#: standalone/drakbackup:158
-#, fuzzy, c-format
+#: 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 ""
-"Azon helyi felhasználók illetve email-címek vesszővel elválasztott listája, "
-"ahova a mentési eredményeket el kell küldeni. Ehhez egy működőképes "
-"levelezőprogram (MTA) szükséges."
+"Azon helyi felhasználó illetve email-cím, akinek illetve ahova a mentési "
+"eredményeket el kell küldeni. Ehhez egy levelezőkiszolgáló is szükséges."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16975,7 +18183,7 @@ msgstr ""
 "Egy könyvtárfa tetején levő .backupignore fájlban szereplő fájlok (minták is "
 "megadhatók) nem kerülnek mentésre."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16985,9 +18193,9 @@ msgstr ""
 "A fájlok egyéb adathordozókra való mentés esetén is a merevlemezen vannak "
 "létrehozva, majd onnan kerülnek át a megfelelő adathordozóra. Az opció "
 "bekapcsolása esetén a mentés után el lesznek távolítva a merevlemezről a "
-"'tar' fájlok."
+"'tar'-fájlok."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16998,7 +18206,7 @@ msgstr ""
 "A szolgáltatás útvonalának a 'modul' nevét kell megadni (nem pedig könyvtár-"
 "útvonalat)."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17007,50 +18215,53 @@ msgstr ""
 "Az egyéni beállítás lehetővé teszi a dátum és az időpont megadását. A többi "
 "lehetőség a /etc/crontab fájlban levő run-parts bejegyzéseket használja."
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
-msgstr ""
+msgstr "Nincs kiválasztva adathordozó az időzített tevékenységhez."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
-msgstr ""
+msgstr "Nincs kiválasztva intervallum az időzített tevékenységhez."
 
-#: standalone/drakbackup:377
-#, fuzzy, c-format
+#: standalone/drakbackup:378
+#, c-format
 msgid "Interval cron not available as non-root"
-msgstr "A Cron egyelőre csak a rendszergazda számára elérhető"
+msgstr "Az intervallumos Cron-időzítés csak a rendszergazda számára elérhető"
 
-#: 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\": email-címként helytelen, helyi felhasználóként pedig nem létezik."
 
-#: 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\" egy helyi felhasználó, de mivel nem lett kiválasztva helyi SMTP, "
+"ezért teljes email-címet kell használni."
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 "Az érvényes felhasználói lista változott - a beállítási fájl módosítása."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Régi felhasználói lista:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Új felhasználói lista:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17059,7 +18270,7 @@ msgstr ""
 "\n"
 "                      DrakBackup jelentés \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17068,7 +18279,7 @@ msgstr ""
 "\n"
 "                      DrakBackup szolgáltatás - jelentés\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17081,62 +18292,62 @@ 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 "Teljes előrehaladás"
 
-#: standalone/drakbackup:609
-#, fuzzy, c-format
+#: standalone/drakbackup:610
+#, c-format
 msgid ""
 "%s exists, delete?\n"
 "\n"
 "If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
-"%s létezik, törölhető?\n"
+"\"%s\" létezik. Törölhető?\n"
 "\n"
-"Figyelmeztetés: Ha már elvégezte ezt korábban, akkor elképzelhető,\n"
-"hogy a kiszolgálón el kell távolítani a bejegyzést az engedélyezett\n"
+"Ha már elvégezte ezt korábban, akkor elképzelhető, hogy a\n"
+"kiszolgálón el kell távolítani a bejegyzést az engedélyezett\n"
 "kulcsok (authorized_keys) közül."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "A kulcsok előállítása hosszabb ideig is eltarthat."
 
-#: standalone/drakbackup:625
-#, fuzzy, c-format
+#: standalone/drakbackup:626
+#, c-format
 msgid "Cannot spawn %s."
-msgstr "HIBA: Nem hajtható végre: %s."
+msgstr "Nem hajtható végre: %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Nincs jelszókérés %s ezen portján: %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Hibás jelszó ezen: %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "\"%s\" nem vihető át ide: \"%s\" - engedély megtagadva"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s nem található itt: %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s nem válaszol"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17152,47 +18363,47 @@ msgstr ""
 "\n"
 "ssh -i %s %s@%s"
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "A távoli WebDAV-hely már szinkronban van."
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "A WebDAV-átvitel sikertelen volt."
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Nincs írható CD/DVD a meghajtóban."
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Úgy tűnik, az adathordozó nem írható."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Az adathordozó nem törölhető."
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Az adathordozó törlése hosszabb ideig is eltarthat."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Probléma a CD-hozzáférési engedélyekkel."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Nincs szalag ebben: %s."
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17201,37 +18412,37 @@ msgstr ""
 "A mentési kvóta túl lett lépve.\n"
 "%d MB felhasználva; %d MB lefoglalva."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Rendszerfájlok mentése..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Fájlok merevlemezes mentése..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Felhasználói fájlok mentése..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Egyéb fájlok mentése..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Merevlemezes mentés folyamatban..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "A mentés nem módosult."
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17242,7 +18453,7 @@ msgstr ""
 "DrakBackup-tevékenységek ezzel: %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17253,22 +18464,19 @@ msgstr ""
 " FTP-kapcsolati probléma: A mentésfájlok FTP-n keresztül történő küldése "
 "sikertelen.\n"
 
-#: standalone/drakbackup:1118
-#, fuzzy, c-format
+#: standalone/drakbackup:1128
+#, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
-"Hiba a fájl FTP-vel való átvitele közben.\n"
-" Ellenőrizze az FTP-vel kapcsolatos beállításokat."
+"Hiba a fájl FTP-vel való átvitele közben. Ellenőrizze az FTP-beállításokat."
 
-#: standalone/drakbackup:1120
-#, fuzzy, c-format
+#: standalone/drakbackup:1130
+#, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr ""
-"fájllista elküldve FTP-n: %s\n"
-" "
+msgstr "fájl elküldve FTP-n: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17279,7 +18487,7 @@ msgstr ""
 "DrakBackup-tevékenységek CD-vel:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17290,25 +18498,22 @@ msgstr ""
 "DrakBackup-tevékenységek szalaggal:\n"
 "\n"
 
-#: standalone/drakbackup:1151
-#, fuzzy, c-format
+#: standalone/drakbackup:1161
+#, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr ""
-"Hiba a sendmail hívása közben.\n"
-"  A jelentés nem lett elküldve.\n"
-"  Ellenőrizze a sendmail beállítását."
+msgstr "Hiba a levélküldés közben. A jelentés nem lett elküldve."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Hiba levélküldés közben. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Katalógus nem hozható létre."
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17317,7 +18522,7 @@ msgstr ""
 "\n"
 "Jelölje be azokat az opciókat, amelyekre szüksége van.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17325,37 +18530,37 @@ msgstr ""
 "Ezekkel a funkciókkal a /etc könyvtár összes fájlja elmenthető illetve "
 "visszatölthető.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Rendszerfájlok mentése (/etc könyvtár)"
 
-#: 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 ""
 "Inkrementális/differenciális mentések használata (a korábbi mentések nem "
 "lesznek felülírva)"
 
-#: 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 "Inkrementális mentések használata"
 
-#: 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 "Differenciális mentések használata"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "A kritikus fájlok kihagyása (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17364,179 +18569,179 @@ msgstr ""
 "Ezzel az opcióval a /etc könyvtár bármely állapota\n"
 "visszatölthető lesz."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Jelölje ki az összes felhasználót, amelynek adatait menteni szeretné."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "A böngésző-gyorstár kihagyása"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 "Válassza ki a fájlokat illetve könyvtárakat, majd kattintson az \"OK\" gombra"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Kijelöltek eltávolítása"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Felhasználók"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Mentés hálózati kapcsolaton keresztül"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Hálózati mód:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Expect használata SSH-hoz"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Mentési kulcsok létrehozása/átvitele SSH-hoz"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Átvitel most"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "A többi (nem DrakBackup-) kulcs már a helyére került"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Gépnév vagy IP-cím"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 "A könyvtár (vagy modul), amelybe a mentésfájlok kerüljenek ezen a gépen"
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Bejelentkezési név"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Emlékezzen a jelszóra"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Meg kell adni egy gépnevet, egy felhasználónevet és egy jelszót."
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Mentés CD-re/DVD-re"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
-msgstr "Adja meg a CD/DVD eszközt"
+msgstr "Adja meg a CD-/DVD-eszközt"
 
-#: standalone/drakbackup:1750
-#, fuzzy, c-format
+#: standalone/drakbackup:1764
+#, c-format
 msgid "Choose your CD/DVD media size"
-msgstr "Adja meg a CD/DVD adathordozó méretét (MB)"
+msgstr "Adja meg a CD-/DVD-adathordozó méretét"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Többszakaszos CD"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
-msgstr "CD-RW adathordozó"
+msgstr "CD-RW-adathordozó"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Az újraírható adathordozó törlése (1. szakasz)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Törlés most "
 
-#: standalone/drakbackup:1772
-#, fuzzy, c-format
+#: standalone/drakbackup:1786
+#, c-format
 msgid "DVD+RW media"
-msgstr "CD-RW adathordozó"
+msgstr "DVD+RW-adathordozó"
 
-#: standalone/drakbackup:1774
-#, fuzzy, c-format
+#: standalone/drakbackup:1788
+#, c-format
 msgid "DVD-R media"
-msgstr "CD-RW adathordozó"
+msgstr "DVD-R-adathordozó"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
-msgstr "DVD-RAM eszköz"
+msgstr "DVD-RAM-eszköz"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "CD-eszköz nincs definiálva."
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Mentés szalagra"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "A mentéshez használandó eszköznév"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Mentés közvetlenül szalagra"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Mentés után ne legyen visszatekerve a szalag"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "A szalag törlése mentés előtt"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "A szalag kiadása mentés után"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Adja meg a könyvtárt, ahova menteni kell:"
 
-#: standalone/drakbackup:1946
-#, fuzzy, c-format
+#: standalone/drakbackup:1966
+#, c-format
 msgid "Directory to save to"
-msgstr "Adja meg a könyvtárt, ahova menteni kell:"
+msgstr "A könyvtár, ahova menteni kell"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17545,311 +18750,310 @@ msgstr ""
 "A DrakBackup program számára\n"
 "engedélyezett maximális méret (MB)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Merevlemez / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "óránként"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "naponta"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "hetente"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "havonta"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "egyéni"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Január"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Február"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Március"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Április"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Május"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Június"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Július"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Augusztus"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Szeptember"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Október"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "November"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "December"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Hétfő"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Péntek"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Szombat"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Szolgáltatás használata"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Adja meg a mentések közti időintervallumot"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Egyéni beállítás/crontab-bejegyzés:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Perc"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Óra"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Nap"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Hónap"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "A hét napja"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Adja meg a mentési médiumot"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Győződjön meg arról, hogy a cron szolgáltatás aktiválva van."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Megjegyzés: jelenleg az összes \"hálózati\" médium a merevlemezt is "
 "használja."
 
-#: standalone/drakbackup:2190
-#, fuzzy, c-format
+#: standalone/drakbackup:2201
+#, c-format
 msgid "Please choose the compression type"
-msgstr "adja meg a visszatöltési dátumot"
+msgstr "Adja meg a tömörítés típusát"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "A .backupignore fájlok használata"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Levél küldése minden mentés után ide:"
 
-#: standalone/drakbackup:2202
-#, fuzzy, c-format
+#: standalone/drakbackup:2213
+#, c-format
 msgid "SMTP server for mail:"
-msgstr "Az SMB-kiszolgáló neve"
+msgstr "SMTP-kiszolgáló a levelezéshez:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
-"A merevlemezen levő \"tar\" fájlok törlése más médiumra való mentés után"
+"A merevlemezen levő \"tar\"-fájlok törlése más médiumra való mentés után"
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Mit"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Hova"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Mikor"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "További opciók"
 
-#: standalone/drakbackup:2275
-#, fuzzy, c-format
+#: standalone/drakbackup:2286
+#, c-format
 msgid "Backup destination not configured..."
-msgstr "Hálózati funkciók nincsenek beállítva"
+msgstr "A mentési cél nincs beállítva..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "A DrakBackup beállítása"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Válassza ki, hogy hova szeretne menteni"
 
-#: standalone/drakbackup:2311
-#, fuzzy, c-format
+#: standalone/drakbackup:2325
+#, c-format
 msgid "Hard Drive used to prepare backups for all media"
-msgstr ""
-"A merevlemezen levő \"tar\" fájlok törlése más médiumra való mentés után"
+msgstr "Mentés merevlemezre minden adathordozó esetében"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "Hálózaton keresztül"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "CD-re"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "Szalagos eszközre"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "A felhasználók adatainak mentése"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (Alapértelmezésben: minden felhasználó)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Válassza ki, hogy mit szeretne menteni"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "A rendszer mentése"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Felhasználó kézi kiválasztása"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Válassza ki a mentendő adatokat..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -17858,7 +19062,7 @@ msgstr ""
 "\n"
 "Mentési források: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -17867,7 +19071,7 @@ msgstr ""
 "\n"
 "- Rendszerfájlok:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -17876,7 +19080,7 @@ msgstr ""
 "\n"
 "- Felhasználói fájlok:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -17885,7 +19089,7 @@ msgstr ""
 "\n"
 "- Egyéb fájlok:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -17894,31 +19098,21 @@ msgstr ""
 "\n"
 "- Mentés merevlemezre a következő helyre: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLemezhasználat korlátozása %s MB-ra\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 "\n"
-"- A merevlemezen levő \"tar\" fájlok törlése mentés után.\n"
-
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NEM"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "IGEN"
+"- A merevlemezen levő \"tar\"-fájlok törlése mentés után.\n"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -17927,22 +19121,22 @@ msgstr ""
 "\n"
 "- Írás CD-re"
 
-#: 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 " ezen az eszközön: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (többszakaszos)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -17951,12 +19145,17 @@ msgstr ""
 "\n"
 "- Mentés szalagra ezen az eszközön: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tTörlés=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tMentés közvetlenül szalagra\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -17965,7 +19164,7 @@ msgstr ""
 "\n"
 "- Mentés ezzel: \"%s\" a következő gépre: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17974,7 +19173,7 @@ msgstr ""
 "\t\t felhasználónév: %s\n"
 "\t\t útvonal: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -17983,42 +19182,42 @@ msgstr ""
 "\n"
 "- Beállítások:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tA rendszerfájlok kihagyása\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\ttar és bzip2 használata a mentésekhez\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\ttar és gzip használata a mentésekhez\n"
 
-#: standalone/drakbackup:2523
-#, fuzzy, c-format
+#: standalone/drakbackup:2520
+#, c-format
 msgid "\tBackups use tar only\n"
-msgstr "\ttar és gzip használata a mentésekhez\n"
+msgstr "\tCsak a Tar használata a mentésekhez\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tA .backupignore fájlok használata\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tLevél küldése ide: %s\n"
 
-#: standalone/drakbackup:2527
-#, fuzzy, c-format
+#: standalone/drakbackup:2524
+#, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "Ezen a CUPS-kiszolgálón: \"%s\""
+msgstr "\t%s SMTP-kiszolgáló használata\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18027,47 +19226,47 @@ msgstr ""
 "\n"
 "- Szolgáltatás (%s), ezzel:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Merevlemez\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Szalag \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Hálózat FTP-vel\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Hálózat SSH-val\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Hálózat rsync használatával\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Hálózat webdav használatával\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Nincs beállítás. Használja a varázslót vagy a Speciális opciót.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18076,33 +19275,27 @@ msgstr ""
 "A visszatöltendő adatok listája:\n"
 "\n"
 
-#: standalone/drakbackup:2545
-#, fuzzy, c-format
+#: standalone/drakbackup:2542
+#, c-format
 msgid "- Restore System Files.\n"
-msgstr ""
-"\n"
-"- Rendszerfájlok:\n"
+msgstr "- Rendszerfájlok visszaállítása.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
-msgstr ""
+msgstr "   - ezen dátumtól: %s %s\n"
 
-#: standalone/drakbackup:2550
-#, fuzzy, c-format
+#: standalone/drakbackup:2547
+#, c-format
 msgid "- Restore User Files: \n"
-msgstr ""
-"\n"
-"- Felhasználói fájlok:\n"
+msgstr "- Felhasználói fájlok visszaállítása: \n"
 
-#: standalone/drakbackup:2555
-#, fuzzy, c-format
+#: standalone/drakbackup:2552
+#, c-format
 msgid "- Restore Other Files: \n"
-msgstr ""
-"\n"
-"- Egyéb fájlok:\n"
+msgstr "- Egyéb fájlok visszaállítása: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18111,134 +19304,136 @@ msgstr ""
 "A sérült adatok listája:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "A következő alkalommal szüntesse meg a kijelölést vagy törölje."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "A mentésfájlok sérültek"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Az összes kijelölt adat          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          vissza lett töltve ide: %s       "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Beállítás visszatöltése       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Az egyéb fájlok is visszatölthetők."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "A visszatöltendő felhasználók (csak a legutóbbi dátumok lényegesek)"
 
-#: standalone/drakbackup:3000
-#, fuzzy, c-format
+#: standalone/drakbackup:2994
+#, c-format
 msgid "Please choose the date to restore:"
-msgstr "adja meg a visszatöltési dátumot"
+msgstr "Adja meg a visszatöltési dátumot:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Visszatöltés merevlemezről"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Adja meg a könyvtárt, ahol a mentések vannak"
 
-#: standalone/drakbackup:3043
-#, fuzzy, c-format
+#: standalone/drakbackup:3037
+#, c-format
 msgid "Directory with backups"
-msgstr "Az összes mentés visszatöltése"
+msgstr "A mentések könyvtára"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Válasszon más médiumot a visszatöltéshez"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Egyéb médium"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Rendszer visszatöltése"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Felhasználók visszatöltése"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Egyéb adatok visszatöltése"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "válassza ki a visszatöltendő útvonalat (a / helyett)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
-#, fuzzy, c-format
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#, c-format
 msgid "Path To Restore To"
-msgstr "Egyéni visszatöltés"
+msgstr "A visszatöltési célhely"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Új mentés készítése visszatöltés előtt (csak inkrementális mentéshez)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Felhasználói könyvtárak törlése visszatöltés előtt"
 
-#: standalone/drakbackup:3201
-#, fuzzy, c-format
+#: standalone/drakbackup:3196
+#, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "Keresendő fájlnév-szöveg:"
+msgstr "Keresendő fájlnév-részszöveg (az üres szöveg mindenre illeszkedik):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Mentések keresése"
 
-#: standalone/drakbackup:3223
-#, fuzzy, c-format
+#: standalone/drakbackup:3217
+#, c-format
 msgid "No matches found..."
-msgstr "Képfájl (image) nem található"
+msgstr "Nincs találat..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "A kijelöltek visszaállítása"
 
-#: 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 ""
+"A mentésfájlok megjelenítéséhez kattintson a dátumra/időre.\n"
+"Több fájl kijelöléséhez használja a Ctrl+kattintás módszert."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18247,7 +19442,7 @@ msgstr ""
 "A kijelölt katalógus-\n"
 "bejegyzés visszaállítása"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18256,17 +19451,17 @@ msgstr ""
 "A kijelölt fájlok\n"
 "visszaállítása"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Mentésfájlok nem találhatók itt: %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Visszatöltés CD-ről"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18275,17 +19470,17 @@ msgstr ""
 "Helyezze be a(z) \"%s\" címkéjű CD-t\n"
 " a /mnt/cdrom csatolási pont alatti CD-meghajtóba"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Nem a megfelelő címkéjű CD. A CD címkéje: %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Visszatöltés szalagról"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18294,220 +19489,220 @@ msgstr ""
 "Helyezze be a(z) \"%s\" címkéjű szalagot\n"
 " a(z) %s szalagos meghajtóba"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Nem a megfelelő címkéjű szalag. A szalag címkéje: %s."
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Visszatöltés hálózaton keresztül"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Visszatöltés a(z) %s hálózati protokollon keresztül"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Gépnév"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Gép-útvonal vagy modul"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Felhasználónév szükséges"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Gépnév szükséges"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Útvonal vagy modul megadása szükséges"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Fájlok visszaállítva..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "A visszaállítás sikertelen volt..."
 
-#: standalone/drakbackup:3549
-#, fuzzy, c-format
+#: standalone/drakbackup:3543
+#, c-format
 msgid "%s not retrieved..."
-msgstr "%s nem található\n"
+msgstr "\"%s\" nem lett visszatöltve..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Visszatöltendő fájlok keresése"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Az összes mentés visszatöltése"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Egyéni visszatöltés"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Visszaállítás a katalógusból"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Visszatölthető mentés nem található.\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Ellenőrizze, hogy %s a helyes útvonal-e"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " és a CD a meghajtóban van-e"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "A mentési adathordozó nem csatolható - visszaállításhoz használja a "
 "katalógust"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "A CD a helyén van - folytatás."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Átlépés egy másik visszaállítási tárhelyre."
 
-#: standalone/drakbackup:3811
-#, fuzzy, c-format
+#: standalone/drakbackup:3828
+#, c-format
 msgid "Directory To Restore From"
-msgstr "Visszatöltés CD-ről"
+msgstr "A visszatöltési forráskönyvtár"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "A visszaállítás folyamata"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Mentés"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Mentésfájlok elkészítése"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Visszatöltés"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "A következő csomagokat szükséges telepíteni:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Válassza ki a visszatöltendő adatokat..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Rendszerfájlok mentése"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Felhasználói fájlok mentése"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Egyéb fájlok mentése"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Előrehaladás"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Fájlok küldése FTP-vel"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Fájlok küldése..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Mentés most a beállítások alapján"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Mentési beállítások megtekintése."
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Beállítás a varázslóval"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Speciális beállítások"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Beállítás megjelenítése"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "A legutóbbi napló megjelenítése"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Mentés most"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18516,68 +19711,76 @@ msgstr ""
 "Beállítási fájl nem található. \n"
 "Használja a varázslót vagy a Speciális opciót."
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "DrakBackup"
 
-#: standalone/drakboot:58
-#, fuzzy, c-format
+#: standalone/drakboot:64
+#, c-format
 msgid "Graphical boot theme selection"
-msgstr "A nyomtató típusának kiválasztása"
+msgstr "A grafikus rendszerindítás témájának kiválasztása"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Rendszermód"
 
-#: 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 "/_Fájl"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fájl/Ki_lépés"
 
-#: 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 "Témák telepítése"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Új téma létrehozása"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
-msgstr ""
+msgstr "Grafikus rendszerindítás használata"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
+"A rendszerindító nem framebuffer-módban van. Ha szeretné aktiválni a "
+"grafikus rendszerindítást, akkor válasszon ki egy grafikus videomódot a "
+"rendszerindító beállítási eszközében."
+
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Szeretné most beállítani?"
 
-#: standalone/drakboot:164
-#, fuzzy, c-format
+#: standalone/drakboot:177
+#, c-format
 msgid "Theme"
-msgstr "Témák"
+msgstr "Téma"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18586,154 +19789,134 @@ msgstr ""
 "Téma megjelenítése\n"
 "a konzolon"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Rendszerindításkor induljon el a grafikus környezet"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Ne legyen automatikus bejelentkezés"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Legyen automatikus bejelentkezés (felhasználónév, grafikus környezet)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Alapértelmezett felhasználó"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Alapértelmezett munkaasztal"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "A(z) %s telepítése nem sikerült a következő hiba miatt:"
-
-#: 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 ""
-"Hibajelentés küldéséhez kattintson a \"Bejelentés\" gombra.\n"
-"Ekkor megjelenik a(z) \"%s\" weboldal egy böngészőablakban,\n"
-"ahol egy kitöltendő űrlap lesz látható. A fenti információk el lesznek\n"
-"küldve azon kiszolgálónak."
+"Válasszon videomódot. A választott mód alkalmazva lesz az összes kijelölt "
+"rendszerindítási bejegyzésre.\n"
+"Csak olyan módot válasszon, amelyet támogat a videokártya."
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake hibabejelentő program"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinux hibabejelentő program"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake Vezérlőközpont"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux Vezérlőközpont"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Szinkronizáló program"
 
-#: 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 "Önálló eszközök"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, c-format
-msgid "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 "Távirányítás"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Szoftvercsomag-kezelő"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows migrációs program"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "UserDrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Beállítási varázslók"
 
-#: 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 ""
-"Hibajelentés küldéséhez kattintson a \"Bejelentés\" gombra.\n"
-"Ekkor megjelenik az Anthill weboldal egy böngészőablakban,\n"
-"ahol a fenti információk elküldhetők hibabejelentésként."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Alkalmazás:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Csomag: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Kernel:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Kiadás: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -18742,163 +19925,189 @@ msgstr ""
 "Alkalmazásnév\n"
 "vagy teljes útvonal:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Csomag keresése"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Összefoglalás: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "AZ ÖN SZÖVEGÉNEK HELYE"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Hibaleírás/rendszerinformáció"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "AZ ÖN SZÖVEGÉNEK HELYE"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "A kernelverzió küldése"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "cpuinfo lista küldése"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "lspci lista küldése"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"Hibajelentés küldéséhez kattintson a \"Bejelentés\" gombra.\n"
+"Ekkor megjelenik a(z) \"%s\" weboldal egy böngészőablakban,\n"
+"ahol egy kitöltendő űrlap lesz látható. A fenti információk el lesznek\n"
+"küldve azon kiszolgálónak."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Bejelentés"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Nincs telepítve"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "A csomag nincs telepítve"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NEM TALÁLHATÓ"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "csatlakozás ehhez: %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Nincs elérhető böngésző. Telepítsen egyet."
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Adjon meg egy csomagnevet."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Adja meg az összefoglaló szöveget."
 
-#: standalone/drakclock:29
-#, fuzzy, c-format
+#: standalone/drakclock:30
+#, c-format
 msgid "DrakClock"
-msgstr "DrakBackup"
+msgstr "DrakClock"
 
-#: standalone/drakclock:39
-#, fuzzy, c-format
+#: standalone/drakclock:40
+#, c-format
 msgid "not defined"
 msgstr "nincs beállítva"
 
-#: standalone/drakclock:41
-#, fuzzy, c-format
+#: standalone/drakclock:42
+#, c-format
 msgid "Change Time Zone"
-msgstr "Időzóna"
+msgstr "Időzóna módosítása"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Időzóna - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
-#, fuzzy, c-format
+#: standalone/drakclock:48
+#, c-format
 msgid "Is your hardware clock set to GMT?"
-msgstr "A gép órája GMT-időt mutat"
+msgstr "A gép órája GMT-időt mutat?"
 
-#: standalone/drakclock:79
-#, fuzzy, c-format
+#: standalone/drakclock:76
+#, c-format
 msgid "Network Time Protocol"
-msgstr "Hálózati csatolófelület"
+msgstr "Hálózati időprotokoll (NTP)"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
+"Az NTP segítségével a számítógép szinkronizálhatja\n"
+"az óráját egy távoli időkiszolgálóval."
 
-#: standalone/drakclock:82
-#, fuzzy, c-format
+#: standalone/drakclock:79
+#, c-format
 msgid "Enable Network Time Protocol"
-msgstr "Visszatöltés a(z) %s hálózati protokollon keresztül"
+msgstr "Hálózati időprotokoll (NTP) bekapcsolása"
 
-#: standalone/drakclock:90
-#, fuzzy, c-format
+#: standalone/drakclock:87
+#, c-format
 msgid "Server:"
-msgstr "Kiszolgáló: "
+msgstr "Kiszolgáló:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
-#, fuzzy, c-format
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "Nem sikerült szinkronizálni ezzel: %s."
+
+#: standalone/drakclock:147 standalone/drakclock:157
+#, c-format
 msgid "Reset"
-msgstr "Nem fogadom el"
+msgstr "Visszaállítás"
 
-#: 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 ""
+"A hálózati időprotokoll (NTP)\n"
+"használatához telepíteni kell\n"
+"az ntp csomagot.\n"
+"\n"
+"Szeretné telepíteni?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Hálózatbeállítás (%d csatoló)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Átjáró (gateway):"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Csatoló:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Kis türelmet"
@@ -18908,12 +20117,8 @@ msgstr "Kis türelmet"
 msgid "Interface"
 msgstr "Csatoló"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Meghajtó"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Állapot"
@@ -18928,7 +20133,7 @@ msgstr "Gépnév: "
 msgid "Configure hostname..."
 msgstr "Gépnév beállítása..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "A helyi hálózat beállítása"
@@ -18938,118 +20143,124 @@ msgstr "A helyi hálózat beállítása"
 msgid "Configure Local Area Network..."
 msgstr "A helyi hálózat beállítása..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Alkalmazás"
 
 #: standalone/drakconnect:197
-#, fuzzy, c-format
+#, c-format
 msgid "Manage connections"
-msgstr "Kábeles kapcsolat"
+msgstr "Kapcsolatok kezelése"
 
-#: standalone/drakconnect:218
-#, fuzzy, c-format
+#: standalone/drakconnect:224
+#, c-format
 msgid "Device selected"
-msgstr "Kijelöltek eltávolítása"
+msgstr "Kijelölt eszköz"
 
-#: standalone/drakconnect:314
-#, fuzzy, c-format
+#: standalone/drakconnect:305
+#, c-format
 msgid "IP configuration"
-msgstr "CUPS-beállítások"
+msgstr "IP-beállítás"
 
-#: standalone/drakconnect:351
-#, fuzzy, c-format
+#: standalone/drakconnect:342
+#, c-format
 msgid "DNS servers"
-msgstr "DNS-kiszolgáló"
+msgstr "DNS-kiszolgálók"
 
-#: standalone/drakconnect:359
-#, fuzzy, c-format
+#: standalone/drakconnect:350
+#, c-format
 msgid "Search Domain"
-msgstr "NIS-tartomány"
+msgstr "Keresési tartomány"
 
-#: standalone/drakconnect:367
-#, fuzzy, c-format
+#: standalone/drakconnect:358
+#, c-format
 msgid "static"
-msgstr "Automatikus IP-cím"
+msgstr "statikus"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
-#, fuzzy, c-format
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Mérték"
+
+#: standalone/drakconnect:491
+#, c-format
 msgid "Flow control"
-msgstr "<control>S"
+msgstr "Áramlásvezérlés"
 
-#: standalone/drakconnect:494
-#, fuzzy, c-format
+#: standalone/drakconnect:492
+#, c-format
 msgid "Line termination"
-msgstr "Internetes munkaállomás"
+msgstr "Sorvége"
 
-#: standalone/drakconnect:505
-#, fuzzy, c-format
+#: standalone/drakconnect:503
+#, c-format
 msgid "Modem timeout"
-msgstr "A parancsértelmező várakozási ideje"
+msgstr "A modem várakozási ideje"
 
-#: standalone/drakconnect:509
-#, fuzzy, c-format
+#: standalone/drakconnect:507
+#, c-format
 msgid "Use lock file"
-msgstr "Fájlválasztás"
+msgstr "Zárolási fájl használata"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "Tárcsázás előtt várakozás a vonalhangra"
 
-#: standalone/drakconnect:514
-#, fuzzy, c-format
+#: standalone/drakconnect:512
+#, c-format
 msgid "Busy wait"
-msgstr "Kuvait"
+msgstr "Várakozás foglaltság esetén"
 
-#: standalone/drakconnect:519
-#, fuzzy, c-format
+#: standalone/drakconnect:517
+#, c-format
 msgid "Modem sound"
-msgstr "Modem"
+msgstr "Modemhang"
 
-#: standalone/drakconnect:520
-#, fuzzy, c-format
+#: standalone/drakconnect:518
+#, c-format
 msgid "Enable"
-msgstr "Engedélyezés"
+msgstr "Bekapcsolás"
 
-#: standalone/drakconnect:520
-#, fuzzy, c-format
+#: standalone/drakconnect:518
+#, c-format
 msgid "Disable"
-msgstr "Letiltás"
+msgstr "Kikapcsolás"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Médiaosztály"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Modulnév"
 
-#: standalone/drakconnect:573
-#, fuzzy, c-format
+#: standalone/drakconnect:571
+#, c-format
 msgid "Mac Address"
-msgstr "Broadcast-cím:"
+msgstr "MAC-cím"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "Busz"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "A buszon elfoglalt hely"
 
-#: 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 "
@@ -19058,74 +20269,74 @@ msgstr ""
 "Nem található Ethernet hálózati csatoló a rendszerben. Futtassa a "
 "hardverbeállítási eszközt."
 
-#: standalone/drakconnect:651
-#, fuzzy, c-format
+#: standalone/drakconnect:678
+#, c-format
 msgid "Remove a network interface"
-msgstr "Hálózati csatoló kiválasztása"
+msgstr "Hálózati csatoló eltávolítása"
 
-#: standalone/drakconnect:655
-#, fuzzy, c-format
+#: standalone/drakconnect:682
+#, c-format
 msgid "Select the network interface to remove:"
-msgstr "Hálózati csatoló kiválasztása"
+msgstr "Válassza ki az eltávolítandó hálózati csatolót:"
 
-#: standalone/drakconnect:679
-#, fuzzy, c-format
+#: 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 ""
-"Hiba történt a hálózatkezelés újraindításakor: \n"
+"Hiba történt a(z) \"%s\" hálózati csatoló eltávolításakor:\n"
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
-msgstr ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "A(z) \"%s\" hálózati csatoló el lett távolítva."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Nincs IP-cím"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Nincs maszk"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
-msgstr ""
+msgstr "aktív"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
-#, fuzzy, c-format
+#: standalone/drakconnect:734 standalone/drakconnect:914
+#, c-format
 msgid "down"
-msgstr "kész"
+msgstr "inaktív"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Nincs csatlakozva"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "A kapcsolat bontása..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Csatlakozás..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19134,17 +20345,17 @@ msgstr ""
 "Figyelmeztetés: Egy másik internetkapcsolat is létezik, esetlegesen a "
 "hálózatot használva."
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Deaktiválás most"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Aktiválás most"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19153,84 +20364,104 @@ msgstr ""
 "Egyetlen csatoló sincs beállítva.\n"
 "A beállítás elvégzéséhez kattintson a \"Beállítás\" gombra."
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "A helyi hálózat beállítása"
 
 # $vbox_local->pack_start(new Gtk::Label(_("Adapter %s: %s", $_+1 , "eth$_")),1,1,0);
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "%s. csatoló: %s"
 
 # [_("Boot Protocol"), \$intf->{"eth$_"}{BOOTPROTO}, ["static", "dhcp", "bootp"]],
 # nem csak IP-címkiosztást végeznek
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Beállítási protokoll"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Automatikus indítás"
 
-#: standalone/drakconnect:868
-#, fuzzy, c-format
+#: 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 ""
 "Ez a csatoló még nem lett beállítva.\n"
-"A beállítóvarázslót a főablakban indíthatja el."
+"Használja a \"Csatoló felvétele\" funkciót a Mandrakelinux Vezérlőközpontban."
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
-#, fuzzy, c-format
+#. -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 ""
-"Nincs beállítva egyetlen internetkapcsolat sem.\n"
-"Kapcsolat létrehozásához kattintson a \"Beállítás\" gombra."
+"Internetkapcsolat még nem lett beállítva.\n"
+"Használja a \"Csatoló felvétele\" funkciót a Mandrakelinux Vezérlőközpontban."
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internetkapcsolat beállítása"
 
-#: standalone/drakconnect:949
-#, fuzzy, c-format
+#: standalone/drakconnect:1000
+#, c-format
 msgid "Third DNS server (optional)"
-msgstr "Elsődleges DNS-kiszolgáló (nem kötelező)"
+msgstr "Harmadlagos DNS-kiszolgáló (nem kötelező)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internetkapcsolat beállítása"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Internet-hozzáférés"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "A csatlakozás típusa: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Állapot:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (GNOME bejelentkezéskezelő)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (KDE bejelentkezéskezelő)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Mandrakelinux bejelentkezéskezelő)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X bejelentkezéskezelő)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Bejelentkezéskezelő kiválasztása"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19241,92 +20472,101 @@ msgstr ""
 "bejelentkezést az X grafikus rendszer segítségével. Támogatja több X\n"
 "rendszer azonos gépen történő egyidejű futtatását is."
 
-#: 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 "A módosítás megtörtént. Szeretné újraindítani a dm szolgáltatást?"
 
-#: 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 ""
+"Az összes futó program be fog záródni; a jelenlegi munkafolyamat elvész. "
+"Biztos abban, hogy újra szeretné indítani a \"dm\" szolgáltatást?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Rendszerindító lemez készítése"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Általános"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Eszköz"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "A kernel verziója"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Speciális beállítások"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Méret"
 
-#: standalone/drakfloppy:144
-#, fuzzy, c-format
+#: standalone/drakfloppy:139
+#, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Az mkinitrd opcionális argumentumai"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "felülírás"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "a RAID modulok kihagyása"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "ha szükséges"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "a SCSI modulok kihagyása"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Modul hozzáadása"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Modul eltávolítása"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Biztosítsa, hogy a(z) %s eszközben legyen adathordozó"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19335,22 +20575,23 @@ msgstr ""
 "A(z) %s eszközben nincs adathordozó, vagy írásvédett.\n"
 "Helyezzen be egyet, illetve szüntesse meg az írásvédelmet."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Nem sikerült létrehozni új példányt: %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "A floppy elkészítve"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "A rendszerindító floppy elkészítve \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"
@@ -19377,9 +20618,9 @@ msgid "parse all fonts"
 msgstr "az összes betűtípus vizsgálata"
 
 #: standalone/drakfont:210
-#, fuzzy, c-format
+#, c-format
 msgid "No fonts found"
-msgstr "betűtípus nem található"
+msgstr "Betűtípus nem található"
 
 #: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
 #: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
@@ -19389,9 +20630,9 @@ msgid "done"
 msgstr "kész"
 
 #: standalone/drakfont:223
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find any font in your mounted partitions"
-msgstr "a csatolt partíciókon betűtípus nem található"
+msgstr "A csatolt partíciókon betűtípus nem található"
 
 #: standalone/drakfont:256
 #, c-format
@@ -19399,9 +20640,9 @@ msgid "Reselect correct fonts"
 msgstr "Jó betűtípusok ismételt kiválasztása"
 
 #: standalone/drakfont:259
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find any font.\n"
-msgstr "betűtípus nem található\n"
+msgstr "Betűtípus nem található.\n"
 
 #: standalone/drakfont:269
 #, c-format
@@ -19481,7 +20722,7 @@ msgstr ""
 #: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
-msgstr ""
+msgstr "DrakFont"
 
 #: standalone/drakfont:487
 #, c-format
@@ -19493,20 +20734,21 @@ msgstr "Betűtípus-lista"
 msgid "About"
 msgstr "Névjegy"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
-#, fuzzy, c-format
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
+#, c-format
 msgid "Uninstall"
-msgstr "Eltávolítás után"
+msgstr "Eltávolítás"
 
 #: standalone/drakfont:496
-#, fuzzy, c-format
+#, c-format
 msgid "Import"
-msgstr "Betűtípusok importálása"
+msgstr "Importálás"
 
-#: 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"
@@ -19515,9 +20757,17 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
+"Copyright (C) 2001-2002, Mandrakesoft.\n"
+"\n"
+"\n"
+"       DUPONT Sebastien (eredeti verzió)\n"
+"\n"
+"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"\n"
+"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:521
-#, fuzzy, c-format
+#: standalone/drakfont:523
+#, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 " it under the terms of the GNU General Public License as published by\n"
@@ -19539,17 +20789,19 @@ msgstr ""
 "a Free Software Foundation által publikált GNU General Public\n"
 "License 2. vagy annál újabb verziója alapján.\n"
 "\n"
+"\n"
 "A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
 "bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
 "egy BIZONYOS CÉLRA VALÓ ALKALMASSÁG sincs garantálva. További\n"
 "részletek a GNU General Public License-ben.\n"
 "\n"
+"\n"
 "A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
 "Public License-ből; ha nem így történt, írjon a következő címre:\n"
 "Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
+"MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19566,14 +20818,28 @@ msgid ""
 "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
+"Köszönet:\n"
+"\n"
+"  -  pfm2afm\n"
+"     Készítette: Ken Borgendale\n"
+"     Windowsos .pfm-fájl konvertálása .afm (Adobe Font Metrics)-fájllá\n"
+"\n"
+"  -  type1inst\n"
+"     Készítette: James Macnicol\n"
+"     A fonts.dir, a fonts.scale és a Fontmap fájlok elkészítése\n"
+"\n"
+"  -  ttf2pt1\n"
+"     Készítette: Andrew Weeks, Frank Siegert, Thomas Henlich és Sergey "
+"Babkin\n"
+"     TTF-betűkészletek konvertálása afm és pfb formátumba\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Válassza ki, mely alkalmazások fogják használni a betűtípusokat:"
 
-#: standalone/drakfont:557
-#, fuzzy, c-format
+#: standalone/drakfont:559
+#, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
 "install them on your system.\n"
@@ -19584,127 +20850,132 @@ msgstr ""
 "Mielőtt bármilyen betűtípus telepítésébe kezdene, bizonyosodjon meg arról, "
 "hogy van joga azok telepítéséhez illetve használatához.\n"
 "\n"
-"-A betűtípusokat a szokott módon telepítheti. Bizonyos hibás betűtípusok "
+"A betűtípusokat a szokott módon telepítheti. Bizonyos hibás betűtípusok "
 "lefagyaszthatják az X-kiszolgálót."
 
-#: 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 "Általános nyomtatók"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 "Válassza ki a betűtípus-fájlt vagy -könyvtárt, majd kattintson a \"Hozzáadás"
 "\" gombra"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Fájlkijelölés"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Nem jelölt ki egyetlen betűtípust sem"
 
-#: standalone/drakfont:652
-#, fuzzy, c-format
+#: standalone/drakfont:656
+#, c-format
 msgid "Import fonts"
 msgstr "Betűtípusok importálása"
 
-#: standalone/drakfont:657
-#, fuzzy, c-format
+#: standalone/drakfont:661
+#, c-format
 msgid "Install fonts"
-msgstr "Betűtípusok eltávolítása"
+msgstr "Betűtípusok telepítése"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "kattintson ide, ha biztos benne"
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "ide, ha nem"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Kijelölések megszüntetése"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Mindent kijelöl"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Lista eltávolítása"
 
-#: standalone/drakfont:750 standalone/drakfont:769
-#, fuzzy, c-format
+#: standalone/drakfont:754 standalone/drakfont:773
+#, c-format
 msgid "Importing fonts"
 msgstr "Betűtípusok importálása"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Tesztelés"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Betűtípusok másolása a rendszerbe"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Betűtípusok telepítése és konvertálása"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Telepítés után"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "A rendszerben található betűtípusok eltávolítása"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Eltávolítás után"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Internetkapcsolat megosztása"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Csak a 2.4-es és az annál újabb kerneleket támogatjuk."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Az internetkapcsolat megosztása nincs engedélyezve"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -19717,39 +20988,39 @@ msgstr ""
 "\n"
 "Mit szeretne tenni?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "Engedélyezés"
 
-#: 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 "Beállítás újból"
 
-#: 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 "Mégsem"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "A kiszolgálók engedélyezése..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Az internetkapcsolat megosztása most már engedélyezett."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Az internetkapcsolat megosztása engedélyezve van"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -19762,22 +21033,22 @@ msgstr ""
 "\n"
 "Mit szeretne tenni?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "Letiltás"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "A kiszolgálók letiltása..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Az internetkapcsolat-megosztás letiltása megtörtént."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19801,27 +21072,27 @@ msgstr ""
 "csatolókártya szükséges."
 
 # az interface (hálókártya) milyen modult használ
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "\"%s\" csatoló (a felhasznált modul: %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "%s csatoló"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Nem található hálózati csatolókártya a számítógépben."
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Hálózati csatolófelület"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19836,19 +21107,24 @@ msgstr ""
 "\n"
 "A helyi hálózat paraméterei ehhez a csatolóhoz lesznek beállítva."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Hálózati csatoló kiválasztása"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Válassza ki, hogy milyen kártyával csatlakozik a helyi hálózathoz."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Hálózati csatoló már be lett állítva"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19863,22 +21139,22 @@ msgstr ""
 "\n"
 "Elvégezheti Ön is kézzel, de csak ha biztos abban, hogy mit tesz."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automatikus újrakonfigurálás"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Nem (szakértők számára)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Jelenlegi csatolóbeállítás megjelenítése"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Jelenlegi csatolóbeállítás"
@@ -19886,9 +21162,9 @@ msgstr "Jelenlegi csatolóbeállítás"
 # attribution:
 # The attribution of IP addresses, talking about the network: a
 # server gives names to workstations so they can talk.
-# How the IP address is attributed: static (eg: manual config), dhcp,
+# How the IP address is attributed: static (eg: manual config), DHCP,
 # bootp, ...
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19905,7 +21181,7 @@ msgstr ""
 "IP-címkiosztás: %s\n"
 "Meghajtó: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19933,13 +21209,13 @@ msgstr ""
 "Újra is konfigurálható a csatoló illetve beállítható egy DHCP-kiszolgáló.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Helyi hálózati cím"
 
-#: standalone/drakgw:324
-#, fuzzy, c-format
+#: standalone/drakgw:326
+#, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
@@ -19949,101 +21225,101 @@ msgstr ""
 "A DHCP-kiszolgáló beállítása.\n"
 "\n"
 "Itt különböző opciók választhatók ki a DHCP-kiszolgáló beállításához.\n"
-"Ha egy opció jelentését nem ismeri, akkor ne módosítsa azt.\n"
-"\n"
+"Ha egy opció jelentését nem ismeri, akkor ne módosítsa azt."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "A DHCP-kiszolgáló IP-címe"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "A DNS-kiszolgáló IP-címe"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "A belső tartománynév"
 
 # IP Range Lower Limit: The lowest IP address that should be served by a DHCP server.
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "A DHCP-címtartomány kezdete"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "A DHCP-címtartomány vége"
 
 # A lease is the length of time that a DHCP server specifies that a client computer
 #  can use an assigned IP address.
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Az alapértelmezett élettartam (másodpercben)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "A maximális élettartam (másodpercben)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Csatoló és DHCP-kiszolgáló újrakonfigurálása"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "A helyi hálózati cím nem \".0\"-ra végződik, kilépek."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Hálózati címhibát észleltem az aktuális konfigurációban: %s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Beállítás..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "Beállítószkriptek, szoftvertelepítés, szerverek indítása..."
+msgstr "Szkriptek beállítása, szoftvertelepítés, kiszolgálók indítása..."
 
-#: 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 "A(z) %s csomag telepítésénél hiba történt"
 
-#: standalone/drakgw:599
-#, fuzzy, c-format
+#: standalone/drakgw:601
+#, c-format
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
 "Area Network, using automatic network configuration (DHCP) and\n"
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
-"A beállítás sikeresen befejeződött.\n"
-"Az internetkapcsolat most már bármelyik, a helyi hálózaton található géppel "
-"megosztható az automatikus hálózati címkiosztás (DHCP) segítségével."
+"A beállítás befejeződött.\n"
+"Az internetkapcsolat most már bármelyik, a helyi hálózaton található\n"
+"géppel megosztható az automatikus hálózati címkiosztás (DHCP) és egy\n"
+"proxykiszolgáló (például Squid) segítségével."
 
 #: standalone/drakhelp:17
-#, fuzzy, c-format
+#, 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 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
 "\n"
 "Használat: \n"
@@ -20070,7 +21346,12 @@ msgstr ""
 " --doc <link>          - linkelés egy weblapra (az ablakkezelő\n"
 "                         üdvözlőképernyőjéhez)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux segítségrendszer"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20079,7 +21360,7 @@ msgstr ""
 "%s nem jeleníthető meg. \n"
 "Nincs ilyen típusú bejegyzés a dokumentációban.\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20088,66 +21369,66 @@ msgstr ""
 "Nincs telepítve böngésző a gépre. Ha szeretné elérni a segítségrendszert, "
 "telepítsen egy böngészőt."
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Rendszerbeállítások"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Egyéni beállítások"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Egyéni- és rendszerbeállítások"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Szerkeszthető"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Útvonal"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Felhasználó"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Csoport"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Engedélyek"
 
 #: standalone/drakperm:107
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Here you can see files to use in order to fix permissions, owners, and "
 "groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"A Drakperm az \"msec\" által kezelt engedélyeknek, tulajdonosoknak és "
-"csoportoknak a karbantartására használható.\n"
+"Itt láthatók azon fájlok, amelyekkel beállíthatók az \"msec\" által kezelt "
+"engedélyek, tulajdonosok és csoportok.\n"
 "A felhasználó módosíthatja a saját szabályait, felüldefiniálva ezzel az "
 "alapértelmezett szabályokat."
 
 #: standalone/drakperm:110
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The current security level is %s.\n"
 "Select permissions to see/edit"
 msgstr ""
-"A jelenlegi biztonsági szint: %s\n"
-"Válassza ki a megjelenítendő/szerkesztendő engedélyeket"
+"A jelenlegi biztonsági szint: %s.\n"
+"Válassza ki a megjelenítendő/szerkesztendő engedélyeket."
 
 #: standalone/drakperm:121
 #, c-format
@@ -20185,9 +21466,9 @@ msgid "Delete selected rule"
 msgstr "A kijelölt szabály törlése"
 
 #. -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 "Szerkesztés"
@@ -20197,47 +21478,65 @@ msgstr "Szerkesztés"
 msgid "Edit current rule"
 msgstr "Aktuális szabály módosítása"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "Böngészés"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "felhasználó"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "csoport"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "egyéb"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Olvasás"
 
-#: 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 "A fájl olvasásának engedélyezése \"%s\" számára"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Írás"
 
-#: 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 "A fájl írásának engedélyezése \"%s\" számára"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Futtatás"
 
-#: 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 "A fájl végrehajtásának engedélyezése \"%s\" számára"
 
-#: 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"
@@ -20246,52 +21545,52 @@ msgstr ""
 "Könyvtárra használva:\n"
 " csak a könyvtár vagy a benne levő fájl tulajdonosa törölheti"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Más UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "A tulajdonos azonosítójának használata a végrehajtáshoz"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Más GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "Csoportazonosító használata a végrehajtáshoz"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Felhasználó:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Csoport:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Aktuális felhasználó"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Bejelölés esetén a tulajdonos és a csoport nem lesz módosítva"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Útvonal választása"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Tulajdonos"
@@ -20401,7 +21700,7 @@ msgid ""
 "No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
 "Nem található sem CD-, sem DVD-képfájl. Másolja le a telepítőprogramot és az "
-"RPM fájlokat."
+"RPM-fájlokat."
 
 #: standalone/drakpxe:210
 #, c-format
@@ -20421,54 +21720,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Az auto_install.cfg fájl helye"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "MIND"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "HELYI"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
+#: standalone/draksec:53
 #, c-format
-msgid "default"
-msgstr "alapértelmezés"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorálás"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "nem"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "igen"
+msgid "Ignore"
+msgstr "Ignorálá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 "
@@ -20502,35 +21789,34 @@ msgid ""
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 msgstr ""
-"Itt lehet beállítani a biztonsági szintet és a gép biztonsági "
+"Itt lehet beállítani a biztonsági szintet és a gép biztonsági\n"
 "adminisztrátorát.\n"
 "\n"
 "\n"
-"A biztonsági adminisztrátor az a személy, aki a 'Biztonsági "
-"figyelmeztetések'\n"
-"opció bekapcsolt állapota esetén a biztonsággal kapcsolatos "
-"figyelmeztetéseket\n"
+"A <span weight=\"bold\">biztonsági adminisztrátor</span> az a személy,\n"
+"aki a \"<span weight=\"bold\">Biztonsági figyelmeztetések</span>\" opció\n"
+"bekapcsolt állapota esetén a biztonsággal kapcsolatos figyelmeztetéseket\n"
 "meg fogja kapni. Felhasználói névvel vagy email-címmel adható meg.\n"
 "\n"
 "\n"
-"A 'Biztonsági szint' menüben több különböző előre beállított (msec) "
-"biztonsági\n"
-"szint közül lehet választani. A szintek a gyenge biztonságot de könnyebb\n"
-"használhatóságot nyújtótól a paranoiás szintig (az utóbbi a nagyon érzékeny\n"
-"kiszolgálóalkalmazásokhoz használható) terjednek.\n"
+"A \"<span weight=\"bold\">Biztonsági szint</span>\" menüben több\n"
+"különböző előre beállított (az msec program által biztosított)\n"
+"biztonsági szint közül lehet választani. A szintek az\n"
+"<span weight=\"bold\">alacsony</span> biztonságot (de könnyebb\n"
+"használhatóságot) nyújtótól a <span weight=\"bold\">paranoiás</span>\n"
+"szintig (az utóbbi a nagyon érzékeny kiszolgálóalkalmazásokhoz\n"
+"használható) terjednek.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Alacsony</span>: Egyáltalán nem "
-"biztonságos,\n"
-"de könnyű használatot nyújtó biztonsági szint. Csak olyan gépeken javasolt "
-"a\n"
-"használata, amelyek nincsenek hálózatba kötve és csak kevesek által\n"
-"használhatók.\n"
+"<span foreground=\"royalblue3\">Alacsony</span>: Egyáltalán nem\n"
+"biztonságos, de könnyű használatot nyújtó biztonsági szint. Csak\n"
+"olyan gépeken javasolt a használata, amelyek nincsenek hálózatba\n"
+"kötve és csak kevesek által használhatók.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Szabványos</span>: Ez a szabványos\n"
-"biztonsági szint, amely akkor javasolt, ha a gép kliensként fog kapcsolódni\n"
-"az internetre.\n"
+"biztonsági szint, amely akkor javasolt, ha a gép kliensként fog\n"
+"kapcsolódni az internetre.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Magas</span>: Már vannak bizonyos\n"
@@ -20538,71 +21824,65 @@ msgstr ""
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Magasabb</span>: Ez a biztonsági szint\n"
-"már elég magas ahhoz, hogy a gép kiszolgálóként legyen használva - "
-"hálózaton\n"
-"keresztül csatlakozó kliensek kiszolgálására. Ha a gép az interneten csak\n"
-"kliensként van jelen, akkor érdemesebb egy alacsonyabb szintet választani.\n"
+"már elég magas ahhoz, hogy a gép kiszolgálóként legyen használva -\n"
+"hálózaton keresztül csatlakozó kliensek kiszolgálására. Ha a gép az\n"
+"interneten csak kliensként van jelen, akkor érdemesebb egy alacsonyabb\n"
+"szintet választani.\n"
+"\n"
+"\n"
+"<span foreground=\"royalblue3\">Paranoiás</span>: Az előző szinthez\n"
+"hasonló, de itt a rendszer teljesen zárt. Ez a legbiztonságosabb szint."
+
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
 "\n"
+msgstr ""
+"A mezők leírása:\n"
 "\n"
-"<span foreground=\"royalblue3\">Paranoiás</span>: Az előző szinthez "
-"hasonló,\n"
-"de itt a rendszer teljesen zárt. Ez a legbiztonságosabb szint."
 
-#: standalone/draksec:129
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(alapértelmezés: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Biztonsági szint:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Biztonsági figyelmeztetések:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Biztonsági adminisztrátor:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Alapvető beállítások"
 
-#: 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 ""
-"A következő opciókkal be lehet állítani a rendszer biztonságát.\n"
-"Ha magyarázatra van szüksége, olvassa el a tippszöveget.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Hálózati opciók"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Rendszerbeállítások"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Periodikus ellenőrzések"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Biztonsági szint beállítása..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Biztonsági opciók beállítása..."
@@ -20612,7 +21892,8 @@ msgstr "Biztonsági opciók beállítása..."
 msgid "No Sound Card detected!"
 msgstr "Hangkártya nem található."
 
-#: 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-"
@@ -20629,13 +21910,13 @@ msgstr ""
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrake-féle hardver-adatbázis a következő helyen található:\n"
+"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
-#, fuzzy, c-format
+#: standalone/draksound:57
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -20646,8 +21927,9 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"Megjegyzés: ha ISA PnP hangkártyája van, akkor az sndconfig programot kell "
-"használnia. Ehhez adja ki az \"sndconfig\" parancsot egy parancssorban."
+"Megjegyzés: Ha ISA PnP hangkártyája van, akkor az alsaconf vagy az sndconfig "
+"programot kell használnia. Ehhez adja ki az \"alsaconf\" illetve az "
+"\"sndconfig\" parancsot egy parancssorban."
 
 #: standalone/draksplash:21
 #, c-format
@@ -20775,15 +22057,15 @@ msgstr "Logó megjelenítése a konzolon"
 msgid "Make kernel message quiet by default"
 msgstr "Alapértelmezésben ne legyenek kernelüzenetek"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Megjegyzé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 "Ennek a témának nincs %s indítási képe."
 
 #: standalone/draksplash:167
@@ -20796,258 +22078,279 @@ msgstr "válasszon egy képet"
 msgid "saving Bootsplash theme..."
 msgstr "indításikép-téma mentése..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "A folyamatjelző színének kiválasztása"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Először ki kell választania egy képfájlt."
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Előnézet elkészítése..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s indítási képének előnézete (%s)"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
 #, c-format
-msgid "Connected through a serial port or an usb cable"
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
 msgstr ""
+"Nem sikerült betölteni a(z) \"%s\" képet a következő miatt:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+
+#: standalone/drakups:74
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "Soros porton vagy USB-kábelen keresztül csatlakoztatva"
 
-#: standalone/drakups:69
-#, fuzzy, c-format
+#: standalone/drakups:80
+#, c-format
 msgid "Add an UPS device"
-msgstr "Elem hozzáadása"
+msgstr "UPS-eszköz felvétele"
 
-#: standalone/drakups:72
-#, fuzzy, c-format
+#: 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 ""
-"Üdvözöljük az email-beállítóprogramban.\n"
+"Üdvözli az UPS-beállító.\n"
 "\n"
-"A programmal beállítható a figyelmeztetések küldése.\n"
+"A programmal új UPS-t vehet fel a rendszerébe.\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 ""
+"Egy UPS-eszköz felvétele következik.\n"
+"\n"
+"Szeretne automatikus felderítést a géphez kapcsolt UPS-eszközökre, vagy "
+"kézzel szeretné megadni azokat?"
 
-#: standalone/drakups:82
-#, fuzzy, c-format
+#: standalone/drakups:93
+#, c-format
 msgid "Autodetection"
 msgstr "Automatikus felderítés"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Felderítés folyamatban"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
-#, fuzzy, c-format
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
+#, c-format
 msgid "Congratulations"
-msgstr "Gratulálunk!"
+msgstr "Gratulálunk"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
-msgstr ""
+msgstr "A varázsló felvette a következő UPS-eszközöket:"
 
-#: standalone/drakups:111
-#, fuzzy, c-format
+#: standalone/drakups:123
+#, c-format
 msgid "No new UPS devices was found"
-msgstr "Eszköz nem található"
+msgstr "Nem található új UPS-eszköz"
 
-#: standalone/drakups:116 standalone/drakups:128
-#, fuzzy, c-format
+#: standalone/drakups:128 standalone/drakups:140
+#, c-format
 msgid "UPS driver configuration"
-msgstr "CUPS nyomtatóbeállítás"
+msgstr "Az UPS-meghajtóprogram beállítása"
 
-#: standalone/drakups:116
-#, fuzzy, c-format
+#: standalone/drakups:128
+#, c-format
 msgid "Please select your UPS model."
-msgstr "Tesztelje le az egeret:"
+msgstr "Válassza ki az UPS-modellt."
 
-#: standalone/drakups:117
-#, fuzzy, c-format
+#: standalone/drakups:129
+#, c-format
 msgid "Manufacturer / Model:"
-msgstr "A nyomtató gyártója, típusa"
+msgstr "Gyártó / modell:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
+"A(z) \"%s\" UPS (gyártó: \"%s\") beállítása következik.\n"
+"Adja meg annak nevét, meghajtóját és portját."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Név:"
 
 # egérnél is ez jelenik meg, nem csak CPU-nál
-#: standalone/drakups:133
-#, fuzzy, c-format
+#: standalone/drakups:145
+#, c-format
 msgid "The name of your ups"
-msgstr "Az eszköz neve"
+msgstr "Az UPS neve"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
-msgstr ""
+msgid "The driver that manages your ups"
+msgstr "Az UPS-t kezelő meghajtóprogram"
 
-#: standalone/drakups:135
-#, fuzzy, c-format
+#: standalone/drakups:147
+#, c-format
 msgid "Port:"
-msgstr "Port"
+msgstr "Port:"
 
-#: standalone/drakups:137
-#, fuzzy, c-format
+#: standalone/drakups:149
+#, c-format
 msgid "The port on which is connected your ups"
-msgstr "Az egér által használt busz típusa"
+msgstr "A port, amelyre az UPS csatlakoztatva van"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
-msgstr ""
+msgstr "A varázsló beállította az új \"%s\" UPS-eszközt."
 
-#: standalone/drakups:232
-#, fuzzy, c-format
+#: standalone/drakups:246
+#, c-format
 msgid "UPS devices"
-msgstr "Szolgáltatások"
+msgstr "UPS-eszközök"
 
-#: 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 "Név"
 
-#: standalone/drakups:250
-#, fuzzy, c-format
+#: standalone/drakups:265
+#, c-format
 msgid "UPS users"
-msgstr "Felhasználók"
+msgstr "UPS-felhasználók"
 
-#: standalone/drakups:265
-#, fuzzy, c-format
+#: standalone/drakups:281
+#, c-format
 msgid "Access Control Lists"
-msgstr "hozzáférés a hálózati eszközökhöz"
+msgstr "Hozzáférési listák (ACL)"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
-msgstr ""
+msgstr "IP-maszk"
 
-#: standalone/drakups:277
-#, fuzzy, c-format
+#: standalone/drakups:294
+#, c-format
 msgid "Rules"
-msgstr "Útválasztók:"
+msgstr "Szabályok"
 
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
 msgid "Action"
-msgstr "/Mű_veletek"
+msgstr "Művelet"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Szint"
 
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
 msgid "ACL name"
-msgstr "Az LVM neve?"
+msgstr "ACL-név"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
-#, fuzzy, c-format
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
+#, c-format
 msgid "DrakUPS"
-msgstr "Dvorak-féle (USA)"
+msgstr "DrakUPS"
 
-#: standalone/drakups:307
-#, fuzzy, c-format
+#: standalone/drakups:335
+#, c-format
 msgid "Welcome to the UPS configuration tools"
-msgstr "A beállítások kipróbálása"
+msgstr "Üdvözli az UPS-beállító"
 
 #: standalone/drakvpn:73
-#, fuzzy, c-format
+#, c-format
 msgid "DrakVPN"
-msgstr "Dvorak-féle (USA)"
+msgstr "DrakVPN"
 
 #: standalone/drakvpn:95
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is enabled."
-msgstr "Az internetkapcsolat megosztása most már engedélyezett."
+msgstr "A VPN-kapcsolat engedélyezett."
 
 #: standalone/drakvpn:96
-#, fuzzy, c-format
+#, c-format
 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 ?"
+"What would you like to do?"
 msgstr ""
-"Az internetkapcsolat megosztása már megtörtént.\n"
-"A megosztott kapcsolat használható.\n"
+"Egy VPN-kapcsolat beállítása már megtörtént.\n"
+"\n"
+"A kapcsolat jelenleg engedélyezett.\n"
 "\n"
 "Mit szeretne tenni?"
 
 #: standalone/drakvpn:105
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling VPN..."
-msgstr "A kiszolgálók letiltása..."
+msgstr "A VPN letiltása..."
 
 #: standalone/drakvpn:114
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now disabled."
-msgstr "Az internetkapcsolat-megosztás letiltása megtörtént."
+msgstr "A VPN-kapcsolat letiltása megtörtént."
 
 #: standalone/drakvpn:121
-#, fuzzy, c-format
+#, c-format
 msgid "VPN connection currently disabled"
-msgstr "Az internetkapcsolat megosztása nincs engedélyezve"
+msgstr "A VPN-kapcsolat jelenleg nincs engedélyezve"
 
 #: standalone/drakvpn:122
-#, fuzzy, c-format
+#, c-format
 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 ?"
+"What would you like to do?"
 msgstr ""
-"Az internetkapcsolat megosztása már korábban megtörtént.\n"
-"A kapcsolatmegosztás jelenleg nincs bekapcsolva.\n"
+"Egy VPN-kapcsolat beállítása már megtörtént.\n"
+"\n"
+"A kapcsolat jelenleg le van tiltva.\n"
 "\n"
 "Mit szeretne tenni?"
 
 #: standalone/drakvpn:135
-#, fuzzy, c-format
+#, c-format
 msgid "Enabling VPN..."
-msgstr "A kiszolgálók engedélyezése..."
+msgstr "A VPN engedélyezése..."
 
 #: standalone/drakvpn:141
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now enabled."
-msgstr "Az internetkapcsolat megosztása most már engedélyezett."
+msgstr "A VPN-kapcsolat engedélyezése megtörtént."
 
 #: standalone/drakvpn:155 standalone/drakvpn:183
 #, c-format
 msgid "Simple VPN setup."
-msgstr ""
+msgstr "Egyszerű VPN-beállítás."
 
 #: standalone/drakvpn:156
 #, c-format
@@ -21064,6 +22367,17 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
+"A számítógépnek egy VPN-kapcsolat használatára való beállítása következik.\n"
+"\n"
+"Ezzel a funkcióval erőforrásokat lehet az interneten keresztül, biztonságos\n"
+"módon megosztani a helyi hálózaton levő és távoli hálózatokon levő\n"
+"számítógépek között - a gépek tűzfalainak használatával.\n"
+"\n"
+"Az interneten keresztül történő kommunikáció titkosított. A helyi\n"
+"és a távoli számítógépek azonos hálózaton levőnek látszanak.\n"
+"\n"
+"Mielőtt továbblépne, gondoskodjon arról, hogy a hálózat- illetve az\n"
+"internetelérés be legyen állítva (ez megtehető a \"drakconnect\" programmal)."
 
 #: standalone/drakvpn:184
 #, c-format
@@ -21080,48 +22394,71 @@ msgid ""
 "Please read AT LEAST the ipsec-howto docs\n"
 "before going any further."
 msgstr ""
+"VPN-kapcsolat\n"
+"\n"
+"A program a következő projektek munkájára épül:\n"
+" - FreeSwan: http://www.freeswan.org/\n"
+" - Super-FreeSwan: http://www.freeswan.ca/\n"
+" - ipsec-tools: http://ipsec-tools.sourceforge.net/\n"
+" - ipsec-howto: http://www.ipsec-howto.org\n"
+" - a(z) %s csomagban levő dokumentációk és kézikönyvek\n"
+"\n"
+"Folytatás előtt érdemes elolvasni legalább az \"ipsec-howto\"\n"
+"(IPsec-HOGYAN) leírást."
 
 #: standalone/drakvpn:196
-#, fuzzy, c-format
+#, c-format
 msgid "Kernel module."
-msgstr "Modul eltávolítása"
+msgstr "Kernelmodul."
 
 #: 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"
 "This kernel has '%s' support."
 msgstr ""
+"A kernelnek tartalmaznia kell IPsec-támogatást.\n"
+"\n"
+"A gépen %s verziójú kernel fut.\n"
+"\n"
+"Ez a kernel \"%s\"-támogatással rendelkezik."
 
 #: standalone/drakvpn:292
-#, fuzzy, c-format
+#, c-format
 msgid "Security Policies"
-msgstr "Biztonsági figyelmeztetések:"
+msgstr "Biztonsági szabályzatok"
 
 #: standalone/drakvpn:292
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "A \"racoon\" nevű IKE-szolgáltatás"
 
 #: standalone/drakvpn:295 standalone/drakvpn:306
-#, fuzzy, c-format
+#, c-format
 msgid "Configuration file"
-msgstr "Beállítás"
+msgstr "Beállítási fájl"
 
 #: 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 ""
+"Beállítási lépés\n"
+"\n"
+"Meg kell határoznia a biztonsági szabályzatokat, majd \n"
+"be kell állítania az automatikus kulcsátviteli szolgáltatást \n"
+"(IKE). A felhasznált KAME IKE-szolgáltatás neve \"racoon\".\n"
+"\n"
+"Mit szeretne beállítani?\n"
 
 #: standalone/drakvpn:307
 #, c-format
@@ -21131,11 +22468,15 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
+"A következő lépés a(z) %s fájl beállítása.\n"
+"\n"
+"\n"
+"Kattintson a \"Következő\" gombra.\n"
 
 #: standalone/drakvpn:325 standalone/drakvpn:685
-#, fuzzy, c-format
+#, c-format
 msgid "%s entries"
-msgstr ", %s szektor"
+msgstr "%s-bejegyzések"
 
 #: standalone/drakvpn:326
 #, c-format
@@ -21143,33 +22484,42 @@ 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 ""
+"A(z) %s fájl tartalma\n"
+"szakaszokra van bontva.\n"
+"\n"
+"A következőket teheti:\n"
+"\n"
+"  - szakaszok megjelenítése, felvétele, szerkesztése illetve eltávolítása\n"
+"  - a módosítások érvényesítése\n"
+"\n"
+"Mit szeretne tenni?\n"
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "_:display here is a verb\n"
 "Display"
-msgstr "naponta"
+msgstr "Megjelenítés"
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
-#, fuzzy, c-format
+#, c-format
 msgid "Commit"
-msgstr "kompakt"
+msgstr "Érvényesítés"
 
 #: standalone/drakvpn:347 standalone/drakvpn:351 standalone/drakvpn:709
 #: standalone/drakvpn:713
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "_:display here is a verb\n"
 "Display configuration"
-msgstr "A helyi hálózat beállítása"
+msgstr "A beállítás megjelenítése"
 
 #: standalone/drakvpn:352
 #, c-format
@@ -21180,18 +22530,23 @@ msgid ""
 "\n"
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
+"%s nevű fájl nem létezik.\n"
+"\n"
+"Valószínűleg ez egy új beállítás.\n"
+"\n"
+"Vissza kell lépnie és kiválasztani a \"felvétel\" funkciót.\n"
 
 #: standalone/drakvpn:368
 #, c-format
 msgid "ipsec.conf entries"
-msgstr ""
+msgstr "ipsec.conf-bejegyzések"
 
 #: standalone/drakvpn:369
 #, c-format
 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"
@@ -21200,26 +22555,37 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"A(z) %s fájl különböző szakaszokból áll.\n"
+"\n"
+"A fájl váza a következő:\n"
+"  \"config setup\"\n"
+"  \"conn default\"\n"
+"  \"normal1\"\n"
+"  \"normal2\"\n"
+"\n"
+"Felveheti ezen szakaszok valamelyikét.\n"
+"\n"
+"Válassza ki, melyik szakaszt szeretné felvenni.\n"
 
 #: standalone/drakvpn:376
-#, fuzzy, c-format
+#, c-format
 msgid "config setup"
-msgstr "Beállítás újból"
+msgstr "config setup"
 
 #: standalone/drakvpn:376
-#, fuzzy, c-format
+#, c-format
 msgid "conn %default"
-msgstr "alapértelmezés"
+msgstr "conn %default"
 
 #: standalone/drakvpn:376
-#, fuzzy, c-format
+#, c-format
 msgid "normal conn"
-msgstr "Normál mód"
+msgstr "normal conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
-#, fuzzy, c-format
-msgid "Exists !"
-msgstr "Kilépés"
+#, c-format
+msgid "Exists!"
+msgstr "Létezik"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -21230,6 +22596,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
+"Már létezik ilyen nevű szakasz.\n"
+"A szakaszneveknek egyedinek kell lenniük.\n"
+"\n"
+"Vissza kell lépnie és felvenni egy másik szakaszt,\n"
+"vagy módosítani kell a nevet.\n"
 
 #: standalone/drakvpn:400
 #, c-format
@@ -21242,36 +22613,43 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Ennek a szakasznak a(z) %s\n"
+"fájl elején kell lennie.\n"
+"\n"
+"Gondoskodjon arról, hogy a többi szakasz a\n"
+"\"config setup\" szakasz után szerepeljen.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" vagy az \"Előző\" gombra.\n"
 
 #: standalone/drakvpn:405
-#, fuzzy, c-format
+#, c-format
 msgid "interfaces"
-msgstr "Csatoló"
+msgstr "interfaces"
 
 #: standalone/drakvpn:406
 #, c-format
 msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
 
 #: standalone/drakvpn:407
 #, c-format
 msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
 
 #: standalone/drakvpn:408
 #, c-format
 msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
 
 #: standalone/drakvpn:409
 #, c-format
 msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
 
 #: standalone/drakvpn:410
 #, c-format
 msgid "uniqueids"
-msgstr ""
+msgstr "uniqueids"
 
 #: standalone/drakvpn:444
 #, c-format
@@ -21285,51 +22663,58 @@ msgid ""
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
+"Ez a \"config setup\" utáni első szakasz.\n"
+"\n"
+"Itt lehet megadni az alapértelmezett beállításokat.\n"
+"A többi szakasz ez után fog következni.\n"
+"A \"left\"-beállítások opcionálisak - ha itt nem adja\n"
+"meg azokat globálisan, akkor megadhatja azokat minden\n"
+"szakaszban.\n"
 
 #: standalone/drakvpn:451
-#, fuzzy, c-format
+#, c-format
 msgid "PFS"
-msgstr "HFS"
+msgstr "PFS"
 
 #: standalone/drakvpn:452
 #, c-format
 msgid "keyingtries"
-msgstr ""
+msgstr "keyingtries"
 
 #: standalone/drakvpn:453
 #, c-format
 msgid "compress"
-msgstr ""
+msgstr "compress"
 
 #: standalone/drakvpn:454
 #, c-format
 msgid "disablearrivalcheck"
-msgstr ""
+msgstr "disablearrivalcheck"
 
 #: standalone/drakvpn:455 standalone/drakvpn:494
-#, fuzzy, c-format
+#, c-format
 msgid "left"
-msgstr "Törlés"
+msgstr "left"
 
 #: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftcert"
-msgstr ""
+msgstr "leftcert"
 
 #: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
 
 #: standalone/drakvpn:458 standalone/drakvpn:497
 #, c-format
 msgid "leftsubnet"
-msgstr ""
+msgstr "leftsubnet"
 
 #: standalone/drakvpn:459 standalone/drakvpn:498
 #, c-format
 msgid "leftnexthop"
-msgstr ""
+msgstr "leftnexthop"
 
 #: standalone/drakvpn:488
 #, c-format
@@ -21339,46 +22724,51 @@ msgid ""
 "You can now add a new section.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Felvehet egy újabb szakaszt.\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:491
-#, fuzzy, c-format
+#, c-format
 msgid "section name"
-msgstr "Csatlakozás neve"
+msgstr "szakasznév"
 
 #: standalone/drakvpn:492
-#, fuzzy, c-format
+#, c-format
 msgid "authby"
-msgstr "Útvonal"
+msgstr "authby"
 
 #: standalone/drakvpn:493
-#, fuzzy, c-format
+#, c-format
 msgid "auto"
-msgstr "Szerző:"
+msgstr "auto"
 
 #: standalone/drakvpn:499
-#, fuzzy, c-format
+#, c-format
 msgid "right"
-msgstr "Magas"
+msgstr "right"
 
 #: standalone/drakvpn:500
-#, fuzzy, c-format
+#, c-format
 msgid "rightcert"
-msgstr "Magasabb"
+msgstr "rightcert"
 
 #: standalone/drakvpn:501
 #, c-format
 msgid "rightrsasigkey"
-msgstr ""
+msgstr "rightrsasigkey"
 
 #: standalone/drakvpn:502
 #, c-format
 msgid "rightsubnet"
-msgstr ""
+msgstr "rightsubnet"
 
 #: standalone/drakvpn:503
 #, c-format
 msgid "rightnexthop"
-msgstr ""
+msgstr "rightnexthop"
 
 #: standalone/drakvpn:511
 #, c-format
@@ -21389,6 +22779,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
+"Már létezik ilyen nevű szakasz.\n"
+"A szakaszneveknek egyedinek kell lenniük.\n"
+"\n"
+"Vissza kell lépnie és felvenni egy másik szakaszt,\n"
+"vagy módosítani kell a szakasznevet.\n"
 
 #: standalone/drakvpn:543
 #, c-format
@@ -21399,11 +22794,17 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Biztonsági szabályzat felvétele.\n"
+"\n"
+"Felvehet egy biztonsági szabályzatot.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:576 standalone/drakvpn:826
-#, fuzzy, c-format
+#, c-format
 msgid "Edit section"
-msgstr "Útvonal választása"
+msgstr "Szakasz szerkesztése"
 
 #: standalone/drakvpn:577
 #, c-format
@@ -21413,28 +22814,38 @@ msgid ""
 "You can choose here below the one you want to edit \n"
 "and then click on next.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Kiválaszthatja, melyiket szeretné szerkeszteni.\n"
+"Ez után kattintson a \"Következő\" gombra.\n"
 
 #: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
 #: standalone/drakvpn:877
-#, fuzzy, c-format
+#, c-format
 msgid "Section names"
-msgstr "Csatlakozás neve"
+msgstr "Szakasznevek"
 
 #: standalone/drakvpn:590
-#, fuzzy, c-format
-msgid "Can't edit !"
-msgstr "%s megnyitása nem sikerült."
+#, c-format
+msgid "Can't edit!"
+msgstr "Nem szerkeszthető."
 
 #: standalone/drakvpn:591
 #, c-format
 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 ""
+"Ez a szakasz nem szerkeszthető.\n"
+"\n"
+"Freeswan 2.X esetén ez a szakasz kötelező.\n"
+"A(z) %s fájl elején \"2.0\" verziót kell\n"
+"megadni, és ki vagy be kell kapcsolni az\n"
+"opportunista titkosítást.\n"
 
 #: standalone/drakvpn:600
 #, c-format
@@ -21444,6 +22855,11 @@ msgid ""
 "You can now edit the config setup section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz van.\n"
+"\n"
+"Szerkesztheti a \"config setup\" szakasz bejegyzéseit.\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:611
 #, c-format
@@ -21453,6 +22869,11 @@ msgid ""
 "You can now edit the default section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Szerkesztheti az alapértelmezett szakasz bejegyzéseit.\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:624
 #, c-format
@@ -21463,21 +22884,33 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Szerkesztheti a normál szakasz bejegyzéseit.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:645
 #, c-format
 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 ""
+"Biztonsági szabályzat szerkesztése.\n"
+"\n"
+"Módosíthat egy biztonsági szabályzatot.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:656 standalone/drakvpn:873
-#, fuzzy, c-format
+#, c-format
 msgid "Remove section"
-msgstr "Lista eltávolítása"
+msgstr "Szakasz eltávolítása"
 
 #: standalone/drakvpn:657 standalone/drakvpn:874
 #, c-format
@@ -21487,6 +22920,10 @@ msgid ""
 "You can choose here below the one you want to remove\n"
 "and then click on next.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Kiválaszthatja, melyiket szeretné eltávolítani.\n"
+"Ez után kattintson a \"Következő\" gombra.\n"
 
 #: standalone/drakvpn:686
 #, c-format
@@ -21494,13 +22931,22 @@ 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"
 "  - remove \t\t (remove an existing section)\n"
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
+"A racoon.conf fájl beállítása.\n"
+"\n"
+"A fájl tartalma szakaszokra van bontva.\n"
+"A következőket teheti:\n"
+"  - megjelenítés (a fájltartalom megjelenítése)\n"
+"  - felvétel (szakasz felvétele)\n"
+"  - szerkesztés (egy létező szakasz paramétereinek módosítása)\n"
+"  - eltávolítás (egy létező szakasz eltávolítása)\n"
+"  - érvényesítés (a módosítások írása a valódi fájlba)"
 
 #: standalone/drakvpn:714
 #, c-format
@@ -21511,39 +22957,52 @@ msgid ""
 "\n"
 "You'll have to go back and choose configure.\n"
 msgstr ""
+"%s nevű fájl nem létezik.\n"
+"\n"
+"Valószínűleg ez egy új beállítás.\n"
+"\n"
+"Vissza kell lépnie és kiválasztani a \"beállítás\" funkciót.\n"
 
 #: standalone/drakvpn:728
 #, c-format
 msgid "racoonf.conf entries"
-msgstr ""
+msgstr "racoon.conf-bejegyzések"
 
 #: standalone/drakvpn:729
 #, c-format
 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"
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"Szakaszfelvételi lépés.\n"
+"\n"
+"A racoon.conf fájl váza a következő:\n"
+"  \"path\"\n"
+"  \"remote\"\n"
+"  \"sainfo\"\n"
+"\n"
+"Válassza ki, melyik szakaszt szeretné felvenni.\n"
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "path"
-msgstr "Útvonal"
+msgstr "path"
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "remote"
-msgstr "Eltávolítás"
+msgstr "remote"
 
 #: standalone/drakvpn:735
-#, fuzzy, c-format
+#, c-format
 msgid "sainfo"
-msgstr "spanyol"
+msgstr "sainfo"
 
 #: standalone/drakvpn:743
 #, c-format
@@ -21554,40 +23013,67 @@ msgid ""
 "\n"
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
+"A \"path\" szakaszfelvételi lépés.\n"
+"\n"
+"A \"path\" szakaszoknak a racoon.conf fájl elején kell szerepelniük.\n"
+"\n"
+"Segítséget kaphat egy tanúsítványbejegyzésről, ha az egeret a bejegyzés fölé "
+"viszi."
 
 #: standalone/drakvpn:746
-#, fuzzy, c-format
+#, c-format
 msgid "path type"
-msgstr "A típus megváltoztatása"
+msgstr "útvonaltípus"
 
 #: 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 ""
+"path include <útvonal>: egy felveendő (include-) fájl\n"
+"útvonalát adja meg. További információ a fájlfelvételnél.\n"
+"Példa: path include '/etc/racoon'\n"
+"\n"
+"path pre_shared_key <fájl>: különböző azonosító(k)hoz tartozó\n"
+"előre megosztott kulcso(ka)t tartalmazó fájl megadása.\n"
+"További információ az előre megosztott kulcsok fájljánál.\n"
+"Példa: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"\n"
+"path certificate <útvonal>: a racoon(8) ebben a könyvtárban\n"
+"keres, ha tanúsítvány vagy tanúsítvány-kérelem érkezik.\n"
+"Példa: path certificate '/etc/cert' ;\n"
+"\n"
+"Fájlfelvétel (include): include <fájl> \n"
+"További beállítási fájlok vehetők fel.\n"
+"Példa: include \"remote.conf\" ;\n"
+"\n"
+"Előre megosztott kulcsok fájlja: a fájl egy, az azonosítóból és\n"
+"a megosztott titkos kulcsból álló párt tartalmaz. Ezek az előre\n"
+"megosztott kulcsú azonosítási módszernél kerülnek felhasználásra\n"
+"az első fázisban."
 
 #: standalone/drakvpn:770 standalone/drakvpn:863
-#, fuzzy, c-format
+#, c-format
 msgid "real file"
-msgstr "Fájlválasztás"
+msgstr "valódi fájl"
 
 #: standalone/drakvpn:793
 #, c-format
@@ -21598,6 +23084,11 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Gondoskodjon arról, hogy létezzenek a \"path\"\n"
+"szakaszok a racoon.conf fájl elején.\n"
+"\n"
+"Megadhatja a távoli (remote) beállításokat.\n"
+"Amikor elkészült, kattintson a \"Következő\" vagy az \"Előző\" gombra.\n"
 
 #: standalone/drakvpn:810
 #, c-format
@@ -21608,6 +23099,11 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Gondoskodjon arról, hogy létezzenek a \"path\"\n"
+"szakaszok a(z) %s fájl elején.\n"
+"\n"
+"Megadhatja az sainfo-beállításokat.\n"
+"Amikor elkészült, kattintson a \"Következő\" vagy az \"Előző\" gombra.\n"
 
 #: standalone/drakvpn:827
 #, c-format
@@ -21617,6 +23113,10 @@ msgid ""
 "You can choose here in the list below the one you want\n"
 "to edit and then click on next.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz illetve kapcsolat van.\n"
+"\n"
+"Kiválaszthatja, melyiket szeretné szerkeszteni.\n"
+"Ez után kattintson a \"Következő\" gombra.\n"
 
 #: standalone/drakvpn:838
 #, c-format
@@ -21628,6 +23128,13 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"A(z) %s fájlban több szakasz van.\n"
+"\n"
+"\n"
+"Szerkesztheti a \"távoli\" (remote) szakasz bejegyzéseit.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok "
+"eltárolásához.\n"
 
 #: standalone/drakvpn:847
 #, c-format
@@ -21638,6 +23145,11 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data."
 msgstr ""
+"A(z) %s fájlban több szakasz van.\n"
+"\n"
+"Szerkesztheti az \"sainfo\" szakasz bejegyzéseit.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" gombra az adatok eltárolásához."
 
 #: standalone/drakvpn:855
 #, c-format
@@ -21652,11 +23164,20 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Ennek a szakasznak a(z) %s\n"
+"fájl elején kell lennie.\n"
+"\n"
+"Gondoskodjon arról, hogy a többi szakasz\n"
+"a \"path\" szakaszok után szerepeljen.\n"
+"\n"
+"Szerkesztheti a \"path\"-bejegyzéseket.\n"
+"\n"
+"Amikor elkészült, kattintson a \"Következő\" vagy az \"Előző\" gombra.\n"
 
 #: standalone/drakvpn:862
 #, c-format
 msgid "path_type"
-msgstr ""
+msgstr "path_type"
 
 #: standalone/drakvpn:903
 #, c-format
@@ -21669,11 +23190,18 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
+"Minden be lett állítva.\n"
+"\n"
+"Most már lehetősége van VPN-kapcsolat használatával való\n"
+"biztonságos erőforrásmegosztásra az interneten keresztül.\n"
+"\n"
+"Gondoskodjon arról, hogy a \"tunnels shorewall\" szakasz\n"
+"be legyen állítva."
 
 #: standalone/drakvpn:923
 #, c-format
 msgid "Sainfo source address"
-msgstr ""
+msgstr "Sainfo-forráscím"
 
 #: standalone/drakvpn:924
 #, c-format
@@ -21686,7 +23214,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"
@@ -21697,11 +23225,29 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.1.0/24 is the source address"
 msgstr ""
+"sainfo (forrás-azonosító cél-azonosító | anonymous) { utasítások }\n"
+"Megadja a paramétereket a 2. IKE-fázishoz\n"
+"(IPsec-SA létrehozása).\n"
+"\n"
+"A forrás-azonosító és a cél-azonosító a következőképpen áll össze:\n"
+"\n"
+"  cím cím [/ előtag] [[port]] ul_proto\n"
+"\n"
+"Példák:\n"
+"\n"
+"sainfo anonymous (bárhonnan elfogad kapcsolódást)\n"
+"  hagyja üresen a bejegyzést, ha névtelen elérést szeretne\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"  203.178.141.209 a forráscím\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"  172.16.1.0/24 a forráscím"
 
 #: standalone/drakvpn:941
-#, fuzzy, c-format
+#, c-format
 msgid "Sainfo source protocol"
-msgstr "Európai protokoll"
+msgstr "Sainfo-forrásprotokoll"
 
 #: standalone/drakvpn:942
 #, c-format
@@ -21714,7 +23260,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"
@@ -21722,11 +23268,26 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
+"sainfo (forrás-azonosító cél-azonosító | anonymous) { utasítások }\n"
+"Megadja a paramétereket a 2. IKE-fázishoz\n"
+"(IPsec-SA létrehozása).\n"
+"\n"
+"A forrás-azonosító és a cél-azonosító a következőképpen áll össze:\n"
+"\n"
+"  cím cím [/ előtag] [[port]] ul_proto\n"
+"\n"
+"Példák:\n"
+"\n"
+"sainfo anonymous (bárhonnan elfogad kapcsolódást)\n"
+"  hagyja üresen a bejegyzést, ha névtelen elérést szeretne\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"  az első \"any\" bármilyen protokollt engedélyez a forrás számára"
 
 #: standalone/drakvpn:956
 #, c-format
 msgid "Sainfo destination address"
-msgstr ""
+msgstr "Sainfo-célcím"
 
 #: standalone/drakvpn:957
 #, c-format
@@ -21739,7 +23300,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"
@@ -21750,11 +23311,29 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
+"sainfo (forrás-azonosító cél-azonosító | anonymous) { utasítások }\n"
+"Megadja a paramétereket a 2. IKE-fázishoz\n"
+"(IPsec-SA létrehozása).\n"
+"\n"
+"A forrás-azonosító és a cél-azonosító a következőképpen áll össze:\n"
+"\n"
+"  cím cím [/ előtag] [[port]] ul_proto\n"
+"\n"
+"Példák:\n"
+"\n"
+"sainfo anonymous (bárhonnan elfogad kapcsolódást)\n"
+"  hagyja üresen a bejegyzést, ha névtelen elérést szeretne\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"  203.178.141.218 a célcím\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"  172.16.2.0/24 a célcím"
 
 #: standalone/drakvpn:974
-#, fuzzy, c-format
+#, c-format
 msgid "Sainfo destination protocol"
-msgstr "Windows migrációs program"
+msgstr "Sainfo-célprotokoll"
 
 #: standalone/drakvpn:975
 #, c-format
@@ -21767,7 +23346,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"
@@ -21775,11 +23354,26 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
+"sainfo (forrás-azonosító cél-azonosító | anonymous) { utasítások }\n"
+"Megadja a paramétereket a 2. IKE-fázishoz\n"
+"(IPsec-SA létrehozása).\n"
+"\n"
+"A forrás-azonosító és a cél-azonosító a következőképpen áll össze:\n"
+"\n"
+"  cím cím [/ előtag] [[port]] ul_proto\n"
+"\n"
+"Példák:\n"
+"\n"
+"sainfo anonymous (bárhonnan elfogad kapcsolódást)\n"
+"  hagyja üresen a bejegyzést, ha névtelen elérést szeretne\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"  az utolsó \"any\" bármilyen protokollt engedélyez a cél számára"
 
 #: standalone/drakvpn:989
 #, c-format
 msgid "PFS group"
-msgstr ""
+msgstr "PFS-csoport"
 
 #: standalone/drakvpn:991
 #, c-format
@@ -21787,25 +23381,30 @@ 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 ""
+"A Diffie-Hellman-hatványozások csoportjának meghatározása.\n"
+"Ha nincs szüksége PFS-re, akkor kihagyhatja ezt a direktívát.\n"
+"Ha nem ad meg ilyet, akkor bármilyen javaslat el lesz fogadva.\n"
+"A csoport a következők egyike lehet: modp768, modp1024, modp1536.\n"
+"További lehetőség: DH-csoportszámként megadhatja ezeket: 1, 2 vagy 5."
 
 #: standalone/drakvpn:996
-#, fuzzy, c-format
+#, c-format
 msgid "Lifetime number"
-msgstr "egy szám"
+msgstr "Élettartam-szám"
 
 #: standalone/drakvpn:997
 #, c-format
 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"
@@ -21816,58 +23415,91 @@ msgid ""
 "\n"
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
+"Meghatározott élettartam megadása, amely az 1. fázisbeli\n"
+"adatcserében javasolva lesz. Bármilyen javaslat el lesz\n"
+"fogadva. Az attribútum(ok) nem lesz(nek) a fél számára\n"
+"javasolva, ha Ön nem adja meg az(oka)t. Egyenként megadhatók\n"
+"minden egyes javaslatban.\n"
+"\n"
+"Példák:\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"
+"        lifetime time 12 hour;\n"
+"\n"
+"Az élettartam-számok itt: 1, 1, 30, 30, 60 illetve 12.\n"
 
 #: standalone/drakvpn:1013
 #, c-format
 msgid "Lifetime unit"
-msgstr ""
+msgstr "Élettartam-egység"
 
 #: standalone/drakvpn:1015
 #, c-format
 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"
 msgstr ""
+"Meghatározott élettartam megadása, amely az 1. fázisbeli\n"
+"adatcserében javasolva lesz. Bármilyen javaslat el lesz\n"
+"fogadva. Az attribútum(ok) nem lesz(nek) a fél számára\n"
+"javasolva, ha Ön nem adja meg az(oka)t. Egyenként megadhatók\n"
+"minden egyes javaslatban.\n"
+"\n"
+"Példák:\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"
+"        lifetime time 12 hour;\n"
+"\n"
+"Az élettartam-egységek itt: \"min\", \"min\", \"sec\", \"sec\", \"sec\" "
+"illetve \"hour\".\n"
 
 #: standalone/drakvpn:1031 standalone/drakvpn:1116
-#, fuzzy, c-format
+#, c-format
 msgid "Encryption algorithm"
-msgstr "felhasználóazonosítás"
+msgstr "Titkosítási módszer"
 
 #: standalone/drakvpn:1033
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication algorithm"
-msgstr "felhasználóazonosítás"
+msgstr "Azonosítási módszer"
 
 #: standalone/drakvpn:1035
 #, c-format
 msgid "Compression algorithm"
-msgstr ""
+msgstr "Tömörítési módszer"
 
 #: standalone/drakvpn:1036
-#, fuzzy, c-format
+#, c-format
 msgid "deflate"
-msgstr "alapértelmezés"
+msgstr "deflate"
 
 #: standalone/drakvpn:1043
-#, fuzzy, c-format
+#, c-format
 msgid "Remote"
-msgstr "Eltávolítás"
+msgstr "Távoli"
 
 #: standalone/drakvpn:1044
 #, c-format
@@ -21878,16 +23510,26 @@ 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]"
 msgstr ""
+"remote (cím | anonymous) [[port]] { utasítások }\n"
+"Megadja a paramétereket az 1. IKE-fázishoz az összes távoli géphez.\n"
+"Az alapértelmezett port 500. Ha \"anonymous\" van megadva, akkor az\n"
+"utasítások az összes olyan félre vonatkoznak, amely nem illeszkedik\n"
+"egyik további távoli direktívára sem.\n"
+"\n"
+"Példák:\n"
+"\n"
+"  remote anonymous\n"
+"  remote ::1 [8000]"
 
 #: standalone/drakvpn:1052
-#, fuzzy, c-format
+#, c-format
 msgid "Exchange mode"
-msgstr "Tárcsázási mód"
+msgstr "Átviteli mód"
 
 #: standalone/drakvpn:1054
 #, c-format
@@ -21899,21 +23541,27 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
+"Megadja az átviteli módot az 1. fázishoz arra az esetre, amikor\n"
+"a racoon a kezdeményező. Megadja továbbá az elfogadható átviteli\n"
+"módot arra az esetre, amikor a racoon a válaszadó. Több mód is\n"
+"megadható; ekkor el kell azokat választani vesszővel. Az összes\n"
+"mód elfogadható. A racoon az első átviteli módot használja,\n"
+"amikor kezdeményező szerepű.\n"
 
 #: standalone/drakvpn:1060
-#, fuzzy, c-format
+#, c-format
 msgid "Generate policy"
-msgstr "Biztonság"
+msgstr "Szabályzat elkészítése"
 
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
 #, c-format
 msgid "off"
-msgstr ""
+msgstr "off"
 
 #: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
-#, fuzzy, c-format
+#, c-format
 msgid "on"
-msgstr "Le"
+msgstr "on"
 
 #: standalone/drakvpn:1062
 #, c-format
@@ -21933,11 +23581,25 @@ msgid ""
 "tiator and the responder.  This directive is ignored in\n"
 "the initiator case.  The default value is off."
 msgstr ""
+"Ez a direktíva a válaszadó számára létezik. Emiatt be\n"
+"kell kapcsolni a \"passzív\" beállítást, hogy a racoon(8)\n"
+"csak válaszadó legyen. Ha a 2. fázisbeli adatcsere közben\n"
+"a válaszadónak nincs szabályzata az SPD-ben, és a direktíva\n"
+"be van kapcsolva, akkor a racoon(8) a kezdeményezőtől érkező\n"
+"SA-adatokból az első javaslatot fogja választani, és\n"
+"szabályzat-bejegyzéseket hoz létre a javaslatból. Érdemes\n"
+"adatcserét végezni a klienssel, amely dinamikusan kap IP-címet.\n"
+"Elképzelhető, hogy a kezdeményező helytelen szabályzatot\n"
+"telepít a válaszadó SPD-jébe. A további kommunikáció sikertelen\n"
+"lehet, ha ilyen szabályzat kerül telepítésre a kezdeményező és\n"
+"a válaszadó közti szabályzat-eltérés miatt. A kezdeményező\n"
+"esetében ez a direktíva figyelmen kívül van hagyva. Az\n"
+"alapértelmezett érték: kikapcsolva."
 
 #: standalone/drakvpn:1076
-#, fuzzy, c-format
+#, c-format
 msgid "Passive"
-msgstr "Palesztina"
+msgstr "Passzív"
 
 #: standalone/drakvpn:1078
 #, c-format
@@ -21946,46 +23608,49 @@ msgid ""
 "to on.  The default value is off.  It is useful for a\n"
 "server."
 msgstr ""
+"Ha nem kívánja kezdeményezni az adatcserét, akkor kapcsolja\n"
+"ezt be. Az alapértelmezett érték: kikapcsolva. Kiszolgáló\n"
+"esetében hasznos."
 
 #: standalone/drakvpn:1081
 #, c-format
 msgid "Certificate type"
-msgstr ""
+msgstr "Tanúsítványtípus"
 
 #: standalone/drakvpn:1083
-#, fuzzy, c-format
+#, c-format
 msgid "My certfile"
-msgstr "Fájlválasztás"
+msgstr "Saját tanúsítványfájl"
 
 #: standalone/drakvpn:1084
-#, fuzzy, c-format
+#, c-format
 msgid "Name of the certificate"
-msgstr "A nyomtató neve"
+msgstr "A tanúsítvány neve"
 
 #: standalone/drakvpn:1085
 #, c-format
 msgid "My private key"
-msgstr ""
+msgstr "Saját privát kulcs"
 
 #: standalone/drakvpn:1086
-#, fuzzy, c-format
+#, c-format
 msgid "Name of the private key"
-msgstr "A nyomtató neve"
+msgstr "A privát kulcs neve"
 
 #: standalone/drakvpn:1087
-#, fuzzy, c-format
+#, c-format
 msgid "Peers certfile"
-msgstr "Fájlválasztás"
+msgstr "Az ügyfél tanúsítványfájlja"
 
 #: standalone/drakvpn:1088
 #, c-format
 msgid "Name of the peers certificate"
-msgstr ""
+msgstr "Az ügyfél tanúsítványának neve"
 
 #: standalone/drakvpn:1089
-#, fuzzy, c-format
+#, c-format
 msgid "Verify cert"
-msgstr "erősen ajánlott"
+msgstr "Tanúsítvány ellenőrzése"
 
 #: standalone/drakvpn:1091
 #, c-format
@@ -21993,17 +23658,19 @@ msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
+"Ha valamiért nem kívánja ellenőrizni az ügyfél tanúsítványát,\n"
+"akkor kapcsolja ezt ki. Az alapértelmezett érték: bekapcsolva."
 
 #: standalone/drakvpn:1093
 #, c-format
 msgid "My identifier"
-msgstr ""
+msgstr "Saját azonosító"
 
 #: standalone/drakvpn:1094
 #, 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"
@@ -22012,7 +23679,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"
@@ -22021,195 +23688,230 @@ 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 ""
+"Megadja a távoli gépnek küldött azonosítót és az 1.\n"
+"fázisbeli adatcserében használandó típust.\n"
+"Azonosítótípusként a következők használhatók: address,\n"
+"FQDN, user_fqdn, keyid és asn1dn.\n"
+"A használat módja:\n"
+"  my_identifier address [cím];\n"
+"    A típus az IP-cím. Ez az alapértelmezett típus,\n"
+"    amikor nincs megadva azonosító.\n"
+"  my_identifier user_fqdn szöveg;\n"
+"    A típus egy USER_FQDN (felhasználói teljesen\n"
+"    megadott tartománynév).\n"
+"  my_identifier FQDN szöveg;\n"
+"    A típus egy FQDN (teljesen megadott tartománynév).\n"
+"  my_identifier keyid fájl;\n"
+"    A típus egy KEY_ID.\n"
+"  my_identifier asn1dn [szöveg];\n"
+"    A típus egy ASN.1 megkülönböztetett név. Ha a szöveg\n"
+"    ki van hagyva, akkor a racoon(8) a tanúsítvány Tárgy\n"
+"    mezőjéből veszi a tartománynevet.\n"
+"\n"
+"Példák:\n"
+"\n"
+"my_identifier user_fqdn \"email@domain.com\""
 
 #: standalone/drakvpn:1114
-#, fuzzy, c-format
+#, c-format
 msgid "Peers identifier"
-msgstr "Nyomtató"
+msgstr "Az ügyfél azonosítója"
 
 #: standalone/drakvpn:1115
-#, fuzzy, c-format
+#, c-format
 msgid "Proposal"
-msgstr "Protokoll"
+msgstr "Javaslat"
 
 #: standalone/drakvpn:1117
 #, c-format
 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 ""
+"Megadja az 1. fázisbeli adatcserében használt\n"
+"titkosítási módszert. Ez a direktíva megadandó.\n"
+"A módszer a következők egyike lehet:\n"
+"\n"
+"  DES, 3DES, blowfish, cast128 for oakley\n"
+"\n"
+"Egyéb átalakításokhoz ez az utasítás nem használható."
 
 #: standalone/drakvpn:1124
 #, c-format
 msgid "Hash algorithm"
-msgstr ""
+msgstr "Hasítási (hash) módszer"
 
 #: standalone/drakvpn:1125
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication method"
-msgstr "felhasználóazonosítás"
+msgstr "Azonosítási módszer"
 
 #: standalone/drakvpn:1126
-#, fuzzy, c-format
+#, c-format
 msgid "DH group"
-msgstr "Csoport"
+msgstr "DH-csoport"
 
 # Pipe into command
 #: standalone/drakvpn:1133
-#, fuzzy, c-format
+#, c-format
 msgid "Command"
 msgstr "Parancs"
 
 #: standalone/drakvpn:1134
 #, c-format
 msgid "Source IP range"
-msgstr ""
+msgstr "Forrás-IP-tartomány"
 
 #: standalone/drakvpn:1135
 #, c-format
 msgid "Destination IP range"
-msgstr ""
+msgstr "Cél-IP-tartomány"
 
 #: standalone/drakvpn:1136
-#, fuzzy, c-format
+#, c-format
 msgid "Upper-layer protocol"
-msgstr "Európai protokoll"
+msgstr "Felsőszintű protokoll"
 
 #: standalone/drakvpn:1136 standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "any"
-msgstr "Nap"
+msgstr "any"
 
 #: standalone/drakvpn:1138
-#, fuzzy, c-format
+#, c-format
 msgid "Flag"
-msgstr "Jelzők (flag-ek)"
+msgstr "Jelző"
 
 #: standalone/drakvpn:1139
-#, fuzzy, c-format
+#, c-format
 msgid "Direction"
-msgstr "Leírás"
+msgstr "Irány"
 
 #: standalone/drakvpn:1140
 #, c-format
 msgid "IPsec policy"
-msgstr ""
+msgstr "IPsec-szabályzat"
 
 #: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
 msgid "ipsec"
-msgstr "Msec"
+msgstr "ipsec"
 
 #: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
 msgid "discard"
-msgstr "kikapcsolva"
+msgstr "discard"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "Mode"
-msgstr "Modell"
+msgstr "Mód"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "tunnel"
-msgstr "Csatorna"
+msgstr "tunnel"
 
 #: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
 msgid "transport"
-msgstr "átvitt"
+msgstr "transport"
 
 #: standalone/drakvpn:1145
-#, fuzzy, c-format
+#, c-format
 msgid "Source/destination"
-msgstr "Munkaállomás"
+msgstr "Forrás/cél"
 
 #: standalone/drakvpn:1146
 #, c-format
 msgid "require"
-msgstr ""
+msgstr "require"
 
 #: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
+msgid "default"
+msgstr "default"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
-msgstr "Egér"
+msgstr "use"
 
 #: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
 msgid "unique"
-msgstr "Martinique"
+msgstr "unique"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "USA (sugárzás)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "USA (kábel)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "USA (kábel-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Kanada (kábel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japán (sugárzás)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japán (kábel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Kína (sugárzás)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Nyugat-Európa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Kelet-Európa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Franciaország [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Új-Zéland"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Ausztrál Optus kábeltelevízió"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22218,47 +23920,48 @@ msgstr ""
 "Adja meg\n"
 "a tévénormát és az országot"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Tévénorma:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Terület:"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Tévécsatornák keresése..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Tévécsatornák keresése"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Hiba történt a tévécsatornák keresésekor"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Sok sikert!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Az XawTV program most már futtatható (az X grafikus felületen).\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Tévékártya nem található."
 
-#: 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-"
@@ -22275,55 +23978,29 @@ msgstr ""
 "gépbe.\n"
 "\n"
 "\n"
-"A Mandrake-féle hardver-adatbázis a következő helyen található:\n"
+"A Mandrakelinux hardver-adatbázisa a következő helyen található:\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Alternatív meghajtók"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "A hangkártyához használható alternatív meghajtók"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 "Ez a fizikai busz, amelyre az eszköz csatlakoztatva van (PCI, USB, ...)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Csatorna"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE-/SCSI-csatorna"
-
-#: 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 ""
-"Rendszerindításkor a Linux kernel inicializál egy időzítési számlálót egy "
-"számlálóciklus segítségével. Ennek a műveletnek az eredménye Bogomips "
-"értékként eltárolódik, amely egyfajta CPU-sebességi értéknek is felfogható."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Busz-azonosítás"
@@ -22350,132 +24027,284 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Gyorstárméret"
+msgid "Drive capacity"
+msgstr "A meghajtó képességei"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "A processzor másodszintű gyorstárának mérete"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "A meghajtó speciális képességei (írási képesség és/vagy DVD-támogatás)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "A meghajtó képességei"
+msgid "this field describes the device"
+msgstr "Ez a mező az eszköz leírását tartalmazza"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "A meghajtó speciális képességei (írási képesség és/vagy DVD-támogatás)"
+msgid "Old device file"
+msgstr "Régi eszközfájl"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
 #, c-format
-msgid "Coma bug"
-msgstr "Coma hiba"
+msgid "old static device name used in dev package"
+msgstr "A dev csomagban használt régi statikus eszköznév"
 
 #: standalone/harddrake2:37
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "Tartalmazza-e a CPU a Cyrix 6x86 Coma hibát"
-
-#: standalone/harddrake2:38
-#, c-format
-msgid "Cpuid family"
-msgstr "A processzor családazonosítója"
+msgid "New devfs device"
+msgstr "Új devfs-eszköz"
 
 #: standalone/harddrake2:38
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "A processzor családazonosítója (például i686 esetén ez 6)"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "A kernelbeli devfs által előállított új dinamikus eszköznév"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid level"
-msgstr "CPUID-szint"
+msgid "Module"
+msgstr "Modul"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "A CPUID utasítással lekérdezhető információk szintje"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "Az eszközt kezelő linuxos kernelmodul"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Frekvencia (MHz)"
+msgid "Extended partitions"
+msgstr "Kiterjesztett partíciók"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"A CPU órajele MHz-ben (Megahertz - más tulajdonságokkal együtt meghatározza "
-"a CPU által másodpercenként végrehajtott utasítások számát)"
+msgid "the number of extended partitions"
+msgstr "A kiterjesztett partíciók száma"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
 #, c-format
-msgid "this field describes the device"
-msgstr "Ez a mező az eszköz leírását tartalmazza"
+msgid "Geometry"
+msgstr "Geometria"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "Régi eszközfájl"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "A lemez geometriája: cilinder/fej/szektor"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "A dev csomagban használt régi statikus eszköznév"
+msgid "Disk controller"
+msgstr "Lemezvezérlő"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Új devfs-eszköz"
+msgid "the disk controller on the host side"
+msgstr "A gépoldali lemezvezérlő"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "A kernelbeli devfs által előállított új dinamikus eszköznév"
+msgid "class of hardware device"
+msgstr "A hardvereszköz osztálya"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Modell"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "Merevlemez-modell"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "Hálózati nyomtatóport"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Modul"
+msgid "Primary partitions"
+msgstr "Elsődleges partíciók"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "Az eszközt kezelő linuxos kernelmodul"
+msgid "the number of the primary partitions"
+msgstr "Az elsődleges partíciók száma"
 
 #: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "Új partíció létrehozása"
+#, c-format
+msgid "the vendor name of the device"
+msgstr "Az eszköz gyártójának neve"
 
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "A processzor száma"
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr "PCI-busz azonosítója"
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "A PCI-busz, amelyre az eszköz csatlakoztatva van"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCI-eszközszám"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "A PCI-eszközszám"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "PCI-funkciószám"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "A PCI-funkciószám"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "Gyártóazonosító"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "A gyártó szabványos numerikus azonosítója"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "Eszközazonosító"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "Az eszköz numerikus azonosítója"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "Al-gyártóazonosító"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "A gyártó numerikus al-azonosítója"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "Al-eszközazonosító"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "Az eszköz numerikus al-azonosítója"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "Az eszköz USB-azonosítója"
+
+#: 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 ""
+"Rendszerindításkor a Linux kernel inicializál egy időzítési számlálót egy "
+"számlálóciklus segítségével. Ennek a műveletnek az eredménye Bogomips "
+"értékként eltárolódik, amely egyfajta CPU-sebességi értéknek is felfogható."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Gyorstárméret"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "A processzor másodszintű gyorstárának mérete"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Coma hiba"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "Tartalmazza-e a CPU a Cyrix 6x86 Coma hibát"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "A processzor családazonosítója"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "A processzor családazonosítója (például i686 esetén ez 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "CPUID-szint"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "A CPUID utasítással lekérdezhető információk szintje"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Frekvencia (MHz)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"A CPU órajele MHz-ben (Megahertz - más tulajdonságokkal együtt meghatározza "
+"a CPU által másodpercenként végrehajtott utasítások számát)"
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Jelzők (flag-ek)"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "A kernel által közölt CPU-tulajdonságok"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdiv-hiba"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -22485,54 +24314,44 @@ msgstr ""
 "A korai Intel Pentium processzorok lebegőpontos egysége hibás - lebegőpontos "
 "osztás esetén (fdiv) nem mindig a megfelelő eredményt adták"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "Van-e FPU"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "Ha igen, akkor a processzor rendelkezik aritmetikai társprocesszorral"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Van-e az FPU-nak IRQ-vektora"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "Ha igen, akkor az aritmetikai társprocesszor rendelkezik kivételvektorral"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00F-hiba"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "A korai Pentiumok hibásak voltak - az F00F bájtkód értelmezésekor lefagytak"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "Visszatöltés"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "Halt-hiba"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -22541,128 +24360,66 @@ msgstr ""
 "A korai i486DX-100 processzorok közül nem mindegyik képes megbízhatóan "
 "visszatérni működési üzemmódba a \"halt\" utasítás végrehajtása után"
 
-# pen drive esetén is ez jelenik meg, nem csak floppynál
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Az adathordozó formátuma"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "A meghajtó által támogatott adathordozó-formátum"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "A CPU algenerációja"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:78
 #, c-format
-msgid "class of hardware device"
-msgstr "A hardvereszköz osztálya"
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "A CPU generációszáma (például Pentium III esetén ez 8)"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Modell"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "Merevlemez-modell"
-
-#: standalone/harddrake2:64
-#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "A CPU generációszáma (például PentiumIII esetén ez 8)"
-
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Modellnév"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "A CPU gyártójának hivatalos neve"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Gombok száma"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "Az egér gombjainak száma"
-
 # egérnél is ez jelenik meg, nem csak CPU-nál
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "Az eszköz neve"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "Hálózati nyomtatóport"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "Processzorazonosító"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "A processzor száma"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "Partíciók formázása"
-
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "A processzor száma"
-
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Verzió"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "A CPU verziója (generációt jelölő al-modellszám)"
 
-#: standalone/harddrake2:72
-#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "Az egér által használt busz típusa"
-
-#: standalone/harddrake2:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "Az eszköz gyártójának neve"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "A processzor gyártójának neve"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Írásvédelem"
 
-#: 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 ""
@@ -22670,60 +24427,191 @@ msgstr ""
 "állít be - ezzel megakadályozható, hogy a kernel ellenőrizetlenül "
 "hozzáférjen a felhasználói memóriához (ez tulajdonképpen hibavédelmet jelent)"
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+# pen drive esetén is ez jelenik meg, nem csak floppynál
+#: standalone/harddrake2:88
+#, c-format
+msgid "Floppy format"
+msgstr "Az adathordozó formátuma"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "A meghajtó által támogatott adathordozó-formátum"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Csatorna"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "EIDE-/SCSI-csatorna"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Lemezazonosító"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "Általában a lemez sorozatszáma"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Logikai egységszám"
+
+#: 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 ""
+"A SCSI-célszám (LUN). A géphez kapcsolt SCSI-eszközöket egyedileg\n"
+"azonosítja a csatornaszám, a célazonosító és a logikai egységszám."
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Eszközfájl"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr "Az egér kernelbeli meghajtójával kommunikáló eszközfájl"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr "Emulált görgő"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "Emulálva van-e az egérgörgő"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "Az egér típusa"
+
+# egérnél is ez jelenik meg, nem csak CPU-nál
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "Az egér neve"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Gombok száma"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "Az egér gombjainak száma"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "Az egér által használt busz típusa"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr "Az X11 által használt egérprotokoll"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "A grafikus rendszer által az egérhez használt protokoll"
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Azonosítás"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Kapcsolat"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Teljesítmény"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Hibák"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partíciók"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Tulajdonságok"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Beállítások"
 
-#: 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 "/_Segítség"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/_Nyomtatók automatikus felderítése"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/_Modemek automatikus felderítése"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_Jaz meghajtók automatikus felderítése"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Kilépés"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Mezőleírások"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "HardDrake segítség"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"A mezők leírása:\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 "
@@ -22732,68 +24620,75 @@ msgstr ""
 "Ha kijelöl egy eszközt, akkor megjelennek az eszköz adatai a jobb oldali "
 "részben (\"Információ\")"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Hibabejelentés"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Névjegy..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "A HardDrake névjegye"
 
 #. -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 ""
-"HardDrake - Mandrake hardverbeállítási program.\n"
+"HardDrake - Mandrakelinux hardverbeállítási program.\n"
 "<span foreground=\"royalblue3\">Verzió:</span> %s\n"
 "<span foreground=\"royalblue3\">Szerző:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "HardDrake2 verzió %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "A megtalált hardver"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Modul beállítása"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Beállítóprogram indítása"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Vegyes"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -22801,37 +24696,42 @@ msgstr ""
 "Ha a bal oldali fában rákattint egy eszközre, megjelennek itt az eszköz "
 "adatai."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "másodlagos"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "elsődleges"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "író"
 
-#: 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 "Válasszon billentyűzetkiosztást."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Parancsértelmezőben a BackSpace billentyű \"Delete\"-et jelentsen?"
 
-#: 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 "A módosítás megtörtént, de az érvénybe lépéséhez ki kell jelentkezni"
@@ -22839,211 +24739,206 @@ msgstr "A módosítás megtörtént, de az érvénybe lépéséhez ki kell jelen
 # *drak* tools aren't hiding their work from users anymore.
 # Thanks to the 'explanations' concept, each utility shows
 # what it did by writing to /var/log/explanations
-#: standalone/logdrake:51
-#, fuzzy, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Mandrake eszközök - magyarázat"
+#: standalone/logdrake:50
+#, c-format
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinux-eszközök naplói"
 
-#: standalone/logdrake:52
-#, fuzzy, c-format
+#: standalone/logdrake:51
+#, c-format
 msgid "Logdrake"
-msgstr "logdrake"
+msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Csak a kijelölt napot jelenítse meg"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Fájl/Ú_j"
 
-#: 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 "/Fájl/_Megnyitás"
 
-#: 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 "/Fájl/M_entés"
 
-#: 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 "/Fájl/Mentés más_ként"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Fájl/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Beállítások/Próba"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Segítség/_Névjegy..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
-msgstr ""
+msgstr "Azonosítás"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
-msgstr ""
+msgstr "Felhasználó"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
-msgstr ""
+msgstr "Üzenetek"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
-msgstr ""
+msgstr "Rendszernapló"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "keresés"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Naplófigyelő"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Beállítások"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Ezzel egyező"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "de ezzel nem egyező"
 
 # több is választható
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Válasszon fájlt"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Naptár"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "A fájl tartalma"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Email-figyelmeztetés"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
-msgstr ""
+msgid "The alert wizard has failed unexpectedly:"
+msgstr "Probléma lépett fel a figyelmeztetési varázslóban:"
 
 #: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "a fájl elemzése folyamatban: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
-msgstr "Apache World Wide Web kiszolgáló"
+msgstr "Apache World Wide Web-kiszolgáló"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Tartománynév-feloldó"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP-kiszolgáló"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix email-kiszolgáló"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba-kiszolgáló"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH-kiszolgáló"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin szolgáltatás"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd szolgáltatás"
 
-#: standalone/logdrake:424
-#, fuzzy, c-format
+#: standalone/logdrake:394
+#, c-format
 msgid "Configure the mail alert system"
-msgstr "A CUPS nyomtatási rendszer beállítása"
+msgstr "Az email-figyelmeztetési rendszer beállítása"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
-msgstr ""
+msgstr "Az email-figyelmeztetési rendszer leállítása"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Email-figyelmeztetés beállításai"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23054,17 +24949,17 @@ msgstr ""
 "\n"
 "A programmal beállítható a figyelmeztetések küldése.\n"
 
-#: standalone/logdrake:436
-#, fuzzy, c-format
+#: standalone/logdrake:406
+#, c-format
 msgid "What do you want to do?"
-msgstr "Hová szeretné csatolni ezt: \"%s\"?"
+msgstr "Mit szeretne tenni?"
 
-#: standalone/logdrake:443
-#, fuzzy, c-format
+#: standalone/logdrake:413
+#, c-format
 msgid "Services settings"
-msgstr "szolgáltatásbeállítás"
+msgstr "Szolgáltatásbeállítás"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23074,52 +24969,50 @@ msgstr ""
 "nem fut"
 
 # You will receive an alert if the load is higher than this value
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Terhelésbeállítás"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "A rendszer figyelmeztetést küld, ha a terhelés ezen értéknél magasabb"
 
 # You will receive an alert if the load is higher than this value
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Terhelés"
 
-#: standalone/logdrake:458
-#, fuzzy, c-format
+#: standalone/logdrake:428
+#, c-format
 msgid "Alert configuration"
-msgstr "figyelmeztetés beállítása"
+msgstr "Figyelmeztetés beállítása"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Adja meg az email-címét "
 
-#: standalone/logdrake:460
-#, fuzzy, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
-msgstr ""
-"Adja meg azon gép IP-címét és portszámát, amelynek a nyomtatóit használni "
-"szeretné."
+#: standalone/logdrake:430
+#, c-format
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
+msgstr "és adja meg a használni kívánt SMTP-kiszolgáló nevét (vagy IP-címét)"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
-msgstr ""
+msgstr "A varázsló beállította az email-figyelmeztetést."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
-msgstr ""
+msgstr "A varázsló kikapcsolta az email-figyelmeztetést."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Mentés másként..."
@@ -23144,122 +25037,172 @@ msgstr "Egértesztelés"
 msgid "Please test your mouse:"
 msgstr "Tesztelje le az egeret:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "A(z) \"%s\" jelű csatolón a hálózat aktív"
+
+#. -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 ""
+"A hálózat inaktív a(z) \"%s\" jelű csatolón. Kattintson a \"Hálózat "
+"beállítása\" funkcióra."
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Kapcsolódás: %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Lekapcsolódás: %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Hálózatfigyelés"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Hálózat beállítása"
+
+#. -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 "Frissítés"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Online segítség"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Minden rendszerindításnál induljon el"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Hálózatfigyelés"
 
-#: standalone/net_monitor:92
-#, fuzzy, c-format
+#: standalone/net_monitor:104
+#, c-format
 msgid "Global statistics"
-msgstr "Statisztika"
+msgstr "Globális statisztika"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
-msgstr ""
+msgstr "Pillanatnyi"
 
-#: standalone/net_monitor:95
-#, fuzzy, c-format
+#: standalone/net_monitor:107
+#, c-format
 msgid "Average"
-msgstr "átlag"
+msgstr "Átlagos"
 
-#: standalone/net_monitor:96
-#, fuzzy, c-format
+#: standalone/net_monitor:108
+#, c-format
 msgid ""
 "Sending\n"
 "speed:"
-msgstr "Küldési sebesség:"
+msgstr ""
+"Küldési\n"
+"sebesség:"
 
-#: standalone/net_monitor:97
-#, fuzzy, c-format
+#: standalone/net_monitor:109
+#, c-format
 msgid ""
 "Receiving\n"
 "speed:"
-msgstr "Fogadási sebesség:"
+msgstr ""
+"Fogadási\n"
+"sebesség:"
 
-#: standalone/net_monitor:100
-#, fuzzy, c-format
+#: standalone/net_monitor:113
+#, c-format
 msgid ""
 "Connection\n"
 "time: "
-msgstr "A kapcsolat időtartama: "
+msgstr ""
+"A kapcsolat\n"
+"időtartama: "
+
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Azonos skála használata a fogadási és a küldési adatokhoz"
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "A kapcsolat tesztelése..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Lekapcsolódás az internetről "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Kapcsolódás az internetre "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Az internetről való lekapcsolódás nem sikerült."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Az internetről való lekapcsolódás megtörtént."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "A kapcsolat létrejött."
 
-#: 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 ""
 "A kapcsolódás nem sikerült.\n"
-"Ellenőrizze a beállításokat a Mandrake Vezérlőközpontban."
+"Ellenőrizze a beállításokat a Mandrakelinux Vezérlőközpontban."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Színbeállítás"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "elküldve: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "fogadva: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "átlag"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Helyi mérés"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "átvitt"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "fogadott"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23268,399 +25211,398 @@ msgstr ""
 "Figyelmeztetés: Egy másik internetkapcsolat is létezik, esetlegesen a "
 "hálózatot használva."
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Lekapcsolódás: %s"
-
-#: standalone/net_monitor:421
+#: standalone/net_monitor:475
 #, c-format
-msgid "Connect %s"
-msgstr "Kapcsolódás: %s"
-
-#: standalone/net_monitor:426
-#, fuzzy, c-format
 msgid "No internet connection configured"
-msgstr "Internetkapcsolat beállítása"
+msgstr "Nincs beállítva internetkapcsolat"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Nyomtatóbeállítások betöltése..."
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "A telepített nyomtatók adatainak beolvasása..."
 
-#: standalone/printerdrake:129
-#, fuzzy, c-format
+#: standalone/printerdrake:134
+#, c-format
 msgid "%s Printer Management Tool"
-msgstr "Nyomtatókezelés \n"
+msgstr "%s nyomtatókezelési eszköz"
 
-#: 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 "/Mű_veletek"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Nyomtató felvétele"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Beállítás _alapértelmezettnek"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/Mó_dosítás"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Szakértői mód"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/F_rissítés"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Nyomtató felvétele"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/A _CUPS beállítása"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Keresés:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Szűrő alkalmazása"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Alap"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Nyomtatónév"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "A csatlakozás típusa"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Kiszolgálónév"
 
 #. -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 "Nyomtató felvétele"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Új nyomtató felvétele"
 
 #. -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 "Beállítás alapértelmezettnek"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "A kijelölt nyomtató alapértelmezett nyomtatóvá tétele"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "A kijelölt nyomtató szerkesztése"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "A kijelölt nyomtató törlése"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Frissítés"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "A lista felfrissítése"
 
 #. -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 "A CUPS beállítása"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "A CUPS nyomtatási rendszer beállítása"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Letiltva"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "A program szerzői: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Nyomtatókezelés \n"
 
-#: standalone/scannerdrake:50
-#, fuzzy, c-format
+#: standalone/scannerdrake:51
+#, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
 "\n"
 "Do you want to install the SANE packages?"
-msgstr "A(z) %s csomagot telepíteni kell. Szeretné telepíteni?"
+msgstr ""
+"A SANE-csomagokat telepíteni kell a lapolvasók kezeléséhez.\n"
+"\n"
+"Szeretné telepíteni azokat?"
 
-#: standalone/scannerdrake:54
-#, fuzzy, c-format
+#: standalone/scannerdrake:55
+#, c-format
 msgid "Aborting Scannerdrake."
-msgstr "ScannerDrake"
+msgstr "Kilépés a Scannerdrake programból."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr "Nem sikerült telepíteni a lapolvasó-beállításhoz szükséges csomagokat."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "A ScannerDrake most nem lesz elindítva."
 
-#: 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 "Beállított lapolvasók keresése..."
 
-#: 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 "Új lapolvasók keresése..."
 
-#: 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 "A beállított lapolvasók listájának újragenerálása..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
-#, fuzzy, c-format
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
+#, c-format
 msgid "The %s is not supported by this version of %s."
-msgstr "A Mandrakelinux jelenleg használt verziója nem támogatja ezt: %s."
+msgstr "A(z) %s nem támogatott a(z) %s jelenleg használt verziójában."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "\"%s\" található itt: \"%s\"; szeretne automatikus beállítást?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "\"%s\" nem szerepel a lapolvasó-adatbázisban; beállítja saját kezűleg?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Válasszon egy lapolvasó-modellt"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Felismert modell: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Port: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "A ScannerDrake jelenleg használt verziója nem támogatja ezt: %s."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
-msgstr ""
+msgstr "Firmware-fájl ne legyen telepítve"
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
+"Elképzelhető, hogy az Ön %s eszköze minden egyes bekapcsolásakor firmware-"
+"feltöltést igényel."
 
-#: 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 ""
+msgstr "Ebben az esetben automatizálttá tehető ez a tevékenység."
 
-#: 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 ""
+"Ennek elvégzéséhez rendelkezésre kell bocsátania a lapolvasóhoz tartozó "
+"firmware-fájlt, hogy azt telepíteni lehessen."
 
-#: 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 ""
+"A fájl megtalálható a lapolvasóval kapott lemezen, a gyártó weboldalán vagy "
+"esetleg egy windowsos partíción."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
-msgstr ""
+msgstr "Firmware-fájl telepítése innen:"
 
-#: standalone/scannerdrake:198
-#, fuzzy, c-format
+#: standalone/scannerdrake:194
+#, c-format
 msgid "Select firmware file"
-msgstr "Fájlválasztás"
+msgstr "Firmware-fájl kiválasztása"
 
-#: 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 ""
+msgstr "\"%s\" nevű fájl nem létezik, vagy a fájl nem olvasható."
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
+"Elképzelhető, hogy az Ön lapolvasói minden egyes bekapcsolásukkor firmware-"
+"feltöltést igényelnek."
 
-#: 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 ""
+"Ennek elvégzéséhez rendelkezésre kell bocsátania a lapolvasókhoz tartozó "
+"firmware-fájlokat, hogy azokat telepíteni lehessen."
 
-#: 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 ""
+"Ha már telepítette a lapolvasó firmware-fájlját, akkor itt frissítheti azt "
+"az új firmware-fájl segítségével."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
-msgstr ""
+msgstr "Firmware telepítése ehhez:"
 
-#: standalone/scannerdrake:256
-#, fuzzy, c-format
+#: standalone/scannerdrake:252
+#, c-format
 msgid "Select firmware file for the %s"
-msgstr "Fájlválasztás"
+msgstr "Válassza ki a firmware-fájlt ehhez: %s"
 
-#: standalone/scannerdrake:274
-#, fuzzy, c-format
+#: standalone/scannerdrake:270
+#, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "Fájlválasztás"
+msgstr "Nem sikerült telepíteni a firmware-fájlt ehhez: %s."
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
-msgstr ""
+msgstr "A(z) %s eszközhöz tartozó firmware-fájl telepítése megtörtént."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Ez az eszköz nincs támogatva: %s"
 
-#: standalone/scannerdrake:302
-#, fuzzy, c-format
+#: standalone/scannerdrake:298
+#, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "A(z) \"%s\" eszközt a PrinterDrake programmal lehet beállítani.\n"
-"A PrinterDrake-et a Mandrake Vezérlőközpont \"Hardver\" részében indíthatja "
-"el."
+"A PrinterDrake-et a(z) %s Vezérlőközpont \"Hardver\" részében indíthatja el."
 
-#: 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 "Az elérhető portok automatikus felderítése"
 
-#: 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 "Válassza ki, melyik eszközhöz csatlakozik a(z) \"%s\" eszköz"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 "(Megjegyzés: a párhuzamos portokra nem alkalmazható az automatikus "
 "felderítés)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "válassza ki az eszközt"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Lapolvasók keresése..."
 
-#: standalone/scannerdrake:380
-#, fuzzy, c-format
+#: standalone/scannerdrake:376
+#, c-format
 msgid ""
 "Your %s has been configured.\n"
 "You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/"
 "Graphics in the applications menu."
 msgstr ""
 "Az Ön \"%s\" eszköze beállításra került.\n"
-"Dokumentumok beolvasására használhatja például az \"XSane\" programot, amely "
-"az alkalmazásmenü \"Multimédia/Grafikus programok\" részében található."
+"Dokumentumok beolvasására használhatja például az \"XSane\" vagy a \"Kooka\" "
+"programot, amelyek az alkalmazásmenü \"Multimédia/Grafikus programok\" "
+"részében találhatók."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23672,7 +25614,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23684,42 +25626,42 @@ msgstr ""
 "\n"
 "%s\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 "Nem található elérhető lapolvasó a gépen.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Új lapolvasók keresése"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Lapolvasó felvétele saját kezűleg"
 
-#: standalone/scannerdrake:438
-#, fuzzy, c-format
+#: standalone/scannerdrake:434
+#, c-format
 msgid "Install/Update firmware files"
-msgstr "Fájlválasztás"
+msgstr "Firmware-fájlok telepítése/frissítése"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Lapolvasók megosztása"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Az összes távoli gép"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Ezen gép"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -23728,7 +25670,7 @@ msgstr ""
 "Itt megadható, hogy a gép lapolvasói elérhetők legyenek-e távoli gépek "
 "számára, és ha igen, akkor melyek számára."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23737,121 +25679,124 @@ msgstr ""
 "Meghatározhatja azt is, hogy a távoli gépek lapolvasói elérhetők legyenek-e "
 "ezen a gépen."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "A gép lapolvasói elérhetők más gépek számára"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Lapolvasók megosztása a következő gépek felé: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Távoli gépek lapolvasóinak használata"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "A következő gépeken levő lapolvasók használata: "
 
-#: 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 "A helyi lapolvasók megosztása"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr "A következő gépek számára elérhetők a helyi lapolvasók:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Gép felvétele"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "A kijelölt gép szerkesztése"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "A kijelölt gép eltávolítása"
 
-#: 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 "A gép neve/IP-címe:"
 
-#: 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 "Válassza ki, melyik gépen legyenek elérhetők a helyi lapolvasók:"
 
-#: 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 "Meg kell adni egy gépnevet vagy egy IP-címet.\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 "Ez a gép már szerepel a listában; nem vehető fel még egyszer.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Távoli lapolvasók használata"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "A következő gépek lapolvasóinak használata:"
 
-#: standalone/scannerdrake:913
-#, fuzzy, c-format
+#: standalone/scannerdrake:909
+#, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
-msgstr "A(z) %s csomagot telepíteni kell. Szeretné telepíteni?"
+msgstr ""
+"A helyi lapolvasó(k) megosztásához telepíteni kell a \"saned\" programot.\n"
+"\n"
+"Szeretné telepíteni a \"saned\" csomagot?"
 
-#: 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 "A lapolvasó(k) nem lesz(nek) elérhető(k) a hálózaton."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr "A(z) \"%s\" hardverosztály bizonyos eszközei eltávolításra kerültek:\n"
+msgstr "A(z) \"%s\" hardverosztály bizonyos eszközei el lettek távolítva:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
-msgstr ""
+msgstr "- %s el lett távolítva\n"
 
-#: standalone/service_harddrake:66
-#, fuzzy, c-format
+#: standalone/service_harddrake:108
+#, c-format
 msgid "Some devices were added: %s\n"
-msgstr "Bizonyos eszközök fel lettek véve:\n"
+msgstr "Új eszközök kerültek a rendszerbe: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
-msgstr ""
+msgstr "- %s bekerült a rendszerbe\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Hardverfelderítés folyamatban"
@@ -23859,12 +25804,12 @@ msgstr "Hardverfelderítés folyamatban"
 #: standalone/service_harddrake_confirm:7
 #, c-format
 msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
-msgstr ""
+msgstr "Hardverváltozások a(z) \"%s\" osztályban (%s másodperc a válaszra)"
 
 #: standalone/service_harddrake_confirm:8
-#, fuzzy, c-format
-msgid "Do you want to run the appropriate config tool ?"
-msgstr "Ki szeretné próbálni a beállításokat?"
+#, c-format
+msgid "Do you want to run the appropriate config tool?"
+msgstr "Szeretné elindítani a megfelelő beállítóeszközt?"
 
 #: steps.pm:14
 #, c-format
@@ -23889,7 +25834,7 @@ msgstr "Merevlemez keresése"
 #: steps.pm:18
 #, c-format
 msgid "Select installation class"
-msgstr "Válasszon telepítési módot"
+msgstr "Telepítési mód kiválasztása"
 
 #: steps.pm:19
 #, c-format
@@ -23914,7 +25859,7 @@ msgstr "Csomagok kiválasztása"
 #: steps.pm:24
 #, c-format
 msgid "Install system"
-msgstr "Rendszer telepítése"
+msgstr "Rendszertelepítés"
 
 #: steps.pm:25
 #, c-format
@@ -23958,22 +25903,22 @@ msgstr "Frissítések telepítése"
 msgid "Exit install"
 msgstr "Kilépés a telepítőből"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Elfogadja?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "A fa kibontása"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "A fa összecsukása"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Váltás sima és csoportok szerint rendezett nézet között"
@@ -23988,169 +25933,1198 @@ msgstr ""
 "Telepítés a \"Következő\" gombbal; kilépés a \"Mégsem\" gombbal."
 
 #: wizards.pm:99
-#, fuzzy, c-format
+#, c-format
 msgid "Installation failed"
-msgstr "A témákat nem sikerült telepíteni."
+msgstr "A telepítés hibával ért véget."
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Irodai munkaállomás"
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "Névtelen BIND használata "
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
-"(KSpread, Gnumeric), PDF-nézegetők, ..."
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Játékgép"
+#~ msgid "NO"
+#~ msgstr "NEM"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
+#~ msgid "YES"
+#~ msgstr "IGEN"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimédiás munkaállomá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 ""
+#~ "A következő opciókkal be lehet állítani a rendszer biztonságát.\n"
+#~ "Ha magyarázatra van szüksége, olvassa el a tippszöveget.\n"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "A ScannerDrake jelenleg használt verziója nem támogatja ezt: %s."
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetes munkaállomás"
+#~ msgid "Hide Release Notes"
+#~ msgstr "Verzióinformáció elrejtése"
 
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Eszközök levelezéshez, hírkezeléshez (pine, mutt, tin, ...) és a Web "
-"böngészéséhez"
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "cseh (QWERTZ)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Hálózati számítógép (kliens)"
+#~ msgid "German"
+#~ msgstr "német"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak-féle"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Beállítás"
+#~ msgid "Spanish"
+#~ msgstr "spanyol"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Segédprogramok a számítógép beállításához"
+#~ msgid "Finnish"
+#~ msgstr "finn"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Parancssori eszközök"
+#~ msgid "French"
+#~ msgstr "francia"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
+#~ msgid "Norwegian"
+#~ msgstr "norvég"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-munkaállomás"
+#~ msgid "Polish"
+#~ msgstr "lengyel"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
-"eszközökkel együtt"
+#~ msgid "Russian"
+#~ msgstr "orosz"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOME-munkaállomás"
+#~ msgid "Swedish"
+#~ msgstr "svéd"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+#~ msgid "Albanian"
+#~ msgstr "albán"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Más grafikus környezetek"
+#~ msgid "Armenian (old)"
+#~ msgstr "örmény (régi)"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, WindowMaker, Enlightenment, Fvwm, ..."
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "örmény (írógép)"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++ fejlesztőkönyvtárak, programok és include fájlok"
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "örmény (fonetikus)"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentáció"
+#~ msgid "Arabic"
+#~ msgstr "arab"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "azerbajdzsáni (latin)"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "Belgian"
+#~ msgstr "belga"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
+#~ msgid "Bengali"
+#~ msgstr "bengáli"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "bolgár (fonetikus)"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "bolgár (BDS)"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Levelezés"
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "brazil (ABNT-2)"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix email-kiszolgáló"
+#~ msgid "Bosnian"
+#~ msgstr "boszniai"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Adatbázis"
+#~ msgid "Belarusian"
+#~ msgstr "fehérorosz"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vagy MySQL adatbázis-kiszolgáló"
+#~ msgid "Swiss (German layout)"
+#~ msgstr "svájci (német kiosztás)"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tűzfal/útválasztó (router)"
+#~ msgid "Swiss (French layout)"
+#~ msgstr "svájci (francia kiosztás)"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-átjáró"
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "cseh (QWERTY)"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Kiszolgáló hálózati számítógépekhez"
+#~ msgid "German (no dead keys)"
+#~ msgstr "német (\"dead key\" nélkül)"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-, SMB-, proxy- és SSH-kiszolgáló"
+#~ msgid "Devanagari"
+#~ msgstr "devanagari"
+
+#~ msgid "Danish"
+#~ msgstr "dán"
+
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak-féle (USA)"
+
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak-féle (eszperantó)"
+
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak-féle (norvég)"
+
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak-féle (svéd)"
+
+#~ msgid "Estonian"
+#~ msgstr "észt"
+
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "grúz (\"orosz\" kiosztás)"
+
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "grúz (\"latin\" kiosztás)"
+
+#~ msgid "Greek"
+#~ msgstr "görög"
+
+#~ msgid "Greek (polytonic)"
+#~ msgstr "görög (politon)"
+
+#~ msgid "Gujarati"
+#~ msgstr "gudzsarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "gurmukhi"
+
+#~ msgid "Hungarian"
+#~ msgstr "magyar"
+
+#~ msgid "Croatian"
+#~ msgstr "horvát"
+
+#~ msgid "Irish"
+#~ msgstr "ír"
+
+#~ msgid "Israeli"
+#~ msgstr "izraeli"
+
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "izraeli (fonetikus)"
+
+#~ msgid "Iranian"
+#~ msgstr "iráni"
+
+#~ msgid "Icelandic"
+#~ msgstr "izlandi"
+
+#~ msgid "Italian"
+#~ msgstr "olasz"
+
+#~ msgid "Inuktitut"
+#~ msgstr "inuktitut"
+
+#~ msgid "Japanese 106 keys"
+#~ msgstr "japán 106 billentyűs"
+
+#~ msgid "Kannada"
+#~ msgstr "kannada"
+
+#~ msgid "Korean keyboard"
+#~ msgstr "koreai billentyűzet"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Eszközök levelezéshez, hírkezeléshez és a Web böngészéséhez"
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "kirgiz billentyűzet"
+
+#~ msgid "Latin American"
+#~ msgstr "latin-amerikai"
+
+#~ msgid "Laotian"
+#~ msgstr "laoszi"
+
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "litván AZERTY (régi)"
+
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "litván AZERTY (új)"
+
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "litván \"számsor\" QWERTY"
+
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "litván \"fonetikus\" QWERTY"
+
+#~ msgid "Latvian"
+#~ msgstr "lett"
+
+#~ msgid "Malayalam"
+#~ msgstr "malayalam"
+
+#~ msgid "Macedonian"
+#~ msgstr "macedón"
+
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "myanmar (burmai)"
+
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "mongol (cirill)"
+
+#~ msgid "Maltese (UK)"
+#~ msgstr "máltai (UK)"
+
+#~ msgid "Maltese (US)"
+#~ msgstr "máltai (US)"
+
+#~ msgid "Dutch"
+#~ msgstr "holland"
+
+#~ msgid "Oriya"
+#~ msgstr "oriya"
+
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "lengyel (qwerty)"
+
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "lengyel (qwertz)"
+
+#~ msgid "Portuguese"
+#~ msgstr "portugál"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "kanadai (Quebec)"
+
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "román (qwertz)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "román (qwerty)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "orosz (fonetikus)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "saami (norvég)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "saami (svéd/finn)"
+
+#~ msgid "Slovenian"
+#~ msgstr "szlovén"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "szlovák (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "szlovák (QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "szerb (cirill)"
+
+#~ msgid "Syriac"
+#~ msgstr "szír"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "szír (fonetikus)"
+
+#~ msgid "Telugu"
+#~ msgstr "telugu"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "tamil (ISCII kiosztás)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "tamil (írógép-kiosztás)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "thaiföldi billentyűzet"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "tádzsik billentyűzet"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "török (hagyományos \"F\" modell)"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "török (modern \"Q\" modell)"
+
+#~ msgid "Ukrainian"
+#~ msgstr "ukrán"
+
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "üzbég (cirill)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "vietnámi \"számsor\" QWERTY"
+
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "jugoszláv (latin)"
+
+#~ msgid "No devices found"
+#~ msgstr "Eszköz nem található"
+
+#~ msgid "Remote CUPS server and no local CUPS daemon: "
+#~ msgstr "Távoli CUPS-kiszolgáló, nincs helyi CUPS-szolgáltatás: "
+
+#~ msgid "Could not install necessary packages, %s cannot be started!"
+#~ msgstr ""
+#~ "Nem sikerült telepíteni a szükséges csomagokat, ezért a(z) %s nem "
+#~ "indítható."
+
+#~ msgid ""
+#~ "You don't have any configured Internet connection.\n"
+#~ "Please run \"Internet access\" in control center."
+#~ msgstr ""
+#~ "Nincs beállítva egyetlen internetkapcsolat sem.\n"
+#~ "Kapcsolat létrehozásához használja az \"Internet-hozzáférés\"\n"
+#~ "funkciót a Mandrakelinux Vezérlőközpontban."
+
+#~ msgid ""
+#~ "Welcome to the UPS configuration utility.\n"
+#~ "\n"
+#~ "Here, you'll be add a new UPS to your system.\n"
+#~ msgstr ""
+#~ "Üdvözli az UPS-beállító.\n"
+#~ "\n"
+#~ "A programmal új UPS-t vehet fel a rendszerébe.\n"
+
+#~ msgid "Enable multiple profiles"
+#~ msgstr "Több profil engedélyezése"
+
+#~ 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 ""
+#~ "Lehetősége van arra, hogy letöltse a disztribúció kiadása után "
+#~ "frissített\n"
+#~ "csomagokat. Ez általában biztonsági javításokat és hibajavításokat "
+#~ "jelent.\n"
+#~ "\n"
+#~ "A funkció használatához szükség van egy beállított internetkapcsolatra.\n"
+#~ "\n"
+#~ "Szeretné feltelepíteni a frissítéseket?"
+
+#~ msgid "Installing bootloader"
+#~ msgstr "Rendszerindító program telepítése"
+
+#~ 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 ""
+#~ "Itt lehet megadni a(z) %s modul paramétereit\n"
+#~ "a következő formátumban: \"név1=érték1 név2=érték2 ...\".\n"
+#~ "Például: \"io=0x300 irq=7\""
+
+#~ msgid ""
+#~ "Iwspy is used to set a list of addresses in a wireless network\n"
+#~ "interface and to read back quality of link information for each of "
+#~ "those.\n"
+#~ "\n"
+#~ "This information is the same as the one available in /proc/net/wireless:\n"
+#~ "quality of the link, signal strength and noise level.\n"
+#~ "\n"
+#~ "See iwpspy(8) man page for further information."
+#~ msgstr ""
+#~ "Az Iwspy program funkciója vezeték nélküli hálózati csatolók\n"
+#~ "címlistáinak beállítása és kapcsolatminőségi információk lekérdezése\n"
+#~ "azoktól.\n"
+#~ "\n"
+#~ "Ez az információ megegyezik a /proc/net/wireless fájlban levővel:\n"
+#~ "kapcsolatminőség, jelerősség és zajszint.\n"
+#~ "\n"
+#~ "További információ az iwspy(8) kézikönyvben."
+
+#~ msgid "Configuring printer..."
+#~ msgstr "A nyomtató beállítása..."
+
+#~ msgid "Configuring applications..."
+#~ msgstr "Alkalmazások beállítása..."
+
+#~ msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
+#~ msgstr "A nyomtató felvétele a StarOffice/OpenOffice.org/GIMP programba"
+
+#~ msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
+#~ msgstr "A nyomtató eltávolítása a StarOffice/OpenOffice.org/GIMP programból"
+
+#~ msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+#~ msgstr "A nyomtató felvétele a StarOffice/OpenOffice.org/GIMP programba"
+
+#~ msgid ""
+#~ "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/"
+#~ "GIMP."
+#~ msgstr ""
+#~ "A(z) \"%s\" nyomtató sikeresen fel lett véve a StarOffice/OpenOffice.org/"
+#~ "GIMP programba."
+
+#~ msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
+#~ msgstr ""
+#~ "A(z) \"%s\" nyomtatót nem sikerült felvenni a StarOffice/OpenOffice.org/"
+#~ "GIMP programba."
+
+#~ msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
+#~ msgstr "A nyomtató eltávolítása a StarOffice/OpenOffice.org/GIMP programból"
+
+#~ msgid ""
+#~ "The printer \"%s\" was successfully removed from Star Office/OpenOffice."
+#~ "org/GIMP."
+#~ msgstr ""
+#~ "A(z) \"%s\" nyomtató sikeresen el lett távolítva a StarOffice/OpenOffice."
+#~ "org/GIMP programból."
+
+#~ msgid ""
+#~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
+#~ msgstr ""
+#~ "A(z) \"%s\" nyomtatót nem sikerült eltávolítani a StarOffice/OpenOffice."
+#~ "org/GIMP programból."
+
+#~ msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+#~ msgstr ""
+#~ "<b>Gratulálunk ahhoz, hogy a Mandrakelinux rendszert választotta</b>"
+
+#~ msgid ""
+#~ "We would like to thank everyone who participated in the development of "
+#~ "this latest release."
+#~ msgstr ""
+#~ "Szeretnénk köszönetet mondani mindazoknak, akik részt vettek ennek a "
+#~ "verziónak a fejlesztésében."
+
+#~ msgid "<b>Discovery</b>"
+#~ msgstr "<b>Discovery</b>"
+
+#~ msgid ""
+#~ "The menu is task-oriented, with a single selected application per task."
+#~ msgstr "A menü feladatorientált, feladatonként egy alkalmazással."
+
+#~ msgid ""
+#~ "The powerful Open Source graphical desktop environment KDE is the desktop "
+#~ "of choice for the Discovery Pack."
+#~ msgstr ""
+#~ "A Discovery rendszer a fejlett, nyílt forráskódú KDE grafikus asztali "
+#~ "környezetet használja."
+
+#~ msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+#~ msgstr "<b>OpenOffice.org</b>: a teljes irodai csomag Linuxhoz."
+
+#~ msgid ""
+#~ "<b>WRITER</b> is a powerful word processor for creating all types of text "
+#~ "documents. Documents may include images, diagrams and tables."
+#~ msgstr ""
+#~ "A <b>Writer</b> egy fejlett szövegszerkesztő minden dokumentumtípushoz. A "
+#~ "dokumentumok tartalmazhatnak képeket, diagramokat és táblázatokat is."
+
+#~ msgid ""
+#~ "<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
+#~ "analyze and manage all of your data."
+#~ msgstr ""
+#~ "A <b>Calc</b> egy nagy tudású táblázatkezelő, amely lehetővé teszi az "
+#~ "adatok kezelését, elemzését és számítások végzését."
+
+#~ msgid ""
+#~ "<b>IMPRESS</b> is the fastest, most powerful way to create effective "
+#~ "multimedia presentations."
+#~ msgstr ""
+#~ "Az <b>Impress</b> segítségével a leggyorsabb és leghatékonyabb módon "
+#~ "készíthetők hatásos multimédiás bemutatók."
+
+#~ msgid ""
+#~ "<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
+#~ "illustrations."
+#~ msgstr ""
+#~ "A <b>Draw</b> segítségével az egyszerű diagramoktól kezdve a dinamikus "
+#~ "háromdimenziós rajzokig bármi elkészíthető."
+
+#~ msgid "<b>Surf The Internet</b>"
+#~ msgstr "<b>Böngésszen az interneten</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 ""
+#~ "A teljes értékű levelezőprogramon kívül a <b>Kontact</b> tartalmaz "
+#~ "címjegyzékkezelőt, naptárt, határidőnaplót és jegyzetkészítőt is."
+
+#~ msgid "You can also:"
+#~ msgstr "Lehetősége van továbbá:"
+
+#~ msgid "\t* browse the Web"
+#~ msgstr "\t* a web böngészésére"
+
+#~ msgid "\t* chat"
+#~ msgstr "\t* társalgásra"
+
+#~ msgid "\t* organize a video-conference"
+#~ msgstr "\t* videokonferencia szervezésére"
+
+#~ msgid "\t* create your own Web site"
+#~ msgstr "\t* saját weboldal létrehozására"
+
+#~ msgid "<b>Multimedia</b>: Software for every need!"
+#~ msgstr "<b>Multimédia</b>: alkalmazások minden igényhez"
+
+#~ msgid "Listen to audio CDs with <b>KsCD</b>."
+#~ msgstr "Hallgasson zenei CD-ket a <b>KsCD</b>-vel."
+
+#~ msgid "Listen to music files and watch videos with <b>Totem</b>."
+#~ msgstr "Hallgasson zenét és nézzen videókat a <b>Totem</b>mel."
+
+#~ msgid ""
+#~ "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+#~ msgstr ""
+#~ "Nézzen és szerkesszen képeket illetve fotókat a <b>GQview</b>-val és a "
+#~ "<b>GIMP</b>-pel."
+
+#~ msgid "Become a <b>Mandrakeclub</b> member!"
+#~ msgstr "Legyen tagja a <b>Mandrakeclub</b>nak"
+
+#~ msgid ""
+#~ "Take advantage of valuable benefits, products and services by joining "
+#~ "Mandrakeclub, such as:"
+#~ msgstr "Használja ki a Mandrakeclub-tagsággal járó előnyöket:"
+
+#~ msgid "\t* Full access to commercial applications"
+#~ msgstr "\t* teljes hozzáférés kereskedelmi alkalmazásokhoz"
+
+#~ msgid ""
+#~ "\t* Special download mirror list exclusively for Mandrakeclub Members"
+#~ msgstr ""
+#~ "\t* letöltési tükörkiszolgálók kizárólagosan a Mandrakeclub-tagok számára"
+
+#~ msgid "\t* Voting for software to put in Mandrakelinux"
+#~ msgstr "\t* szavazás a Mandrakelinux rendszerbe felveendő alkalmazásokról"
+
+#~ msgid "\t* Plus much more"
+#~ msgstr "\t* ..."
+
+#~ msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+#~ msgstr "További információk a <b>www.mandrakeclub.com</b> weboldalon."
+
+#~ msgid "Do you require assistance?"
+#~ msgstr "Szüksége van segítségre?"
+
+#~ msgid "<b>Mandrakeexpert</b> is the primary source for technical support."
+#~ msgstr ""
+#~ "A <b>Mandrakeexpert</b> az elsődleges forrás a technikai támogatáshoz."
+
+#~ msgid ""
+#~ "If you have Linux questions, subscribe to Mandrakeexpert at <b>www."
+#~ "mandrakeexpert.com</b>"
+#~ msgstr ""
+#~ "Ha Linuxszal kapcsolatos kérdései vannak, iratkozzon fel a "
+#~ "MandrakeExpertre a <b>www.mandrakeexpert.com</b> weboldalon."
+
+#~ msgid "Installation of %s failed. The following error occurred:"
+#~ msgstr "A(z) %s telepítése nem sikerült a következő hiba miatt:"
+
+#~ msgid ""
+#~ "We need to install ntp package\n"
+#~ " to enable Network Time Protocol\n"
+#~ "\n"
+#~ "Do you want to install ntp ?"
+#~ msgstr ""
+#~ "A hálózati időprotokoll (NTP)\n"
+#~ "használatához telepíteni kell\n"
+#~ "az ntp csomagot.\n"
+#~ "\n"
+#~ "Szeretné telepíteni?"
+
+#~ 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 ""
+#~ "Egy VPN-kapcsolat beállítása már megtörtént.\n"
+#~ "\n"
+#~ "A kapcsolat jelenleg engedélyezett.\n"
+#~ "\n"
+#~ "Mit szeretne tenni?"
+
+#~ 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 ""
+#~ "Egy VPN-kapcsolat beállítása már megtörtént.\n"
+#~ "\n"
+#~ "A kapcsolat jelenleg le van tiltva.\n"
+#~ "\n"
+#~ "Mit szeretne tenni?"
+
+#~ msgid "Set of tools to read and send mail and news and to browse the Web"
+#~ msgstr "Eszközök levelezéshez, hírkezeléshez és a web böngészéséhez"
+
+#~ 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 ""
+#~ "Mielőtt továbblépne, olvassa át alaposan a licencegyezményt, amely az\n"
+#~ "egész Mandrakelinux disztribúcióra érvényes. Ha elfogadja az abban\n"
+#~ "szereplő feltételeket, akkor jelölje be a(z) \"%s\" opciót.\n"
+#~ "Ha nem fogadja el valamelyik feltételt, akkor kattintson a(z)\n"
+#~ "\"%s\" gombra - ezzel újraindítja a számítógépet."
+
+#~ 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 ""
+#~ "A Mandrakelinux telepítőanyag több CD-n helyezkedik el. Ha egy "
+#~ "kiválasztott\n"
+#~ "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
+#~ "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt."
+
+#~ msgid "Use auto detection"
+#~ msgstr "Automatikus felderítés"
+
+#~ 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\": a(z) \"%s\" gombra kattintva elindul a nyomtatóbeállítási\n"
+#~ "varázsló. Nyomtatóbeállítással kapcsolatos további információkat a\n"
+#~ "felhasználói kézikönyvből lehet szerezni. Az ott bemutatott felület "
+#~ "hasonló\n"
+#~ "ahhoz, ami a telepítéskor megjelenik."
+
+#~ 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 ""
+#~ "Ebben a párbeszédablakban lehet kijelölni az automatikusan elindítandó\n"
+#~ "szolgáltatásokat.\n"
+#~ "\n"
+#~ "A telepítő megjeleníti a jelenleg telepített összes szolgáltatás "
+#~ "listáját.\n"
+#~ "Vizsgálja meg a listát alaposan, és törölje a kijelölést azok mellől,\n"
+#~ "amelyek automatikus elindítására nincs szükség.\n"
+#~ "\n"
+#~ "Egy szolgáltatás kiválasztásakor megjelenik a hozzá tartozó rövid "
+#~ "leírás.\n"
+#~ "Ha nem tudja biztosan, hogy a szolgáltatásra szükség van-e vagy\n"
+#~ "sem, akkor ne változtassa meg az alapértelmezett indítási módot.\n"
+#~ "\n"
+#~ "Gondosan járjon el, ha a gépet kiszolgálónak fogja használni,\n"
+#~ "ne indítson el egy olyan szolgáltatást sem automatikusan, amelyre nincs\n"
+#~ "szükség. A feleslegesen elindított szolgáltatások biztonsági kockázatot\n"
+#~ "jelentenek. Csak a tényleges feladatot ellátó szolgáltatásokat "
+#~ "engedélyezze."
+
+#~ 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 ""
+#~ "Grafikus kártya\n"
+#~ "\n"
+#~ "A telepítő általában felismeri és beállítja a gépben levő grafikus "
+#~ "kártyát.\n"
+#~ "Ha nem így történik, kiválaszthatja a grafikus kártyák listájából a\n"
+#~ "megfelelőt.\n"
+#~ "\n"
+#~ "Ha több grafikus modul is elérhető az Ön kártyájához - 3D gyorsítással\n"
+#~ "illetve a nélkül -, akkor kiválaszthatja az Önnek leginkább megfelelőt."
+
+#~ 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"
+#~ "A telepítő általában automatikusan megállapítja a monitor típusát, és\n"
+#~ "beállítja azt. Ha nem így történik, kiválaszthatja ebből a listából a\n"
+#~ "monitor típusát."
+
+#~ 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 ""
+#~ "Felbontás\n"
+#~ "\n"
+#~ "Itt kiválaszthatja a kívánt felbontási és színmélységi értékeket az\n"
+#~ "elérhető értékek listájából. Válassza ki az igényeinek legjobban "
+#~ "megfelelő\n"
+#~ "értékeket. A beállítások tetszőlegesen módosíthatók a telepítés után is.\n"
+#~ "A képernyőn egy mintakép fog megjelenni a kiválasztott beállítások\n"
+#~ "szemléltetésére."
+
+#~ 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 ""
+#~ "Ha több grafikus modul is elérhető az Ön kártyájához - 3D gyorsítással\n"
+#~ "illetve a nélkül -, akkor kiválaszthatja az Önnek leginkább megfelelőt."
+
+#~ 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 ""
+#~ "Beállítások\n"
+#~ "\n"
+#~ "Itt beállítható, hogy rendszerindításkor grafikus üzemmódba váltson-e a\n"
+#~ "rendszer. Ha a gép kiszolgálóként fog üzemelni, vagy nem sikerült "
+#~ "megfelelően\n"
+#~ "beállítani a grafikus üzemmódot, akkor a(z) \"%s\" lehetőséget érdemes "
+#~ "választani."
+
+#~ 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 ""
+#~ "Lehetséges, hogy amikor Ön a Mandrakelinux rendszert telepíti, már\n"
+#~ "frissítésre kerültek bizonyos csomagok a rendszer kiadása óta.\n"
+#~ "Elképzelhető, hogy bizonyos hibák ki lettek javítva, illetve\n"
+#~ "hogy meg lettek oldva bizonyos felmerült biztonsági problémák. Ezeket\n"
+#~ "a frissítéseket Ön letöltheti az interneten keresztül.\n"
+#~ "Válassza a(z) \"%s\" lehetőséget, ha van működő internetkapcsolata. Ha\n"
+#~ "inkább később kívánja telepíteni a frissítéseket, akkor a(z) \"%s\"\n"
+#~ "lehetőséget válassza.\n"
+#~ "\n"
+#~ "Ha a(z) \"%s\" lehetőséget választja, akkor megjelenik egy lista azon\n"
+#~ "helyekről, amelyekről a frissítések letölthetők. Válasszon közülük egy\n"
+#~ "Önhöz közel levőt.\n"
+#~ "Ezt követően egy csomagválasztási fa jelenik meg. Ha telepíteni kívánja "
+#~ "a\n"
+#~ "kijelölt csomagokat, akkor nyomja le a(z) \"%s\" gombot. Ha nem kíván\n"
+#~ "csomagokat telepíteni, akkor a(z) \"%s\" gombot nyomja le."
+
+#~ 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 ""
+#~ "Most kiválaszthat egy biztonsági szintet a gép számára. Alapszabály,\n"
+#~ "hogy ha fontos adatok vannak tárolva a gépen, vagy a gép kapcsolódik\n"
+#~ "az internetre, akkor érdemes magasabbra venni a biztonsági szintet.\n"
+#~ "Magasabb szint esetén viszont általában nehézkesebb a gép használata.\n"
+#~ "\n"
+#~ "Ha nem biztos benne, hogy mit volna érdemes választani, akkor válassza\n"
+#~ "az alapértelmezés szerinti lehetőséget. A biztonsági szint később is\n"
+#~ "módosítható a Mandrake Vezérlőközpontban elérhető \"draksec\" eszközzel.\n"
+#~ "\n"
+#~ "A(z) \"%s\" mező informálja a rendszert a biztonságért felelős "
+#~ "felhasználó\n"
+#~ "(ezen gép egyik felhasználója) személyéről. A biztonsági üzenetek azon\n"
+#~ "felhasználó címére lesznek küldve."
+
+#~ 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\": ellenőrizze a jelenlegi országbeállítást. Ha az nem\n"
+#~ "megfelelő, kattintson a(z) \"%s\" gombra és válasszon egy másik "
+#~ "országot.\n"
+#~ "Ha a kívánt ország nem szerepel az elsőként megjelenített listában, "
+#~ "akkor\n"
+#~ "kattintson a(z) \"%s\" gombra a teljes országlista megjelenítéséhez."
+
+#~ 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 "Várakozási idő az alapértelmezett rendszer betöltése előtt"
+
+#~ 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 ""
+#~ "Miután beállította az általános rendszerbetöltő-paramétereket, "
+#~ "megjelenik\n"
+#~ "a betöltési lehetőségek listája, amely rendszerindításkor lesz elérhető.\n"
+#~ "\n"
+#~ "Ha vannak más operációs rendszerek is a gépen, azok automatikusan fel\n"
+#~ "lesznek véve a betöltési menübe. Az aktuális beállítások módosíthatók. "
+#~ "Új\n"
+#~ "elemet a(z) \"%s\" funkcióval lehet felvenni. Egy elem módosításához\n"
+#~ "jelölje ki az elemet, majd kattintson a(z) \"%s\" gombra; eltávolításhoz\n"
+#~ "pedig a kijelölést követően a(z) \"%s\" gombra. A módosítások a(z)\n"
+#~ "\"%s\" gombbal érvényesíthetők.\n"
+#~ "\n"
+#~ "Ha valamelyik operációs rendszert nem akarja elérhetővé tenni, akkor\n"
+#~ "törölheti annak rendszerbetöltési bejegyzéseit, de ebben az esetben\n"
+#~ "később csak indítólemezzel tudja majd azt az operációs rendszert "
+#~ "elindítani."
+
+#~ 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\": ha a telepítő hangkártyát észlel a gépben, az itt fog\n"
+#~ "megjelenni. Ha az itt megjelenő hangkártya nem azonos a gépben levővel,\n"
+#~ "akkor kattintson a gombra és válasszon egy másik meghajtóprogramot."
+
+#~ msgid ""
+#~ "No ethernet network adapter has been detected on your system.\n"
+#~ "I cannot set up this connection type."
+#~ msgstr ""
+#~ "Ethernet hálózati kártya nem található a gépben.\n"
+#~ "Nem lehet beállítani ezt a kapcsolattípust."
+
+#~ msgid ""
+#~ "Please choose which network adapter you want to use to connect to "
+#~ "Internet."
+#~ msgstr ""
+#~ "Válassza ki, hogy melyik hálózati csatolón keresztül szeretne csatlakozni "
+#~ "az internetre."
+
+#~ 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 ""
+#~ "Hibajelentés küldéséhez kattintson a \"Bejelentés\" gombra.\n"
+#~ "Ekkor megjelenik a(z) \"%s\" weboldal egy böngészőablakban,\n"
+#~ "ahol egy kitöltendő űrlap lesz látható. A fenti információk el lesznek\n"
+#~ "küldve azon kiszolgálónak."
+
+#~ 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 ""
+#~ "Hibajelentés küldéséhez kattintson a \"Bejelentés\" gombra.\n"
+#~ "Ekkor megjelenik az Anthill weboldal egy böngészőablakban,\n"
+#~ "ahol a fenti információk elküldhetők hibabejelentésként."
+
+#~ 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"
+#~ "\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"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
+#~ "very\n"
+#~ "easy to use security level. It should only be used for machines not "
+#~ "connected to\n"
+#~ "any network and that are not accessible to everybody.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Standard</span>: This is the standard "
+#~ "security\n"
+#~ "recommended for a computer that will be used to connect to the Internet "
+#~ "as a\n"
+#~ "client.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">High</span>: There are already some\n"
+#~ "restrictions, and more automatic checks are run every night.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Higher</span>: The security is now high "
+#~ "enough\n"
+#~ "to use the system as a server which can accept connections from many "
+#~ "clients. If\n"
+#~ "your machine is only a client on the Internet, you should choose a lower "
+#~ "level.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
+#~ "previous\n"
+#~ "level, but the system is entirely closed and security features are at "
+#~ "their\n"
+#~ "maximum"
+#~ msgstr ""
+#~ "Itt lehet beállítani a biztonsági szintet és a gép biztonsági "
+#~ "adminisztrátorát.\n"
+#~ "\n"
+#~ "\n"
+#~ "A biztonsági adminisztrátor az a személy, aki a 'Biztonsági "
+#~ "figyelmeztetések'\n"
+#~ "opció bekapcsolt állapota esetén a biztonsággal kapcsolatos "
+#~ "figyelmeztetéseket\n"
+#~ "meg fogja kapni. Felhasználói névvel vagy email-címmel adható meg.\n"
+#~ "\n"
+#~ "\n"
+#~ "A 'Biztonsági szint' menüben több különböző előre beállított (msec) "
+#~ "biztonsági\n"
+#~ "szint közül lehet választani. A szintek a gyenge biztonságot de könnyebb\n"
+#~ "használhatóságot nyújtótól a paranoiás szintig (az utóbbi a nagyon "
+#~ "érzékeny\n"
+#~ "kiszolgálóalkalmazásokhoz használható) terjednek.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Alacsony</span>: Egyáltalán nem "
+#~ "biztonságos,\n"
+#~ "de könnyű használatot nyújtó biztonsági szint. Csak olyan gépeken "
+#~ "javasolt a\n"
+#~ "használata, amelyek nincsenek hálózatba kötve és csak kevesek által\n"
+#~ "használhatók.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Szabványos</span>: Ez a szabványos\n"
+#~ "biztonsági szint, amely akkor javasolt, ha a gép kliensként fog "
+#~ "kapcsolódni\n"
+#~ "az internetre.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Magas</span>: Már vannak bizonyos\n"
+#~ "megszorítások és több automatikus ellenőrzés fut éjszakánként.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Magasabb</span>: Ez a biztonsági szint\n"
+#~ "már elég magas ahhoz, hogy a gép kiszolgálóként legyen használva - "
+#~ "hálózaton\n"
+#~ "keresztül csatlakozó kliensek kiszolgálására. Ha a gép az interneten "
+#~ "csak\n"
+#~ "kliensként van jelen, akkor érdemesebb egy alacsonyabb szintet "
+#~ "választani.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Paranoiás</span>: Az előző szinthez "
+#~ "hasonló,\n"
+#~ "de itt a rendszer teljesen zárt. Ez a legbiztonságosabb szint."
+
+#~ msgid ""
+#~ "Winbind allows a system to retrieve information about users and to "
+#~ "authenticate users by using in an Windows domain."
+#~ msgstr ""
+#~ "A Winbind lehetővé teszi egy rendszer számára, hogy felhasználókkal "
+#~ "kapcsolatos információkat kérdezzen le és felhasználóazonosítást végezzen "
+#~ "egy windowsos tartományban."
+
+#~ msgid "chunk size"
+#~ msgstr "szeletméret"
+
+#~ msgid "mkraid failed (maybe raidtools are missing?)"
+#~ msgstr "Az mkraid végrehajtása nem sikerült (talán hiányzik a raidtools?)"
+
+#~ msgid "mkraid failed"
+#~ msgstr "mkraid sikertelen"
+
+#~ msgid "<b>Mandrake Control Center</b>"
+#~ msgstr "<b>Mandrake Vezérlőközpont</b>"
+
+#~ msgid ""
+#~ "The Mandrake Control Center is an essential collection of Mandrake-"
+#~ "specific utilities for simplifying the configuration of your computer."
+#~ msgstr ""
+#~ "A Mandrake Vezérlőközpont a rendszer beállításához nélkülözhetetlen "
+#~ "alkalmazásokat tartalmaz."
+
+#~ msgid ""
+#~ "Find all Mandrakesoft products and services at <b>MandrakeStore</b> -- "
+#~ "our full service e-commerce platform."
+#~ msgstr ""
+#~ "Az összes Mandrakesoft-terméket és -szolgáltatást megtalálhatja a "
+#~ "<b>MandrakeStore</b> webáruházban."
+
+#~ msgid "Become a <b>MandrakeClub</b> member!"
+#~ msgstr "Legyen tagja a <b>MandrakeClub</b>nak"
+
+#~ msgid ""
+#~ "Take advantage of valuable benefits, products and services by joining "
+#~ "MandrakeClub, such as:"
+#~ msgstr "Használja ki a MandrakeClub-tagsággal járó előnyöket:"
+
+#~ msgid ""
+#~ "\t* Special download mirror list exclusively for MandrakeClub Members"
+#~ msgstr ""
+#~ "\t* letöltési tükörkiszolgálók kizárólagosan a MandrakeClub-tagok számára"
+
+#~ msgid "\t* Special discounts for products and services at MandrakeStore"
+#~ msgstr ""
+#~ "\t* kedvezmények bizonyos termékekre és szolgáltatásokra a MandrakeStore "
+#~ "áruházban"
+
+#~ 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 ""
+#~ "[OPCIÓK] [PROGRAMNÉV]\n"
+#~ "\n"
+#~ "OPCIÓK:\n"
+#~ "  --help            - jelen segítség megjelenítése\n"
+#~ "  --report          - paraméter: programnév (a Mandrake-eszközök egyike)\n"
+#~ "  --incident        - paraméter: programnév (a Mandrake-eszközök egyike)"
+
+#~ msgid "Mandrake Online"
+#~ msgstr "MandrakeOnline"
+
+#~ msgid ""
+#~ "This interface has not been configured yet.\n"
+#~ "Run the \"Add an interface\" assistant from the Mandrake Control Center"
+#~ msgstr ""
+#~ "Ez a csatoló még nem lett beállítva.\n"
+#~ "Használja a \"Csatoló felvétele\" funkciót a Mandrake Vezérlőközpontban."
+
+#~ 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 ""
+#~ "HardDrake - Mandrake hardverbeállítási program.\n"
+#~ "<span foreground=\"royalblue3\">Verzió:</span> %s\n"
+#~ "<span foreground=\"royalblue3\">Szerző:</span> Thierry Vignaud &lt;"
+#~ "tvignaud@mandrakesoft.com&gt;\n"
+#~ "\n"
+
+#~ msgid "The alert wizard had unexpectly failled:"
+#~ msgstr "Probléma lépett fel a figyelmeztetési varázslóban:"
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "A kapcsolódás nem sikerült.\n"
+#~ "Ellenőrizze a beállításokat a Mandrake Vezérlőközpontban."
+
+#~ msgid "The package %s is needed. Install it?"
+#~ msgstr "Szükség van a(z) %s csomagra. Szeretné telepíteni?"
+
+#~ msgid "ignore"
+#~ msgstr "ignorálás"
+
+#~ msgid "no"
+#~ msgstr "nem"
+
+#~ msgid "yes"
+#~ msgstr "igen"
+
+#~ msgid "SILO Installation"
+#~ msgstr "A SILO telepítése"
+
+#~ msgid "First sector of boot partition"
+#~ msgstr "A rendszerindítási partíció első szektora"
+
+#~ msgid "Bootloader installation"
+#~ msgstr "A rendszerindító program telepítése"
+
+#~ msgid "SILO"
+#~ msgstr "SILO"
+
+#~ msgid "Alcatel speedtouch usb"
+#~ msgstr "Alcatel Speed Touch USB"
+
+#~ msgid "Sagem (using pppoa) usb"
+#~ msgstr "Sagem (PPPoA-t használó) USB"
+
+#~ msgid "Harddrake2 version %s"
+#~ msgstr "HardDrake2 verzió %s"
+
+#~ msgid "transmitted"
+#~ msgstr "átvitt"
+
+#~ msgid "received"
+#~ msgstr "fogadott"
 
 #~ msgid ""
 #~ "You can export using NFS or SMB. Please select which you'd like to use."
@@ -24172,25 +27146,24 @@ msgstr "Eszközök levelezéshez, hírkezeléshez és a Web böngészéséhez"
 #~ msgstr "%s megnyitása nem sikerült."
 
 #~ 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 ""
-#~ "A kártya támogat hardveres 3D-s gyorsítást, de csak az XFree %s "
+#~ "A kártya támogat hardveres 3D-s gyorsítást, de csak az Xorg %s "
 #~ "verzióban.\n"
-#~ "Az XFree %s is használható; elképzelhető, hogy abban jobb a 2D-s "
-#~ "támogatás."
+#~ "Az Xorg %s is használható; elképzelhető, hogy abban jobb a 2D-s támogatá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"
 #~ "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 ""
-#~ "A kártya támogat hardveres 3D-s gyorsítást, de csak az XFree %s "
+#~ "A kártya támogat hardveres 3D-s gyorsítást, de csak az Xorg %s "
 #~ "verzióban.\n"
 #~ "EZ KÍSÉRLETI JELLEGŰ; HASZNÁLATA AKÁR A GÉP LEFAGYÁSÁHOZ IS VEZETHET.\n"
-#~ "Az XFree %s verzió is használható; elképzelhető, hogy ebben jobb a 2D-s\n"
+#~ "Az Xorg %s verzió is használható; elképzelhető, hogy ebben jobb a 2D-s\n"
 #~ "támogatás."
 
 #~ msgid "Xpmac (installation display driver)"
@@ -24284,12 +27257,6 @@ msgstr "Eszközök levelezéshez, hírkezeléshez és a Web böngészéséhez"
 #~ msgid "Scientific applications such as gnuplot"
 #~ msgstr "Tudományos alkalmazások, mint például a Gnuplot"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS"
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "DNS- és NIS-kiszolgáló"
-
 #~ msgid "Can't create log file!"
 #~ msgstr "Naplófájl nem hozható létre."
 
diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po
index 9f1763bd1..399ba27cb 100644
--- a/perl-install/share/po/pl.po
+++ b/perl-install/share/po/pl.po
@@ -1,3 +1,4 @@
+# translation of pl.po to 
 # translation of pl.po to Polish
 # Polish translation file
 # Paweł Jabłoński <pj@linux-mandrake.com>, 2001,2002.
@@ -6,16 +7,83 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-05-08 23:51+0200\n"
-"Last-Translator: \n"
-"Language-Team:  <pl@li.org>\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-10 01:05+0200\n"
+"Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
+"Language-Team:  Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: KBabel 1.3.1\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Który klucz USB chcesz sformatować?"
+
+#: ../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 ""
+"Za chwilę zostanie sformatowane urządzenie USB \"%s\". To spowoduje "
+"usunięcie danych znajdujących się na nim.\n"
+"Upewnij się, że wybrane urządzenie jest, tym które ma zostać sformatowane.\n"
+"Zalecane jest wyjęcie wszystkich innych nośników pamięci USB podczas "
+"wykonywania tej operacji."
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Klucz nie jest zapisywalny"
+
+#: ../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 ""
+"Wygląda na to, że klucz USB posiada zabezpieczenie przed zapisem.\n"
+"Wyjmij go, wyłącz zabezpieczenie a następnie wetknij ponownie."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Ponów"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Kontynuuj bez klucza USB"
+
+#: ../move/move.pm:462
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"Wygląda na to, że klucz USB posiada włączone zabezpieczenie przed zapisem,\n"
+"lecz wciąż można go bezpiecznie odłączyć.\n"
+"\n"
+"\n"
+"Kliknij przycisk aby uruchomić ponownie komputer, wyłącz klucz, usuń\n"
+"zabezpieczenie przed zapisem oraz wetknij go ponownie.\n"
+"Następnie należy ponownie uruchomić Mandrake Move."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Uruchom ponownie"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -40,7 +108,7 @@ msgstr ""
 "korzystać z Mandrake Move tak jak z normalnego systemu\n"
 "operacyjnego Mandrake."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -68,147 +136,100 @@ msgstr ""
 "korzystać z Mandrake Move tak jak z normalnego systemu\n"
 "operacyjnego Mandrake."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
-msgstr "Potrzebny jest klucz aby zapisać swoje dane"
+msgstr "Potrzebny jest klucz aby zapisać twoje dane"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Wykryj ponownie klucz USB"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Kontynuuj bez klucza USB"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "Klucz nie jest zapisywalny"
-
-#: ../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 ""
-"Wygląda na to, że klucz USB posiada włączone zabezpieczenie przed zapisem,\n"
-"lecz wciąż można go bezpiecznie odłączyć.\n"
-"\n"
-"\n"
-"Kliknij przycisk aby uruchomić ponownie komputer, wyłącz klucz, usuń\n"
-"zabezpieczenie przed zapisem oraz wetknij go ponownie.\n"
-"Następnie należy ponownie uruchomić Mandrake Move."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Uruchom ponownie"
-
-#: ../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 ""
-"Wygląda na to, że klucz USB posiada zabezpieczenie przed zapisem.\n"
-"Wyjmij go, wyłącz zabezpieczenie a następnie wetknij ponownie."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Ponów"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "Ustawianie klucza USB"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr "Proszę czekać, ustawianie plików konfiguracyjnych dla klucza USB..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 "Podaj swoje informacje o użytkowniku, hasło zostanie użyte przy wygaszaczu"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Automatyczna konfiguracja"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Proszę czekać, wykrywanie i konfiguracja urządzeń..."
 
-#: ../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 "Błąd"
 
-#: ../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"
@@ -217,12 +238,12 @@ msgstr ""
 "Wystąpił jakiś błąd. Nie można poprawnie go obsłużyć\n"
 "Kontynuuj na własną odpowiedzialność."
 
-#: ../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 "Wystąpił błąd"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -257,32 +278,39 @@ msgstr ""
 "rzucić okiem na pliki dziennika na konsoli #3 i #4 aby\n"
 "spróbować określić co się wydarzyło."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Usuń pliki konfiguracyjne systemu"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Po prostu uruchom ponownie"
 
-#: ../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 "Można uruchomić tylko bez obsługi CDROM"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Zabij te programy"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Bez obsługi CD-ROM"
 
-#: ../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 "Czytaj uważnie!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -341,22 +369,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB lub więcej"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X serwer"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Wybierz serwer X"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Konfiguracja wielomonitorowa"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -365,80 +393,80 @@ msgstr ""
 "Twój system obsługuje wiele monitorów.\n"
 "Co chcesz zrobić?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
+msgid "Can't install Xorg package: %s"
 msgstr "Nie można zainstalować pakietu: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Określ rozmiar pamięci karty graficznej"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Konfiguracja XFree"
+msgid "Xorg configuration"
+msgstr "Konfiguracja Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Którą konfigurację XFree chcesz używać?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Którą konfigurację Xorg chcesz używać?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfiguruj wszystkie monitory niezależnie"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Użyj rozszerzenia Xinerama"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfiguruj tylko kartę \"%s\"%s"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s z obsługą sprzętowej akceleracji 3D"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s z obsługą sprzętowej akceleracji 3D"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Dla Twojej karty akceleracja 3D jest obsługiwana tylko przez XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "Dla Twojej karty akceleracja 3D jest obsługiwana tylko przez Xorg %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s z EKSPERYMENTALNĄ obsługą sprzętowej akceleracji 3D"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s z EKSPERYMENTALNĄ obsługą sprzętowej akceleracji 3D"
 
-#: 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 ""
-"Dla Twojej karty akceleracja 3D jest obsługiwana przez XFree %s.\n"
+"Dla Twojej karty akceleracja 3D jest obsługiwana przez Xorg %s.\n"
 "JEST TO ROZWIĄZANIE EKSPERYMENTALNE, MOŻE ZAWIESIĆ KOMPUTER."
 
-#: 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 "Własne"
 
-#: 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 "Zakończ"
@@ -448,12 +476,12 @@ msgstr "Zakończ"
 msgid "Graphic Card"
 msgstr "Karta graficzna"
 
-#: 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 "Rozdzielczość"
@@ -463,14 +491,19 @@ msgstr "Rozdzielczość"
 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 "Opcje"
 
-#: 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"
@@ -483,40 +516,40 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
-#, fuzzy, c-format
+#: Xconfig/monitor.pm:111
+#, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "Wybierz monitor"
+msgstr "Wybierz monitor dla #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Wybierz 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 "Standardowa"
 
-#: 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 "Dostawca"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 "Wykrywanie sprzętu Plug'n Play zakończone niepowodzeniem. Wybierz monitor z "
 "listy"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -540,12 +573,12 @@ msgstr ""
 "ponieważ może to spowodować jego uszkodzenie.\n"
 "Jeśli masz wątpliwości, wybierz zachowawcze ustawienia."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Częstotliwość synchronizacji poziomej"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Częstotliwość synchronizacji pionowej"
@@ -570,58 +603,60 @@ msgstr "65 tys. kolorów (16 bitów)"
 msgid "16 million colors (24 bits)"
 msgstr "16 mln. kolorów (24 bity)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Rozdzielczości"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Określ rozdzielczość oraz głębię kolorów"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Karta graficzna: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: 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 "Pomoc"
@@ -714,8 +749,8 @@ msgstr "Rozdzielczość: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Sterownik XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Sterownik Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -726,8 +761,8 @@ msgstr "Interfejs graficzny przy uruchamianiu"
 #, 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 ""
 "Można skonfigurować komputer, aby automatycznie po uruchomieniu startowały X-"
 "y.\n"
@@ -759,20 +794,57 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "W jakim systemie pracuje Twój telewizor?"
 
-#: 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 "Proszę czekać"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Trwa instalacja programu rozruchowego"
 
-#: 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 ""
+"Instalacja programu rozruchowego nie powiodła się. Wystąpił następujący błąd:"
+
+#: 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 ""
+"Może zachodzić potrzeba zmiany urządzenia rozruchowego Open\n"
+"Firmware aby włączyć program rozruchowy (ang. bootloader). Jeśli\n"
+"nie wyświetla się ekran powitalny w trakcie ponownego\n"
+"uruchamiania, należy przytrzymać Command-Option-O-F w trakcie\n"
+"uruchamiania i wpisać:\n"
+"setenv boot-device %s,\\\\:tbxi\n"
+"Następnie wpisać: shut-down\n"
+"Podczas następnego uruchamiania ekran powitalny programu\n"
+"rozruchowego powinien być widoczny."
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -788,274 +860,259 @@ msgstr ""
 "\n"
 "Z którego dysku ma być uruchamiany system?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Pierwszy sektor na dysku (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Pierwszy sektor głównej partycji"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Na dyskietce"
 
-#: 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 "Pomiń"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Instalacja SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Instalacja LILO/Grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Gdzie chcesz zainstalować program rozruchowy?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Pierwszy sektor na partycji rozruchowej"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Konfiguracja sposobu uruchamiania"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Podstawowe opcje programu rozruchowego"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Podaj rozmiar pamięci w MB"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opcja \"Ograniczenie opcji wiersza poleceń\" nie działa bez hasła"
 
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: 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 "Spróbuj ponownie"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Preferowany program rozruchowy"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Instalacja programu rozruchowego"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Urządzenie startowe"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Opóźnienie przed uruchomieniem domyślnego systemu"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Włączanie ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Wymuszanie braku ACPI"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Wymuszanie braku lokalnego ACPI"
 
-#: 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 "Hasło"
 
-#: 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 "Hasło (powtórnie)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Ograniczenie opcji wiersza poleceń"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "ograniczenie"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Czyszczenie /tmp przy każdym uruchomieniu systemu"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Określ rozmiar pamięci, jeśli jest to wymagane (znaleziono %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Włączyć profile sprzętowe?"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Komunikat początkowy"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Zwłoka Open Firmware"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Opóźnienie uruchamiania jądra"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Uaktywnić uruchamianie z CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Uaktywnić uruchamianie OF?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Domyślny system operacyjny?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Obraz"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Dołącz"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Tryb graficzny"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Startowy ramdysk"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Profil sieciowy"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Etykieta"
 
-#: 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 "Domyślne"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Rozmiar startowego ramdysku"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Brak wideo"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Pusta etykieta jest niedozwolona"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Należy określić obraz jądra"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Należy określić główną partycję"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Ta etykieta jest już używana"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Jakiego typu pozycję chcesz dodać?"
 
-#: 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 "Inny system operacyjny (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Inny system operacyjny (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Inny system operacyjny (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1064,74 +1121,74 @@ msgstr ""
 "Posiadasz następujące pozycje.\n"
 "Można dodać następne lub zmienić istniejące."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "dostęp do programów X Window"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "dostęp do narzędzi rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "możliwość uruchomienia \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "dostęp do plików administracyjnych"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "dostęp do narzędzi sieciowych"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "dostęp do narzędzi kompilujących"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(już dodano %s)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Hasło jest zbyt proste"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Podaj nazwę użytkownika"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Nazwa użytkownika może składać się tylko z małych liter, cyfr, `-'i `_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Nazwa użytkownika jest za długa"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Ten użytkownik został już dodany"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Dodaj użytkownika"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1140,75 +1197,79 @@ msgstr ""
 "Podaj dane użytkownika\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 "Gotowe"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Akceptuj użytkownika"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Imię i nazwisko"
 
-#: 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 "Identyfikator:"
+msgid "Login name"
+msgstr "Nazwa użytkownika"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Powłoka"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Ikona"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Automatyczne logowanie"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "Można skonfigurować komputer, by automatycznie logował użytkownika w "
 "systemie."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Czy chcesz wykorzystać tą funkcję?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Wybierz domyślnego użytkownika:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Wybierz uruchamiane środowisko graficzne:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Wybierz język używany w systemie."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Wybór języka"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1219,48 +1280,57 @@ msgstr ""
 "języki do zainstalowania. Będą one dostępne po zakończeniu\n"
 "instalacji i ponownym uruchomieniu systemu."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Domyślne korzystanie z Unicode"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Wszystkie języki"
 
-#: 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 "Kraj / Region"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Wybierz swój kraj."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Oto pełna lista dostępnych krajów"
 
-#: 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 "Więcej"
+msgid "Other Countries"
+msgstr "Inne kraje"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Metoda wejściowa:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Brak"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Bez współdzielenia"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Zezwól wszystkim użytkownikom"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1276,33 +1346,47 @@ msgstr ""
 "\n"
 "\"Własne\" pozwoli na ustawienia indywidualne dla każdego użytkownika.\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: tradycyjny współdzielony system plików Uniksa, z mniejszym wsparciem "
+"dla Maka i Windowsa."
 
-#: 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: współdzielony system plików używany przez Windows, Mac OS X oraz wiele "
+"nowoczesnych systemów linuksowych."
 
-#: 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 ""
 "Można eksportować używając NFP lub Samby. Którego protokołu chcesz użyć?"
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Uruchom 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 "Zamknij"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1311,92 +1395,201 @@ msgstr ""
 "Współdzielenie zależne od użytkownika używa grupy \"fileshare\". \n"
 "Można użyć programu userdrake aby dodać użytkownika do tej grupy."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Pliki lokalne"
+msgid "Local file"
+msgstr "Plik lokalny"
 
-#: 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 "Domena Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "Active Directory z SFU"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Active Directory z Winbind"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Plik lokalny:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Użycie lokalnego pliku dla każdego uwierzytelniania i informacji o "
+"użytkowniku"
+
+#: 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 ""
+"Określa, że komputer ma używać LDAP do niektórych lub wszystkich operacji "
+"uwierzytelniania. LDAP konsoliduje niektóre typy informacji wewnątrz "
+"organizacji."
+
+#: 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 ""
+"Umożliwia uruchomienie grupy komputerów z tą samą domeną Usług Informacji "
+"Sieciowych (NIS) ze wspólnym plikiem haseł i grup."
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Domena Windows:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+"Winbind umożliwia systemowi pobranie informacji i uwierzytelnianie "
+"użytkowników w domenie Windows."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Active Directory z SFU"
+
+#: authentication.pm:34 authentication.pm:35
 #, c-format
-msgid "Active Directory"
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
 msgstr ""
+"Kerberos to system bezpieczeństwa dla usług uwierzytelniania sieciowego."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Active Directory z Winbind:"
 
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Uwierzytelnianie 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 "Serwer LDAP"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "proste"
+
+#: 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 "warstwa bezpieczeństwa (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "Metoda uwierzytelniania"
+msgstr "Uwierzytelnienie Active Directory"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domena"
 
-#: 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 "Serwer"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
-msgstr ""
+msgstr "Baza danych użytkowników LDAP"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Użycie anonimowego BIND-a "
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "Użytkownik LDAP uprawniony do przeglądania Active Directory"
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "Wymagane hasło"
+msgstr "Hasło dla użytkownika"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Uwierzytelnianie NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Domena NIS"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "Serwer 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 "
@@ -1426,22 +1619,32 @@ msgstr ""
 "uruchomieniu systemu.\n"
 "Polecenie 'wbinfo -t' przetestuje czy uwierzytelnianie jest w porządku."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Domena uwierzytelniania Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nazwa administratora domeny"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Hasło administratora domeny"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Użycie ldmap do przechowywania UID/SID "
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Domyślny ldap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Nie używaj rozgłaszania przy braku domeny NIS"
@@ -1451,7 +1654,7 @@ msgstr "Nie używaj rozgłaszania przy braku domeny 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"
@@ -1466,42 +1669,37 @@ msgstr ""
 "poczekaj na domyslne uruchomienie.\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 z menu graficznym"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO z menu tekstowym"
 
-#: 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 "brak miejsca na /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Nie można zainstalować programu rozruchowego na partycji %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1510,7 +1708,7 @@ msgstr ""
 "Konfiguracja programu rozruchowego musi być uaktualniona ponieważ został "
 "zmieniony numer partycji"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1519,7 +1717,7 @@ msgstr ""
 "Nie można zainstalować poprawnie programu rozruchowego. Należy ponownie "
 "uruchomić ratunkowo komputer i wybrać \"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Przeinstaluj program rozruchowy"
@@ -1579,76 +1777,79 @@ msgstr "brak kdesu"
 msgid "consolehelper missing"
 msgstr "brak consolehelper"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "Francja"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
+#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
+#: network/adsl_consts.pm:85 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Republika Czeska"
 
-#: 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 "Niemcy"
 
-#: 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 "Grecja"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Norwegia"
 
-#: 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 "Szwecja"
 
-#: 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 "Holandia"
 
-#: 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 "Włochy"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: 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"
@@ -1661,66 +1862,60 @@ msgstr ""
 "(zakładając, że serwer webowy jest skonfigurowany jako serwer WebDAV).\n"
 "Jeśli chcesz dodać punkty montowania WebDAV, wybierz \"Nowy\"."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Nowy"
 
-#: 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 "Odmontuj"
 
-#: 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 "Montuj"
 
-#: 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 "Punkt montowania"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Podaj adres URL serwera WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL powinien zaczynać się od http:// lub https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Serwer: "
 
-#: 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 "Punkt montowania: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Opcje: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Czytaj uważnie!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Rozpocznij od stworzenia kopii zapasowej danych"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1730,17 +1925,17 @@ msgstr ""
 "Jeżeli masz zamiar używać aboot pamiętaj, by zostawić,\n"
 "wolne miejsce na początku dysku - wystarczy 2048 sektorów."
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Druid"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Wybierz czynność"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1751,181 +1946,187 @@ msgstr ""
 "Należy zacząć od zmiany rozmiaru tej partycji\n"
 "(kliknij na partycji, po czym kliknij na \"Zmień rozmiar\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Kliknij na partycję"
 
-#: 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 "Szczegóły"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Nie znaleziono twardych dysków"
 
-#: 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 "JFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: 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 "Inne"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Pusty"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Typy systemu plików:"
 
-#: 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 "Użyj zamiast tego \"%s\""
 
-#: 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 "Typ"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Utwórz"
 
 #. -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 "Usuń"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Najpierw \"Odmontuj\"."
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Utwórz inną partycję"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Wybierz partycję"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Cofnij"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Przełącz na tryb standardowy"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Przełącz na tryb zaawansowany"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Kontynuować mimo to?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Wyjście bez zapisywania"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Opuścić program bez zapisywania tablicy partycji?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Chcesz zapisać modyfikacje /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 ""
 "Należy ponownie uruchomić komputer w celu uaktywnienia zmian w tablicy "
 "partycji"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Wyczyść wszystko"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Rozmieść automatycznie"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Więcej"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Informacje o twardym dysku"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Wszystkie partycje podstawowe są używane"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Nie można dodać więcej partycji"
 
-#: 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 "
@@ -1934,37 +2135,37 @@ msgstr ""
 "Żeby mieć więcej partycji, należy usunąć jedną,\n"
 "tak aby było możliwe utworzenie partycji rozszerzonej."
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Zapisz tablicę partycji"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Przywróć tablicę partycji"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Odzyskaj tablicę partycji"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Przeładuj tablicę partycji"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Automatyczne montowanie nośników wymiennych"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1973,23 +2174,23 @@ msgstr ""
 "Zapasowa tablica partycji ma inny rozmiar.\n"
 "Kontynuować?"
 
-#: 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 "Ostrzeżenie"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1998,92 +2199,92 @@ msgstr ""
 "Włóż dyskietkę do stacji.\n"
 "Wszystkie zapisane na niej dane zostaną utracone"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Próba odzyskania tablicy partycji"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Szczegółowe informacje"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Zmień rozmiar"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Przesuń"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formatuj"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Dodaj do RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Dodaj do LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Usuń z RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Usuń z LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modyfikuj RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Użyj na plikopartycję"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Utwórz nową partycję"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Sektor startowy: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Rozmiar w MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Typ systemu plików: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Preferencja: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Nazwa wolumenu logicznego"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2094,43 +2295,43 @@ msgstr ""
 "(osiągnięto maksymalną liczbę partycji podstawowych).\n"
 "Najpierw usuń partycję podstawową i utwórz partycję rozszerzoną."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Usunąć plikopartycję?"
 
-#: 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 "Po zmianie typu partycji %s, wszystkie dane na niej zostaną utracone"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Zmiana typu partycji"
 
-#: 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 "Jakiego systemu plików potrzebujesz?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Przełączenie z ext2 do ext3"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Gdzie chcesz zamontować plikopartycję %s?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Gdzie chcesz zamontować urządzenie %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"
@@ -2139,49 +2340,49 @@ msgstr ""
 "Nie można odmontować tej partycji, gdyż jest używana przez plikopartycję.\n"
 "Zacznij od usunięcia plikopartycji."
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Gdzie chcesz zamontować %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 "Zmiana rozmiaru"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Obliczanie granic systemu plików FAT"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Tej partycji nie można zmniejszyć"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Wszystkie dane na tej partycji powinny zostać zarchiwizowane"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Po zmianie rozmiaru partycji %s, wszystkie dane na niej zostaną utracone"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Określ nowy rozmiar"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Nowy rozmiar w 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"
@@ -2191,147 +2392,142 @@ msgstr ""
 "podczas kolejnego uruchamiania systemu Windows(TM) zostanie\n"
 "uruchomione sprawdzanie systemu plików"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Na który dysk chcesz przenieść ?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Sektor"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Na który sektor chcesz przenieść ?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Przenoszenie partycji..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Wybierz istniejący RAID aby dodać do niego"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "nowy"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Wybierz istniejący LVM aby dodać do niego"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "Nazwa LVM?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Na tej partycji nie można założyć plikopartycji"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Plikopartycja"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Nazwa plikopartycji: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Podaj nazwę pliku"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Plik jest już używany przez inną plikopartycję, wybierz inny"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Plik już istnieje. Użyć go?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Opcje montowania"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Zmienne"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "urządzenie"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "poziom"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "rozmiar kawałka"
+msgid "chunk size in KiB"
+msgstr "rozmiar kawałka w KiB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Uważaj: ta operacja jest niebezpieczna"
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Określ sposób partycjonowania."
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Wymagany jest pakiet %s. Czy chcesz go zainstalować?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Należy ponownie uruchomić komputer przed uaktywnieniem zmian"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Tablica partycji napędu %s zostanie zapisana na dysk!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Po sformatowaniu, wszystkie dane na partycji %s zostaną utracone"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Przenieś pliki do nowej partycji"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Ukryj pliki"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2340,53 +2536,53 @@ msgstr ""
 "Katalog %s już zawiera pewne dane\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Przenoszenie plików do nowej partycji"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "Kopiowanie %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "partycja %s nazywa się teraz %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Urządzenie: "
 
-#: diskdrake/interactive.pm:1156
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:1157
+#, c-format
 msgid "Devfs name: "
-msgstr "Nazwa komputera:"
+msgstr "Nazwa devfs: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
-msgstr ""
+msgstr "Etykieta woluminu: "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Dosowy dysk: (przypuszczalnie %s)\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 "Rodzaj: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nazwa:"
@@ -2433,8 +2629,8 @@ msgstr "Zamontowana\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
@@ -2461,8 +2657,8 @@ msgstr "Poziom %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Rozmiar kawałka %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Rozmiar kawałka %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2535,38 +2731,38 @@ msgstr "Typ tabeli partycji: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "na kanale %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Klucz szyfrujący system plików"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Wybierz klucz szyfrujący system plików"
 
-#: 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 "Ten klucz jest zbyt prosty (musi posiadać co najmniej %d znaków)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Klucze szyfrujące nie zgadzają się"
 
-#: 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 "Klucz szyfrujący"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Klucz szyfrujący (ponownie)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Zmiana typu"
@@ -2600,7 +2796,7 @@ msgstr ""
 "Wprowadź swoją nazwę użytkownika, hasło oraz nazwę domeny aby uzyskać dostęp "
 "do tego komputera."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Nazwa użytkownika"
@@ -2615,27 +2811,72 @@ msgstr "Wyszukaj serwery"
 msgid "Search new servers"
 msgstr "Wyszukaj nowe serwery"
 
-#: 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 "Należy zainstalować pakiet %s. Czy chcesz go zainstalować?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Brak wymaganego pakietu %s"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Instalowanie pakietów..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Usuwanie pakietów..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Montowanie partycji %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "montowanie partycji %s do katalogu %s zakończyło się niepowodzeniem"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Sprawdzanie %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "błąd odmontowania %s; %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Włączanie partycji swap %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formatowanie partycji %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Tworzenie i formatowanie plikopartycji %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Nie wiadomo jak sformatować %s typu %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formatowania z %s zakończone niepowodzeniem"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2644,7 +2885,7 @@ msgstr ""
 "Nie aktualizuj czasów dostępu do węzłów na tym systemie plików\n"
 "(np. dla szybszego dostępu w kolejce nowości aby przyspieszyć serwery grup)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2653,14 +2894,14 @@ msgstr ""
 "Może być montowany tylko wyłącznie (np.,\n"
 "opcja -a nie spowoduje zamontowanie systemu plików)"
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "Bez interpretowania specjalnych urządzeń znakowych lub blokowych w systemie "
 "plików."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2672,7 +2913,7 @@ msgstr ""
 "serwera, którego systemy plików zawierają pliki wykonywalne dla\n"
 "architektur innych niż własna."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2683,18 +2924,18 @@ msgstr ""
 "(To wygląda na bezpieczne ustawienie, lecz w rzeczywistości jest raczej\n"
 "niebezpieczne w przypadku zainstalowania pakietu ksuidperl(1).)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Montowanie systemu plików w trybie tylko-do-odczytu."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 "Wszystkie operacje wej./wyj. pliku powinny być dokonywane synchronicznie."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2710,65 +2951,25 @@ msgstr ""
 "\"noexec\", \"nosuid\" oraz \"nodev\" (chyba że zostanie ono pominięte\n"
 "przez inne opcje, w wierszu opcji user,exec,dev,suid)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Nadanie uprawnień do zapisu zwykłym użytkownikom"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Nadanie uprawnień tylko do odczytu zwykłym użytkownikom"
 
-#: 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 formatowania z %s zakończone niepowodzeniem"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Nie wiadomo jak sformatować %s typu %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formatowanie partycji %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Tworzenie i formatowanie plikopartycji %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Montowanie partycji %s"
-
-#: fs.pm:727 fs.pm:776
+#: fs/type.pm:364
 #, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "montowanie partycji %s do katalogu %s zakończyło się niepowodzeniem"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "Sprawdzanie %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "błąd odmontowania %s; %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Włączanie partycji swap %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Nie można używać JFS na partycji mniejszej niż 16MB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "proste"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Nie można używać ReiserFS na partycji mniejszej niż 32MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2780,7 +2981,7 @@ msgstr "z /usr"
 msgid "server"
 msgstr "serwer"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2798,32 +2999,22 @@ msgstr ""
 "\n"
 "Czy zgadzasz się na utratę wszystkich partycji?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Nie można używać JFS na partycji mniejszej niż 16MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Nie można używać ReiserFS na partycji mniejszej niż 32MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Punkty montowania muszą zaczynać się od /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Punkty montowania powinny składać się ze znaków alfanumerycznych"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Istnieje partycja z punktem montowania %s\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2834,12 +3025,12 @@ msgstr ""
 "Żaden program rozruchowy nie jest w stanie obsłużyć jej bez partycji /boot.\n"
 "Pamiętaj więc o dodaniu partycji /boot."
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Nie można użyć Logicznego Woluminu LVM dla punktu montowania %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2850,7 +3041,7 @@ msgstr ""
 "Żaden program rozruchowy nie jest w stanie obsłużyć go bez partycji /boot.\n"
 "Pamiętaj więc o dodaniu partycji /boot."
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2859,12 +3050,12 @@ msgstr ""
 "Możesz nie mieć możliwości zainstalowania lilo (ponieważ lilo nie\n"
 "obsługuje LV na wielu PLV)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Ten katalog powinien być wewnątrz systemu plików / (root)"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2873,133 +3064,127 @@ msgstr ""
 "Dla tego punktu montowania wymagany jest porządny system plików (ext2, "
 "reiserfs, xfs, jfs)\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Nie można użyć zaszyfrowanego systemu plików dla punktu montowania %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Brak wolnego miejsca dla automatycznego rozmieszczenia"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Brak czynności do wykonania"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Błąd otwarcia %s do zapisu: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Stacja dysków"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Napęd zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Dysk"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Nagrywarki 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 "Taśma"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Karta graficzna"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Karta TV"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Inne urządzenia multimedialne"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Karta dźwiękowa"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Webkamera"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Procesory"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Karty ISDN"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Karta ethernet"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "Karty ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Kontrolery AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Kontrolery mostków i systemu"
 
-#: 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 "Drukarka"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Mysz"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -3011,9 +3196,9 @@ msgid "(E)IDE/ATA controllers"
 msgstr "Kontrolery (E)IDE/ATA"
 
 #: harddrake/data.pm:290
-#, fuzzy, c-format
+#, c-format
 msgid "SATA controllers"
-msgstr "Kontrolery AGP"
+msgstr "Kontrolery SATA"
 
 #: harddrake/data.pm:299
 #, c-format
@@ -3022,50 +3207,72 @@ msgstr "Kontrolery firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Kontrolery PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Kontrolery SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Kontrolery USB"
 
-#: harddrake/data.pm:326
-#, fuzzy, c-format
+#: harddrake/data.pm:339
+#, c-format
 msgid "USB ports"
-msgstr "Drukarka USB"
+msgstr "Porty USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Kontrolery SMBus"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Klawiatura"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Mysz"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Skaner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Nieznane/Inne"
 
-#: 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 "Proszę czekać... Stosowanie konfiguracji"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Brak alternatywnego sterownika"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3074,12 +3281,12 @@ msgstr ""
 "Brak alternatywnego sterownika OSS/ALSA dla twojej karty dźwiękowej (%s) "
 "aktualnie wykorzystującej \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Konfiguracja dźwięku"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3088,7 +3295,7 @@ msgstr ""
 "Tutaj można wybrać alternatywny sterownik (OSS lub ALSA) dla twojej karty "
 "dźwiękowej (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3101,7 +3308,7 @@ msgstr ""
 "Twoja karta aktualnie wykorzystuje sterownik %s\"%s\" (domyślnym "
 "sterownikiem dla karty jest \"%s\")"
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3135,24 +3342,24 @@ msgstr ""
 "- nowego interfejsu API ALSA udostępniającego ulepszone funkcje wymagające "
 "jednak użycia biblioteki 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 "Sterownik:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Wyszukiwanie problemów"
 
-#: 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 ""
 "Stary sterownik \"%s\" znajduje się na czarnej liście.\n"
 "\n"
@@ -3160,12 +3367,12 @@ msgstr ""
 "\n"
 "Nowy sterownik \"%s\" zostanie wykorzystany po następnym uruchomieniu."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Brak wolnodostępnego sterownika"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3174,32 +3381,33 @@ msgstr ""
 "Brak wolnodostępnego sterownika dla twojej karty dźwiękowej (%s) lecz "
 "istnieje sterownik komercyjny na \"%s\""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Brak znanego sterownika"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Brak znanego sterownika dla twojej karty dźwiękowej (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Nieznany sterownik"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Błąd: Sterownik \"%s\" dla twojej karty dźwiękowej nie został wypisany"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Wykrywanie problemów z dźwiękiem"
 
-#: 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"
@@ -3244,17 +3452,18 @@ msgstr ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" powie czy program używa karty dźwiękowej.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Pozwól mi wybrać jakiś sterownik"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Wybieranie odpowiedniego sterownika"
 
-#: 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 "
@@ -3341,9 +3550,9 @@ msgstr "włączona obsługa radia"
 #, 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 ""
 "Przed kontynuowaniem, należy przeczytać uważnie warunki licencji dotyczącej "
 "całej dystrybucji Linuksa Mandrake. Jeśli zgadzasz się\n"
@@ -3351,8 +3560,8 @@ msgstr ""
 "Jeśli nie, kliknij na przycisk \"%s\" w celu ponownego uruchomienia\n"
 "komputera."
 
-#: 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 "Akceptuj"
@@ -3360,42 +3569,41 @@ msgstr "Akceptuj"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux jest systemem wielodostępnym, co oznacza że każdy użytkownik\n"
 "posiada własne ustawienia, własne pliki, może pracować równocześnie\n"
@@ -3437,23 +3645,28 @@ msgstr ""
 "użytkownika oraz menedżera okien, a następnie kliknij \"%s\".\n"
 "Jeśli nie chcesz używać tej funkcji, odznacz opcję \"%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 "Identyfikator:"
+
+#: 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 "Dalej"
 
-#: 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 "Zaawansowane"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3517,37 +3730,47 @@ msgstr ""
 "W przypadku dysków SCSI, \"a\" oznacza \"najniższy ID SCSI\", zaś \"b\",\n"
 "oznacza \"drugi w kolejności ID SCSI\", itd."
 
-#: 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 ""
 "Instalacja Mandrakelinux jest rozpowszechniana na kilku płytach CD.\n"
-"Jeśli wybrany pakiet jest zlokalizowany na innej płycie\n"
+"Jeśli wybrany pakiet jest zlokalizowany na innej płycie CD\n"
 " instalator wysunie bieżącą płytę CD oraz wyświetli prośbę\n"
-"o włożenie poprawnej płyty CD."
+"o włożenie wymaganej płyty CD. Jeśli nie posiadasz wymaganej\n"
+"płyty CD w ręku, kliknij \"%s\", związane z nią pakiety nie zostaną\n"
+"zainstalowane."
 
-#: 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"
@@ -3557,9 +3780,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"
@@ -3569,16 +3802,8 @@ 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 ""
 "Nadszedł czas na określenie, jakie programy mają zostać zainstalowane w\n"
 "systemie. Dla Mandrakelinux są dostępne tysiące pakietów. Aby uczynić\n"
@@ -3588,13 +3813,20 @@ msgstr ""
 "Pakiety są podzielone na grupy tematyczne. Dostępne są cztery wstępnie\n"
 "zdefiniowane kategorie instalacji. Można mieszać i dopasowywać aplikacje\n"
 "z różnych pojemników, tak więc na przykład instalacja \"Stacja robocza\"\n"
-"może wciąż zawierać aplikacje z sekcji \"Programowanie\".\n"
+"może wciąż zawierać aplikacje z sekcji \"Serwer\".\n"
 "\n"
 " * \"%s\": jeśli komputer będzie pracował jako stacja\n"
-"robocza, należy wybrać jedną lub więcej związanych z tą sekcją aplikacji\n"
+"robocza, należy wybrać jedną lub więcej związanych z tą sekcją grup.\n"
 "\n"
 " * \"%s\": jeśli komputer będzie używany do programowania, należy\n"
-"wybrać odpowiednie grupy związane z tą sekcją;\n"
+"wybrać odpowiednie grupy związane z tą sekcją. Specjalna grupa \"LSB\"\n"
+"skonfiguruje system, tak aby był jak najbardziej zgodny ze standardem\n"
+"Linux Standard Base.\n"
+"\n"
+"   Wybranie grupy \"LSB\" zainstaluje także jądro serii \"2.4\", zamiast\n"
+"domyślnego \"2.6\". Dzieje się tak dlatego, aby mieć 100%% pewność,\n"
+"że komputer jest zgodny z LSB. Jednak jeśli nie zaznaczysz\n"
+"grupy \"LSB\", system wciąż będzie niemal 100%% zgodny z LSB.\n"
 "\n"
 " * \"%s\": jeśli komputer będzie pracował jako serwer, pojawi się\n"
 "możliwość wyboru różnych usług, które mogą być zainstalowane na komputerze;\n"
@@ -3604,107 +3836,111 @@ msgstr ""
 "ma pracować jako stacja z interfejsem graficznym!\n"
 "\n"
 "Przesuwając kursor myszy nad nazwą grupy, wyświetli się krótki tekst\n"
-"opisujący daną grupę. Jeśli odznaczone zostaną wszystkie grupy w trakcie\n"
-"przeprowadzania zwykłej instalacji (przeciwieństwo do aktualizacji),\n"
-"wyświetlone zostanie okienko z propozycjami grup określających\n"
-"inne opcje związane z instalacją minimalną:\n"
-"\n"
-" * \"%s\": instalacja minimalnej liczby pakietów koniecznych do\n"
-"uruchomienia pulpitu graficznego;\n"
-"\n"
-" * \"%s\": instalacja systemu wraz z\n"
-"podstawowymi narzędziami i dokumentacją do nich. To jest sposób\n"
-"najczęściej wykorzystywany przy instalowaniu serwera;\n"
-"\n"
-" * \"%s\": instalacja abolutnie minimalnej liczby pakietów potrzebnych\n"
-"do uruchomienia systemu Linux, dostępny będzie tylko tryb tekstowy.\n"
-"Całkowity rozmiar tego typu instalacji to ok 65Mb.\n"
+"opisujący daną grupę.\n"
 "\n"
 "Można zaznaczyć \"%s\", która to opcja jest\n"
 "użyteczna jeśli użytkownik zna przeznaczenie pakietów i jeśli chce mieć\n"
 "całkowitą kontrolę nad tym co zostanie zainstalowane w systemie.\n"
 "\n"
-"Jeśli została uruchomiona instalacji w trybie \"%s\", można\n"
+"Jeśli została uruchomiona instalacja w trybie \"%s\", można\n"
 "odznaczyć wszystkie grupy, zapobiegając w ten sposób instalacji nowych\n"
 "pakietów. Ta opcja jest użyteczna przy naprawianiu lub aktualizacji\n"
-"już istniejącego systemu."
+"już istniejącego systemu\n"
+"\n"
+"Jeśli odznaczone zostaną wszystkie grupy w trakcie\n"
+"przeprowadzania zwykłej instalacji (przeciwieństwo do aktualizacji),\n"
+"wyświetlone zostanie okienko z propozycjami grup określających\n"
+"inne opcje związane z instalacją minimalną:\n"
+". \n"
+" * \"%s\": instalacja minimalnej liczby pakietów koniecznej do\n"
+"uruchomienia stacji graficznej.\n"
+"\n"
+" * \"%s\": instalacja systemu podstawego wraz z podstawowymi\n"
+"narzędziami i dokumentacją dla nich. Ta instalacja jest zalecana\n"
+"przy pracy jako serwer.\n"
+"\n"
+" * \"%s\": instalacja absolutnie minimalnej liczby pakietów\n"
+"koniecznych do otrzymania działającego Linuksa. Po wyraniu\n"
+"tej opcji użytkownik będzie miał dostęp jedynie do interfejsu\n"
+"wiersza poleceń. Całkowity rozmiar tej instalacji to ok. 65\n"
+"megabajtów."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Programowanie"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Środowisko graficzne"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Samodzielny wybór pakietów"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Uaktualnij"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Z X Window"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Z podstawową dokumentacją"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Naprawdę minimalna instalacja"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Samodzielny wybór pakietów"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Uaktualnij"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 "W zależności od tego czy zaznaczono opcję wyboru indywidualnych\n"
 "pakietów, wyświetlona zostanie struktura drzewa zawierająca\n"
@@ -3714,9 +3950,11 @@ msgstr ""
 "Po wybraniu pakietu ze struktury, po prawej stronie wyświetlony zostanie\n"
 "jego opis, pomagający w zorientowaniu się do czego on służy.\n"
 "\n"
-"!! Jeśli zostanie wybrany pakiet serwera, zostanie wyświetlona prośba\n"
-"o potwierdzenie wyboru pakietu przed jego instalacją. W systemie Mandrake\n"
-"Linux, wszystkie zainstalowane serwery są uruchamiane domyślnie w trakcie\n"
+"!! Jeśli zostanie wybrany pakiet serwera, niezależnie czy wybrany został\n"
+"on w drodze indywidualnego wyboru pakietów, lub też jako pakiet grupy,\n"
+"zostanie wyświetlona prośba o potwierdzenie wyboru pakietu serwera\n"
+"przed jego instalacją. W systemie Mandrakelinux, wszystkie zainstalowane\n"
+"serwery są uruchamiane domyślnie w trakcie\n"
 "uruchamiania całego systemu. Nawet jeśli dany pakiet jest uważany\n"
 "za bezpieczny i w trakcie instalacji nie są znane żadne problemy z nim\n"
 "związane, może się zdarzyć, że zostaną wykryte luki w jego\n"
@@ -3728,136 +3966,80 @@ msgstr ""
 "\n"
 "Opcja \"%s\" jest używana do zablokowania okna ostrzeżeń\n"
 "pojawiającego się w momencie automatycznego wyboru pakietów przez\n"
-"instalatora. Okno to określa czy jakiś pakiet jest dodatkowo wymagany\n"
-"do spełnienia zależności w stosunku do innego pakietu, w celu pomyślnego\n"
-"zakończenia instalacji.\n"
+"instalatora w celu spełnienia zależności. Niektóre pakiety zależą od innych\n"
+"tak więc instalacja określonego pakietu może wymagać instalacji innego.\n"
+"Instalator potrafi określić jakie pakiety są wymagane do spełnienia\n"
+"zależności oraz do pomyślnego zakończenia instalacji.\n"
 "\n"
 "Niewielka ikona dyskietki na dole listy umożliwia wczytanie listy pakietów\n"
-"wybranych w trakcie poprzedniej instalacji. Kliknięcie tej ikony\n"
-"spowoduje wyświetlenie prośby o włożenie dyskietki utworzonej po\n"
-"zakończeniu poprzedniego procesu instalacji. Zobacz drugą podpowiedź\n"
-"ostatniego kroku zawierającą informację o tym jak utworzyć taką dyskietkę."
-
-#: 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
+"wybranych w trakcie poprzedniej instalacji. Jest to użyteczna opcja\n"
+"w przypadku posiadania wielu maszyn, które muszą zostać skonfigurowane\n"
+"w identyczny sposób. Kliknięcie tej ikony spowoduje wyświetlenie prośby\n"
+"o włożenie dyskietki utworzonej po zakończeniu poprzedniego procesu\n"
+"instalacji. Zobacz drugą podpowiedź ostatniego kroku zawierającą\n"
+"informację o tym jak utworzyć taką dyskietkę."
+
+#: 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 "Nie"
 
-#: 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 "Tak"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Automatyczne zależności"
 
-#: 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 ""
-"Teraz zostanie dokonana konfiguracja Internetu/połączenia z siecią.\n"
-"Jeśli chcesz połączyć komputer do Internetu lub sieci lokalnej, kliknij\n"
-"\"%s\". Zostanie uruchomione automatyczne wykrywanie urządzeń sieciowych\n"
-"oraz modemów. Jeśli wykrywanie zakończy się niepowodzeniem, kolejnym razem\n"
-"należy odznaczyć opcję \"%s\". Można także\n"
-"nie wybierać konfiguracji sieci, lub też zrobić to w późniejszym czasie.\n"
-"w tym przypadku po prostu kliknij przycisk \"%s\".\n"
-"\n"
-"Podczas konfigurowania sieci dostępne są następujące opcje połączenia:\n"
-"tradycyjny modem, modem ISDN, połączenie ADSL, modem przewodowy\n"
-"i na końcu zwykłe połączenie LAN (Ethernet).\n"
-"\n"
-"Nie są tu opisane szczegóły każdej z opcji konfiguracji - po prostu należy\n"
-"upewnić się, że dostępne są wszystkie parametry takie jak adres IP,\n"
-"domyślna bramka, serwery DNS, itd.\n"
-"Jeśli nie posiadasz tych informacji poproś o nie dostawcę Internetu lub\n"
-"administratora systemu.\n"
-"\n"
-"O połączeniach przez winmodemy. Winmodemy są specjalnie zintegrowanymi\n"
-"niskopoziomowymi modemami wymagającymi do działania oprogramowania\n"
-"dodatkowego. Niektóre z tych modemów aktualnie działają pod Linuksem\n"
-"Mandrake, niektóre nie działają wcale. Można skonsultować się z listą\n"
-"obsługiwanych modemów na LinModems.\n"
-"\n"
-"Można zajrzeć do rozdziału dotyczącego połączeń Internetowych podręcznika\n"
-"użytkownika, aby uzyskać więcej szczegółów dotyczących konfiguracji lub\n"
-"sposobu użycia opisanego tutaj programu w celu konfiguracji połączenia."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Użyj automatycznego wykrywania"
-
-#: 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\": kliknięcie przycisku \"%s\" spowoduje otwarcie\n"
 "druida konfiguracji drukarki. Skonsultuj się z odpowiednim rozdziałem\n"
 "podręcznika aby znaleźć więcej informacji na temat sposobu konfiguracji\n"
 "nowej drukarki. Interfejs wykorzystywany w tym miejscu jest podobny\n"
-"do interfejsu używanego w czasie instalacji."
+"do interfejsu używanego w czasie instalacji. "
 
-#: 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 "Konfiguruj"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 "To okno dialogowe jest używane do wybrania usług włączanych podczas\n"
 "uruchamianiu systemu.\n"
@@ -3877,7 +4059,7 @@ msgstr ""
 "te usługi, które naprawdę są naprawdę potrzebne.\n"
 "!!"
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3885,20 +4067,20 @@ 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 zarządza czasem w formacie GMT (Greenwich Mean Time)\n"
 "i tłumaczy go na czas lokalny w zależności od wybranej strefy czasowej.\n"
 "Jest jednak możliwe wyłączenie tej opcji poprzez wybór \"%s\",\n"
 "co spowoduje, że zegar sprzętowy będzie wskazywał ten sam czas co zegar\n"
 "systemowy. Jest tu użyteczne jeśli komputer zarządza innym systemem\n"
-"operacyjnym jak np. Windows.\n"
+"operacyjnym.\n"
 "\n"
 "Opcja \"%s\" automatycznie ustawi zegar łącząc się\n"
 "ze zdalnym serwerem czasu przez Internet. Oczywiście trzeba posiadać\n"
@@ -3907,27 +4089,27 @@ msgstr ""
 "Na komputerze zostanie zainstalowany serwer czasu, który może być\n"
 "używany przez inne komputery w sieci lokalnej."
 
-#: 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 "Ustawienie zegara sprzętowego na czas GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Automatyczna synchronizacja czasu"
 
-#: 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 ""
 "Karta graficzna\n"
@@ -3940,39 +4122,41 @@ msgstr ""
 "akceleracji 3D, zostanie wyświetlona prośba o wybranie serwera\n"
 "najlepiej odpowiadającego potrzebom użytkownika."
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3981,28 +4165,30 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "X (od systemu X Window) to serce graficznego interfejsu GNU/Linux,\n"
 "z którego korzystają wszystkie środowiska graficzne (KDE, GNOME,\n"
-"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrake.\n"
+"AfterStep, WindowMaker, itd.) dostępne w systemie Mandrakelinux.\n"
 "\n"
 "Zostanie wyświetlona lista różnych parametrów pozwalających\n"
-"na zmianę sposobu wyświetlania: Karta graficzna\n"
+"na zmianę sposobu wyświetlania.\n"
+"\n"
+"Karta graficzna\n"
 "\n"
 "    Instalator zazwyczaj automatycznie wykrywa i konfiguruje kartę\n"
 "graficzną zainstalowaną na komputerze. Jeśli nie zostanie wykryta,\n"
@@ -4053,14 +4239,14 @@ msgstr ""
 "jest wybrać \"%s\" jeśli maszyna ma pracować jako serwer lub też\n"
 "gdy nie udało się poprawnie skonfigurować wyświetlania."
 
-#: 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"
@@ -4068,14 +4254,14 @@ msgstr ""
 "podłączony do komputera. Jeśli jednak ten przypadek nie nastąpi, można\n"
 "wybrać z listy aktualnie podłączony do komputera monitor."
 
-#: 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 ""
 "Rozdzielczość\n"
@@ -4086,100 +4272,101 @@ msgstr ""
 "po instalacji). Przykład wybranej konfiguracji jest wyświetlony na\n"
 "monitorze."
 
-#: 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 ""
 "W przypadku, gdy dla twojej karty dostępne są różne serwery, z lub bez\n"
 "akceleracji 3D, będzie można wybrać serwer najlepiej odpowiadający\n"
 "potrzebom użytkownika."
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Opcje\n"
 "\n"
-"   W tym miejscu można wybrać czy komputer ma przełączać się automatycznie\n"
+"   Ten krok umożliwia wybór czy komputer ma przełączać się automatycznie\n"
 "do interfejsu graficznego podczas uruchamiania. Oczywiście, można zaznaczyć\n"
 "\"%s\" jeśli komputer ma działać jako serwer, lub jeśli nie udało się\n"
 "skonfigurować ekranu graficznego."
 
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"W tym etapie instalacji należy określić, gdzie na dysku zostanie "
-"zainstalowany\n"
-"Mandrakelinux. Jeśli dysk jest pusty lub istniejące systemy operacyjne\n"
-"zajmują całe dostępne miejsce, należy podzielić dysk na partycje\n"
+"W tym etapie instalacji należy określić, gdzie na dysku zostanie\n"
+"zainstalowany system operacyjny Mandrakelinux. Jeśli dysk jest pusty\n"
+"lub istniejące systemy operacyjne zajmują całe dostępne miejsce,\n"
+"należy podzielić dysk na partycje.\n"
 "Partycjonowanie to po prostu logiczny podział twardego dysku na oddzielne\n"
 "obszary w celu zainstalowania systemu Mandrakelinux.\n"
 "\n"
@@ -4191,18 +4378,18 @@ msgstr ""
 "\n"
 "Możliwych jest kilka rozwiązań zależnych od konfiguracji dysku twardego:\n"
 "\n"
-"* \"%s\": ta opcja po prostu oznacza automatyczne\n"
+" * \"%s\": ta opcja po prostu oznacza automatyczne\n"
 "partycjonowanie niezapisanych dysków. Nie zostaną wyświetlone żadne\n"
 "dodatkowe pytania.\n"
 "\n"
-"* \"%s\": gdy druid wykrył jedną lub więcej\n"
+" * \"%s\": gdy druid wykrył jedną lub więcej\n"
 "istniejących partycji linuksowych. Wybierz to rozwiązanie, jeśli\n"
 "chcesz użyć te partycje dla nowej instalacji. Zostanie wyświetlona\n"
 "prośba o wybranie punktu montowania dla każdej z tych partycji.\n"
 "Domyślnie wybierane są już zdefiniowane punkty montowania,\n"
 "w większości przypadków lepiej ich nie zmieniać.\n"
 "\n"
-"* \"%s\": jeśli na komputerze\n"
+" * \"%s\": jeśli na komputerze\n"
 "został zainstalowany Microsoft Windows zajmuje on całą przestrzeń\n"
 "dyskową, należy utworzyć wolne miejsce dla Linuksa. Aby to zrobić, można\n"
 "usunąć partycję MS Windows wraz z danymi (zobacz rozwiązanie \"Kasowanie\n"
@@ -4216,7 +4403,7 @@ msgstr ""
 "Windows będzie mniejsza niż jest obecnie. Oznacza to także mniej miejsca\n"
 "do instalacji nowych programów lub przechowywania danych.\n"
 "\n"
-"* \"%s\": Jeśli chcesz usunąć z dysku\n"
+" * \"%s\": Jeśli chcesz usunąć z dysku\n"
 "wszystkie dane i wszystkie partycje istniejące na dysku oraz zainstalować\n"
 "w to miejsce nowy system Mandrakelinux, wybierz to rozwiązanie.\n"
 "Pamiętaj, że po zatwierdzeniu tego wyboru nie nie będzie możliwości "
@@ -4224,7 +4411,7 @@ msgstr ""
 "\n"
 "    !! Po wybraniu tej opcji wszystkie dane zostaną utracone !!\n"
 "\n"
-"* \"%s\": ta opcja spowoduje wymazanie wszystkich danych\n"
+" * \"%s\": ta opcja spowoduje wymazanie wszystkich danych\n"
 "oraz rozpoczęcie instalacji na czystym dysku. Wszystkie zapisane dane\n"
 "zostaną utracone.\n"
 "\n"
@@ -4238,52 +4425,53 @@ msgstr ""
 "na temat tego, w jaki sposób korzystać z narzędzia DiskDrake, skonsultuj\n"
 "się z podręcznikiem (rozdział \"Zarządzanie partycjami\")."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Wykorzystaj wolne miejsce"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Użyj istniejących partycji"
 
-#: 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 "Wykorzystaj wolne miejsce na partycji Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Wymaż cały dysk"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Usuń Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Zaawansowany podział na partycje"
 
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4291,16 +4479,22 @@ 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 ""
 "Tak więc instalacja zakończyła się, zaś system GNU/Linux jest gotowy do \n"
 "użycia. Kliknij przycisk \"%s\" aby ponownie uruchomić system.\n"
+"Nie zapomnij o usunięcie nośnika instalacyjnego (CD lub dyskietka).\n"
 "Pierwszą rzeczą jaką użytkownik zobaczy po zakończeniu testów sprzętu\n"
 "jest menu programu rozruchowego, dające możliwość wybrania systemu,\n"
 "który powinien zostać uruchomiony.\n"
@@ -4324,66 +4518,65 @@ msgstr ""
 "podobnych komputerów. Zajrzyj do rozdziału automatycznej instalacji na\n"
 "naszej stronie www;\n"
 "\n"
-" * \"%s\": zapisuje listę pakietów wybranych\n"
+" * \"%s\"(*): zapisuje listę pakietów wybranych\n"
 "w trakcie instalacji. Wówczas podczas przeprowadzania innych instalacji\n"
 "należy włożyć dyskietkę do napędu oraz uruchomić instalację\n"
 "rozpoczynającą się od ekranu pomocy przez naciśnięcie klawisza [F1],\n"
-"oraz wpisać polecenie >>linux defcfg=\"floppy\"<<."
+"oraz wpisać polecenie >>linux defcfg=\"floppy\"<< oraz naciśnięcie klawisza\n"
+"[Enter].\n"
+"\n"
+"(*) Wymagana jest dyskietka sformatowana z systemem plików FAT. Aby\n"
+"utworzyć taką dyskietkę w systemie GNU/Linux, wpisz polecenie\n"
+"\"mformat a:\", lub \"fdformat /dev/fd0\" a następnie \"mkfs.vfat /dev/fd0\"."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Tworzenie dyskietki automatycznej instalacji"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Powtórzona"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Automatyczna"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Zapisz listę wybranych pakietów"
 
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Wszystkie nowopowstałe partycje muszą zostać sformatowane przed\n"
-"wykorzystaniem (formatowanie oznacza utworzenie systemu plików).\n"
-"\n"
-"Można teraz także powtórnie sformatować istniejące już partycje, by\n"
-"usunąć znajdujące się na nich dane. Jeśli chcesz to zrobić, zaznacz\n"
-"partycje do sformatowania.\n"
+"Jeśli wybierzesz ponowne użycie jakichś partycji GNU/Linux, może\n"
+"istnieć potrzeba ponownego sformatowania ich w celu usunięcia\n"
+"wszystkich danych, które zawierają. Aby to uczynić, wybierz także te\n"
+"partycje.\n"
 "\n"
 "Należy pamiętać, że nie jest konieczne formatowanie wszystkich istniejących\n"
 "już partycji. Sformatowane muszą być partycje zawierające system "
@@ -4402,29 +4595,29 @@ msgstr ""
 "Kliknij \"%s\" jeśli chcesz wybrać sprawdzanie niektórych partycji\n"
 "w poszukiwaniu uszkodzonych sektorów na dysku."
 
-#: 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 "Wstecz"
 
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Podczas instalacji Linuksa Mandrake, być może niektóre pakiety\n"
 "zostały zaktualizowane od wydania początkowego. Niektóre błędy mogą\n"
@@ -4439,28 +4632,27 @@ msgstr ""
 "wówczas drzewo wyboru: przejrzyj informacje i naciśnij \"%s\"\n"
 "aby pobrać i zainstalować wybrane pakiety, lub \"%s\", aby anulować."
 
-#: 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 "Zainstaluj"
 
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 "Nadszedł czas na wybór poziomu bezpieczeństwa, który ma zostać ustawiony\n"
 "na komputerze. Jako żelazną zasadę należy przyjąć, że im komputer bardziej\n"
@@ -4471,17 +4663,17 @@ msgstr ""
 "Jeśli nie wiesz co wybrać, użyj domyślnej opcji. Będzie można zmienić "
 "poziom\n"
 "bezpieczeństwa w późniejszym czasie przy użyciu narzędzia draksec\n"
-"uruchamianego z Centrum Sterowania Mandrake.\n"
+"uruchamianego z Centrum Sterowania Mandrakelinux.\n"
 "\n"
 "Pole \"%s\" może informować system o użytkowniku komputera odpowiedzialnego\n"
 "za bezpieczeństwo. Komunikaty bezpieczeństwa będą przesyłane na ten adres."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Administrator zabezpieczeń"
 
-#: 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"
@@ -4630,17 +4822,17 @@ msgstr ""
 "jądra oraz obrazów do uniknięcia ewentualnych awarii uniemożliwiających\n"
 "rozruch systemu z normalnej partycji."
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Automatyczne montowanie nośników wymiennych"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Przełącz między trybem zwykłym a zaawansowanym"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4700,40 +4892,40 @@ msgstr ""
 "\"Nazwa Windows\" to litera dysku pod Windows (pierwszy dysk \n"
 "lub partycja to \"C:\")."
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "\"%s\": zaznacz odpowiedni kraj. Jeśli nie znajdujesz się w tym kraju,\n"
 "kliknij przycisk \"%s\" oraz wybierz inny kraj. Jeśli twój kraj\n"
 "nie jest wyświetlony na pierwszej liście, kliknij przycisk \"%s\"\n"
 "aby otrzymać pełną listę krajów."
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Ten krok jest aktywowany tylko jeśli na twoim komputerze została\n"
@@ -4742,13 +4934,14 @@ msgstr ""
 "Instalator musi teraz otrzymać informację czy chcesz przeprowadzić nową\n"
 "instalację, czy też uaktualnić istniejący system Mandrakelinux:\n"
 "\n"
-" * \"%s\": w większości przypadków, ta opcja powoduje całkowite\n"
-"usunięcie starego systemu. Jeśli chcesz zmienić sposób partycjonowania\n"
-"twardych dysków, lub też zmienić system plików, należy użyć tej opcji.\n"
-"Jednak w zależności od schematu partycjonowania, można zapobiec\n"
-"nadpisaniu niektórych z istniejących danych.\n"
+" * \"%s\": W większości przypadków, ta opcja powoduje całkowite\n"
+"usunięcie starego systemu. Jednak w zależności od schematu\n"
+"partycjonowania, można zapobiec nadpisaniu niektórych z istniejących\n"
+"danych (szczególnie katalogów \"home\"). Jeśli chcesz zmienić sposób\n"
+"partycjonowania twardych dysków, lub też system plików, należy użyć tej "
+"opcji.\n"
 "\n"
-" * \"%s\": ta klasa instalacji umożliwia uaktualnienie pakietów\n"
+" * \"%s\": Ta klasa instalacji umożliwia uaktualnienie pakietów\n"
 "aktualnie zainstalowanych w systemie Mandrakelinux. Twój bieżący\n"
 "schemat partycjonowania oraz dane użytkownika nie zostaną zmienione.\n"
 "Większość z innych kroków konfiguracyjnych pozostanie dostępnych,\n"
@@ -4758,25 +4951,24 @@ msgstr ""
 "Mandrakelinux w wersji \"8.1\" i późniejszych. Przeprowadzanie\n"
 "uaktualnienia z wersji wcześniejszych niż \"8.1\" nie jest zalecane."
 
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "W zależności od wybranego języka, instalator automatycznie\n"
@@ -4798,25 +4990,27 @@ msgstr ""
 "okno umożliwi wybranie skrótów klawiszowych przełączających układ\n"
 "klawiatury z łacińskiego na narodowy."
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4825,20 +5019,22 @@ 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 ""
+"Pierwszym krokiem jest wybór preferowanego języka.\n"
+"\n"
 "Twój wybór preferowanego języka będzie miał wpływ na język\n"
 "dokumentacji, instalatora oraz systemu w ogólności. Najpierw należy\n"
 "wybrać region, w którym znajduje się użytkownik a następnie język\n"
@@ -4852,13 +5048,13 @@ msgstr ""
 "głównego drzewa zaś w sekcji \"Zaawansowane\" zaznaczyć opcję\n"
 "\"%s\".\n"
 "\n"
-"Uwaga dotycząca osługi UTF-8 (unikodu): Unikod jest nowym kodowaniem\n"
+"Uwaga dotycząca obsługi UTF-8 (unikodu): Unikod jest nowym kodowaniem\n"
 "znaków umożliwiającym równoczesną osługę wszystkich istniejących\n"
 "języków. Jednak pełna obsługa tego standardu jest wciąż w trakcie\n"
-"rozwoju w systemach GNU/Linux. Z tego powodu, Linux Mandrake będzie\n"
-"używał go lub nie w zależności od wyboru użytkownika:\n"
+"rozwoju w systemach GNU/Linux. Z tego powodu, Mandrakelinux\n"
+"używa go lub nie w zależności od wyboru użytkownika:\n"
 "\n"
-"* Po wybraniu języków z dawno używanym kodowaniem (języki latin1,\n"
+"* Po wybraniu języków z często używanym kodowaniem (języki latin1,\n"
 "rosyjski, japoński, chiński, koreański, rajski, grecki, turecki, większość\n"
 "języków używających iso-8859-2), kodowanie to będzie używane domyślnie;\n"
 "\n"
@@ -4878,48 +5074,51 @@ msgstr ""
 "słowniki, itd. dla każdego zainstalowanego języka.\n"
 "\n"
 "Aby przełączać się pomiędzy różnymi językami zainstalowanymi w systemie,\n"
-"można uruchomić polecenie \"/usr/sbin/localedrake\" z poziomu\n"
+"można uruchomić polecenie \"localedrake\" z poziomu\n"
 "użytkownika \"root\" co spowoduje zmianę języka używanego przez cały\n"
 "system. Uruchomienie polecenia z konta zwykłego użytkownika spowoduje\n"
 "zmianę ustawień językowych tylko dla tego użytkownika."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Hiszpański"
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 "Instalator zazwyczaj wykrywa liczbę przycisków myszy. W innym przypadku\n"
 "zakłada, że mysz posiada dwa przyciski i ustawi system na emulacje\n"
@@ -4937,6 +5136,9 @@ msgstr ""
 "Jeśli z różnych powodów chcesz wybrać inny typ myszy należy wybrać\n"
 "odpowiednią pozycję z listy.\n"
 "\n"
+"Można wybrać opcję \"%s\" aby ustawić \"zwykły\" typ myszy, który\n"
+"będzie działać prawie z każdą myszą.\n"
+"\n"
 "Jeśli zostanie wybrana mysz inna niż domyślna, zostanie wyświetlony\n"
 "ekran testowy. Użytkownik powinien sprawdzić przyciski oraz kółka\n"
 "aby upewnić się co do poprawności konfiguracji. Jeśli mysz nie pracuje\n"
@@ -4952,12 +5154,17 @@ msgstr ""
 "podczas przesuwania kółka myszy, sprawdź przyciski oraz upewnij się,\n"
 "że wskaźnik przesuwa się po ekranie przy zmianie położenia."
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "z emulacją kółka"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Uniwersalna | Dowolna mysz PS/2 i USB"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4966,16 +5173,16 @@ msgstr ""
 "Wybierz właściwy port. Na przykład numer portu \"COM1\" z MS Windows\n"
 "w GNU/Linux nazywa się \"ttyS0\"."
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4984,27 +5191,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 ""
 "Nadszedł czas na podjęcie najważniejszej decyzji dotyczącej bezpieczeństwa\n"
 "twojego systemu GNU/Linux: należy podać hasło użytkownika \"root\". \n"
@@ -5031,7 +5237,7 @@ msgstr ""
 "hasło, należy go użyć podczas pierwszego logowania i zmienić je na\n"
 "właściwe.\n"
 "\n"
-"Jeśli chcesz uzyskać dostęp do komputera, który ma być kontrolowany\n"
+"Jeśli chcesz aby komputer, był kontrolowany\n"
 "przez serwer uwierzytelniania, kliknij przycisk \"%s\".\n"
 "\n"
 "Można wybrać odpowiednią opcję \"%s\" spośród LDAP, NIS lub Domeny PDC\n"
@@ -5041,194 +5247,44 @@ msgstr ""
 "w przypadku, gdy komputer nie jest połączony z Internetem i ufasz\n"
 "wszystkim osobom posiadającym do niego dostęp."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "uwierzytelnianie"
 
 #. -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 "Bez hasła"
 
-#: 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 ""
-"To okno dialogowe służy do skonfigurowania programu rozruchowego:\n"
-"\n"
-" * \"%s\": można dokonać wyboru spośród trzech opcji:\n"
-"\n"
-"    * \"%s\": jeśli ma być użyty grub (menu tekstowe).\n"
-"\n"
-"    * \"%s\": jeśli ma zostać użyty LILO z interfejsem tekstowym.\n"
-"\n"
-"    * \"%s\": jeśli ma zostać użyty LILO z interfejsem graficznym.\n"
-"\n"
-" * \"%s\": w większości przypadków, nie jest zmieniana\n"
-"domyślna lokalizacja (\"%s\"), lecz można zainstalować program\n"
-"rozruchowy na drugim twardym dysku (\"%s\"), lub nawet na dyskietce\n"
-"(\"%s\");\n"
-"\n"
-" * \"%s\": w trakcie uruchamiania systemu określić można czas,\n"
-"w którym użytkownik może zmienić z menu domyślnie uruchamiany\n"
-"system operacyjny na inny.\n"
-"\n"
-" * \"%s\": ACPI jest nowym standardem (który pojawił się w 2002 roku)\n"
-"umożliwiającym lepsze zarządzanie, zwłaszcza dla laptopów.\n"
-"Jeśli wiesz, że twój sprzęt obsługuje go i potrzebujesz ACPI\n"
-"należy zaznaczyć tą opcję.\n"
-"\n"
-" * \"%s\": jeśli występują programy ze sprzętem na komputerze (kolizje\n"
-"IRQ, niestailności, zwisanie maszyny, ...) należy spróbować wyłączyć\n"
-"APIC poprzez zaznaczenie tej opcji.\n"
-"\n"
-"!! Należy być ostrożnym!! Uwaga, jeśli określono aby nie instalować "
-"programu\n"
-"rozruchowego (poprzez wybranie \"%s\"), należy się upewnić, że\n"
-"istnieje sposób na uruchomienie systemu! Także należy mieć pewność co\n"
-"się robi przed zmianą jakiejkolwiek opcji!!\n"
-"\n"
-"Kliknięcie przycisku \"%s\" spowoduje wyświetlenie okna umożliwiającego\n"
-"ustawienie wielu zaawansowanych opcji i jest zarezerwowane dla\n"
-"użytkowników zaawansowanych"
-
-#: 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 "Opóźnienie przed uruchomieniem domyślnego obrazu"
-
-#: 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 ""
-"Po skonfigurowaniu ogólnych parametrów programu rozruchowego,\n"
-"podczas uruchamiania komputera dostępna będzie lista opcji uruchamiania.\n"
-"\n"
-"Jeśli na komputerze zainstalowane są inne systemy operacyjne, zostaną\n"
-"one automatycznie dodane do menu startowego. Można dostosować te\n"
-"opcje poprzez kliknięcie przycisku \"%s\", aby utworzyć nowy wpis, wybrania\n"
-"opcji \"%s\" lub \"%s\" aby zmienić lub usunąć odpowiedni wpis.\n"
-"Przycisk \"%s\" umożliwia zatwierdzenie i sprawdzenie poprawności zmian.\n"
-"\n"
-"Może także zachodzić potrzeba, aby inni użytkownicy nie mieli możliwości\n"
-"uruchamiania pozostałych systemów po włączeniu komputera. Można\n"
-"usunąć odpowiednie wpisy dla systemów operacyjnych z menu programu\n"
-"rozruchowego. Wówczas jednak uruchomienia tych systemów potrzebna\n"
-"będzie dyskietka startowa!"
-
-#: 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 "Dodaj"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Modyfikuj"
-
-#: 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 "Usuń"
-
-#: help.pm:787
+#: help.pm:725
 #, c-format
 msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
-"LILO i grub są programami rozruchowymi systemu GNU/Linux. Zazwyczaj ten\n"
-"etap jest całkowicie zautomatyzowany. Instalator przeanalizuje sektor\n"
-"rozruchowy oraz wykona operacje zależne od tego co zostanie tam znalezione:\n"
+"Program rozruchowy to niewielki program uruchamiający komputer tuż po\n"
+"jego włączeniu. Jest on odpowiedzialny za uruchomienie całego systemu.\n"
+"Zazwyczaj instalacja programu rozruchowego jest całkowicie zautomatyzowana\n"
+"Instalator przeanalizuje sektor rozruchowy oraz wykona operacje zależne od\n"
+"tego co zostanie tam znalezione:\n"
 "\n"
 " * jeśli zostanie znaleziony sektor rozruchowy Windows zostanie on\n"
-"zastąpiony sektorem rozruchowym grub/LILO. Dzięki temu będzie możliwość\n"
+"zastąpiony sektorem rozruchowym GRUB/LILO. Dzięki temu będzie możliwość\n"
 "uruchamiania zarówno systemu GNU/Linux jak i innego systemu operacyjnego.\n"
 "\n"
 " * jeśli zostanie znaleziony sektor rozruchowy grub lub LILO zostanie\n"
@@ -5240,33 +5296,33 @@ msgstr ""
 "żadnego programu rozruchowego. Użyj tej opcji tylko w przypadku gdy\n"
 "wiesz co robisz."
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Nadszedł czas na wybranie systemu drukowania. Inne systemy operacyjne\n"
 "mogą zaoferować jeden, lecz Mandrakelinux oferuje dwa. Każdy z tych\n"
@@ -5295,19 +5351,24 @@ msgstr ""
 "Jeśli wybór zostanie dokonany w tymi miejscu, zaś później okaże się,\n"
 "że system wydruku nie odpowiada twoim potrzebom, można go zmienić\n"
 "uruchamiając program PrinterDrake z Centrum Sterowania Mandrake.\n"
-"Należy tam także kliknąć przycisk \"Zaawansowane\"."
+"Należy tam także kliknąć przycisk \"%s\"."
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "Tryb zaawansowany"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5347,238 +5408,75 @@ msgstr ""
 "które z parametrów muszą zostać ustawione do poprawnego działania sprzętu,\n"
 "należy ręcznie skonfigurować sterownik."
 
-#: help.pm:847
+#: help.pm:786
 #, c-format
 msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-"Można dodać wpisy do yaboota, zarówno dla innych systemów\n"
-"operacyjnych, alternatywnych jąder jak i dla awaryjnego obrazu\n"
-"jądra.\n"
-"\n"
-"W przypadku innych systemów, wpis zawiera tylko etykietę oraz\n"
-"partycję główną (\"root\")\n"
-"\n"
-"W przypadku Linuksa istnieje kilka możliwych opcji:\n"
-"\n"
-" * Etykieta: to jest po prostu nazwa, jaką należy wybrać aby yaboot\n"
-"wyświetlił ją przy wyborze opcji uruchamiania;\n"
-"\n"
-" * Obraz: to jest nazwa jądra do uruchomienia. Typowo, vmlinux lub warianty\n"
-"tej nazwy z rozszerzeniem.\n"
-"\n"
-" * Root: urządzenie główne lub \"/\" dla instalacji linuksa\n"
-"\n"
-" * Dołącz: w przypadku sprzętu Apple, opcja dołączana do jądra jest\n"
-"używana dosyć często do wspomagania inicjacji sprzętu wideo lub do\n"
-"włączania emulacji klawisza myszy na klawiaturze przy często brakującym\n"
-"2-gim lub 3-cim przycisku myszy Apple. Poniżej przedstawione zostały "
-"przykłady:\n"
-"\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Startowy ramdysk: ta opcja może być używana zarówno do wczytania\n"
-"modułów inicjacyjnych, zanim będzie dostępne urządzenie uruchamiające\n"
-"lub do wczytania obrazu ramdysku w przypadku sytuacji awaryjnej;\n"
-"\n"
-" * Rozmiar startowego ramdysku: domyślny rozmiar ramdysku to zazwyczaj\n"
-"4,096 bajtów. Jeśli wymagany jest większy ramdysk, ta opcja może być\n"
-"wykorzystana do określenia wartości większej niż domyślna.\n"
-"\n"
-" * Zapis-odczyt: zwykle partycja \"root\" jest na początku uruchamiana\n"
-"jako read-only (tylko do odczytu) aby umożliwić sprawdzenie systemu plików\n"
-"zanim system \"ożyje\". Za pomocą tej opcji można przesłonić tą funkcję.\n"
-"\n"
-" * Brak wideo: sprzęt video Apple jest problematyczny w użyciu.\n"
-"Można wybrać tą opcję aby uruchomić tryb \"novidep\" z\n"
-"rodzimą obsługą bufora ramek (ang. frame buffer)\n"
-"\n"
-" * Domyślny: wybranie tego wpisu powoduje, że określony wybór staje się\n"
-"domyślny i można go wybrać poprzez wciśnięcie przycisku \"ENTER\".\n"
-"Ten wpis zostanie zaznaczony przez \"*\"; naciśnięcie klawisza [Tab]\n"
-"umożliwia wyświetlenie listy wyboru uruchamiania."
-
-#: 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 jest programem rozruchowym sprzętu NewWorld Macintosh. Można\n"
-"uruchamiać zarówno GNU/Linux, Mac OS lub MacOSX. Zazwyczaj MacOS\n"
-"i MacOSX są poprawnie wykrywane i instalowane w menu programu\n"
-"rozruchowego. W innym przypadku można dodać wpis ręcznie na tym\n"
-"ekranie. Należy uważać aby podać poprawne parametry.\n"
-"\n"
-"Głównymi opcjami yaboot są:\n"
-"\n"
-" * Komunikat początkowy: tekst wyświetlany przed znakiem zachęty przy "
-"uruchamianiu\n"
-"\n"
-" * Urządzenie rozruchowe: wskazuje gdzie ma być umieszczona informacja\n"
-"wymagana przez GNU/Linux. Zazwyczaj, aby otrzymać tą informację,\n"
-"należy wcześniej ustawić partycję bootstrap.\n"
-"\n"
-" * Opóźnienie Open Firmware: zupełnie inaczej niż w LILO, w yaboot\n"
-"dostępne są dwie zwłoki czasowe. Pierwsza z nich jest mierzona w sekundach\n"
-"w tym punkcie można wybrać między CD, uruchamianiem OF, MacOS\n"
-"lub Linuksem.\n"
-"\n"
-" * Opóźnienie uruchamiania jądra: to jest odstęp czasowy podobny do zwłoki\n"
-"czasowej LILO. Po wybraniu Linuksa, ustawiona będzie ona na 0.1 sekundy\n"
-"zanim zostanie wybrany opis domyślnego jądra;\n"
-"\n"
-" * Uaktywnić uruchamianie z CD?: zaznaczenie tej opcji umożliwia wybranie\n"
-"\"C\" dla dysku CD w czasie pierwszego wyświetlania listy wyboru.\n"
-"\n"
-" * Uaktywnić uruchamianie OF?: zaznaczenie tej opcji umożliwia wybranie \n"
-"\"N\" dla Open Firmware w czasie pierwszego wyświetlania listy wyboru.\n"
-"\n"
-" * Domyślny system?: można wybrać, który z systemów zostanie uruchomiony\n"
-"domyślnie jeśli czas opóźnienia OF upłynie."
-
-#: help.pm:926
-#, c-format
-msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 "\"%s\": jeśli karta dźwiękowa została wykryta w systemie, jest ona\n"
 "wyświetlana w tym miejscu. Jeśli zauważysz, że wyświetlana karta\n"
 "nie jest tą, która jest aktualnie obecna w systemie, możesz kliknąć\n"
 "przycisk i wybrać inny sterownik."
 
-#: 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 "Karta dźwiękowa"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
+"\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5588,10 +5486,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 ""
@@ -5628,31 +5528,35 @@ msgstr ""
 "nie jest tą, która jest obecna w systemie, kliknij przycisk i wybierz\n"
 "inny sterownik.\n"
 "\n"
-" * \"%s\": domyślnie instalator konfiguruje interfejs\n"
-"graficzny w rozdzielczości \"800x600\" lub \"1024x768\". Jeśli chcesz\n"
-"wybrać inną opcję, kliknij przycisk \"%s\" aby zmienić ustawienie\n"
-"interfejsu graficznego.\n"
-"\n"
 " * \"%s\": jeśli w systemie została wykryta karta TV,\n"
 "jest ona tutaj wyświetlana. Jeśli posiadasz kartę telewizyjną a nie\n"
 "została ona wykryta, kliknij przycisk \"%s\" aby spróbować\n"
 "skonfigurować ją ręcznie.\n"
 "\n"
-" * \"%s\": jeśli w systemie została wykryta karta ISDN, zostanie\n"
-"ona tutaj wyświetlona. Można kliknąć przycisk \"%s\" aby zmienić\n"
-"parametry związane z tą kartą.\n"
+" * \"%s\": można kliknąć przycisk \"%s\" aby zmienić parametry\n"
+"powiązane z kartą w przypadku niepoprawnej konfiguracji.\n"
+"\n"
+" * \"%s\": domyślnie instalator konfiguruje interfejs\n"
+"graficzny w rozdzielczości \"800x600\" lub \"1024x768\". Jeśli chcesz\n"
+"wybrać inną opcję, kliknij przycisk \"%s\" aby zmienić ustawienie\n"
+"interfejsu graficznego.\n"
 "\n"
 " * \"%s\": jeśli chcesz skonfigurować połączenie z Internetem lub\n"
-"sieć lokalną użyj tej opcji.\n"
+"sieć lokalną użyj tej opcji. Zobacz na wydrukowaną dokumentację lub\n"
+"użyj Centrum Sterownia Mandrakelinux po zakończeniu instalacji\n"
+"aby otrzymać pełną pomoc.\n"
+"\n"
+" * \"%s\": umożliwia konfigurację adresów pośrednika HTTP i FTP,\n"
+"w przypadku gdy komputer znajduje się za serwerem pośrednika.\n"
 "\n"
 " * \"%s\": ta pozycja umożliwia zmianę ustawień\n"
-"poziomu bezpieczeństwa ustawioną w poprzednim kroku.\n"
+"poziomu bezpieczeństwa ustawioną w poprzednim kroku ().\n"
 "\n"
 " * \"%s\": jeśli planujesz łączenie komputera z Internetem.\n"
 "dobrym pomysłem jest zapewnienie ochrony przed włamaniami poprzez\n"
 "ustawienie zapory sieciowej. Skonsultuj się z odpowiednim\n"
 "rozdziałem podręcznika aby uzyskać szczegóły dotyczące ustawień\n"
-"zapory ogniowej.\n"
+"zapory sieciowej.\n"
 "\n"
 " * \"%s\": w razie potrzeby można zmienić konfigurację programu\n"
 "rozruchowego kliknij odpowiedni przycisk. Ta opcja powinna być używana\n"
@@ -5662,58 +5566,57 @@ msgstr ""
 "komputerze. Jeśli planujesz używać tego komputera jako serwera,\n"
 "dobrze jest przejrzeć te ustawienia."
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Klawiatura"
-
-#: 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 "Strefa czasowa"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Interfejs graficzny"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Karta TV"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Karta ISDN"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Interfejs graficzny"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Sieć"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Serwery pośredniczące"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Poziom bezpieczeństwa"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Zapora sieciowa"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Program rozruchowy"
 
-#: 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 "Usługi"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5724,7 +5627,7 @@ msgstr ""
 "partycję Mandrakelinux. Pamiętaj, że wszystkie dane z tego\n"
 "dysku zostaną utracone bez możliwości odzyskania!"
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5743,7 +5646,17 @@ msgstr ""
 "Wybierz \"%s\", by anulować tą operację bez utraty danych i partycji\n"
 "obecnych w systemie."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Dalej ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Wstecz"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5754,12 +5667,85 @@ msgstr ""
 "Oznacza to zazwyczaj, że dyskietka rozruchowa nie jest zsynchronizowana z "
 "nośnikiem instalacyjnym (stwórz nową dyskietkę rozruchową)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Należy także sformatować %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 ""
+"Znaleziono poniższe nośniki instalacyjne.\n"
+"Jeśli chcesz pominąć któreś z nich, możesz je teraz odznaczyć."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Czy posiadasz inne dodatkowe nośniki?"
+
+#. -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 ""
+"Znaleziono poniższe nośniki, które zostaną wykorzystane przy instalacji: %"
+"s.\n"
+"\n"
+"\n"
+"Czy posiadasz dodatkowe nośniki instalacyjne do skonfigurowania?"
+
+#: 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 "Sieć (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Sieć (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Nie znaleziono urządzeń"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Włóż płytę CD"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Włóż ponownie płytę CD 1"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "Adres URL dla serwera zwierciadlanego?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Nie można znaleźć pliku hdlist dla tego serwera zwierciadlanego"
+
+#. -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"
@@ -5782,7 +5768,8 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz zainstalować te serwery?\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"
@@ -5795,17 +5782,17 @@ msgstr ""
 "\n"
 "czy naprawdę chcesz usunąć te pakiety?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Włóż sformatowaną (FAT) dyskietkę do stacji %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Ten dysk nie jest sformatowany."
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5814,12 +5801,17 @@ msgstr ""
 "Aby użyć zapisaną listę pakietów, należy uruchomić instalację z opcją "
 "''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 "Błąd odczytu pliku %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (było %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5828,12 +5820,12 @@ msgstr ""
 "Wystąpił błąd - nie znaleziono urządzeń, na których można utworzyć nowe\n"
 "systemy plików. Sprawdź sprzęt, by wykryć przyczynę problemu"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Instalacja systemu"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Konfiguracja systemu"
@@ -5869,7 +5861,7 @@ msgstr ""
 "\n"
 "Czy chcesz mimo to kontynuować?"
 
-#: 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 "Partycja FAT musi być zamontowana w /boot/efi"
@@ -5930,7 +5922,7 @@ msgstr "Którą partycję chcesz zmniejszyć?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "Program zmniejszający partycję FAT nie potrafi obsłużyć\n"
 "Twojej partycji. Wystąpił następujący błąd: %s"
@@ -5951,7 +5943,8 @@ msgstr ""
 "systemem Windows, uruchomić narzędzie \"defrag\" i następnie ponownie "
 "rozpocząć instalację 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"
@@ -5978,56 +5971,56 @@ msgstr ""
 "dane na dysku.\n"
 "W razie pewności, wybierz OK."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Jaki powinien być rozmiar partycji Windows?"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partycja %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Zmiana rozmiaru partycji Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Zmiana rozmiaru partycji FAT nie powiodła się: %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 ""
 "Brak partycji FAT do zmiany rozmiaru (lub brak wystarczającej ilości miejsca)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Usuń 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 ""
 "Masz więcej niż 1 dysk twardy, na którym z nich ma być zainstalowany 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 ""
 "WSZYSTKIE istniejące partycje i dane na nich zapisane zostaną usunięte z "
 "dysku %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Użyj fdiska"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -6036,32 +6029,33 @@ msgstr ""
 "Możesz teraz tworzyć partycje  %s \n"
 "Gdy skończysz, pamiętaj o zapisaniu używając \"w\""
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Brak miejsca na instalację"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Druid podziału na partycje proponuje następujące rozwiązania:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partycjonowanie nie powiodło się: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Uruchamianie sieci"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Zatrzymywanie sieci"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -6079,7 +6073,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 "
@@ -6101,7 +6095,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"
@@ -6109,14 +6103,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"
@@ -6146,10 +6140,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"
@@ -6160,11 +6154,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"
@@ -6180,7 +6174,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Wprowadzenie\n"
 "\n"
@@ -6196,7 +6190,7 @@ msgstr ""
 "\n"
 "Należy przeczytać uważnie ten dokument. Jest on umową licencyjną pomiędzy "
 "użytkownikiem\n"
-"a MandrakeSoft S.A. dotyczącą Oprogramowania.\n"
+"a Mandrakesoft S.A. dotyczącą Oprogramowania.\n"
 "Instalacja, kopiowanie lub używanie Oprogramowania w dowolny sposób, oznacza "
 "pełną\n"
 "i wyraźną zgodę na warunki licencyjne tej umowy.\n"
@@ -6215,7 +6209,7 @@ msgstr ""
 "Oprogramowanie oraz dołączona dokumentacja dostarczana jest w formie "
 "\"takiej jaka jest\",\n"
 "bez żadnej gwarancji, w stopniu w jakim pozwala na to prawo.\n"
-"Firma MandrakeSoft S.A. nie będzie, bez względu na okoliczności i w zakresie "
+"Firma Mandrakesoft S.A. nie będzie, bez względu na okoliczności i w zakresie "
 "określonym przez \n"
 "prawo, odpowiedzialna za żadne specjalne, uboczne, bezpośrednie i pośrednie "
 "uszkodzenia\n"
@@ -6224,13 +6218,13 @@ msgstr ""
 "firmy, straty finansowe, zasądzone grzywny i kary prawne lub inne straty) "
 "powstałe w wyniku\n"
 "używania lub niemożności używania Oprogramowania, nawet jeśli firma "
-"MandrakeSoft S.A.\n"
+"Mandrakesoft S.A.\n"
 "została ostrzeżona o możliwości wystąpienia takich uszkodzeń.\n"
 "\n"
 "OGRANICZONA ODPOWIEDZIALNOŚĆ ZWIĄZANA Z POSIADANIEM LUB UŻYWANIEM\n"
 "OPROGRAMOWANIA W NIEKTÓRYCH KRAJACH\n"
 "\n"
-"W zakresie określonym przez prawo firma MandrakeSoft S.A. lub jej "
+"W zakresie określonym przez prawo firma Mandrakesoft S.A. lub jej "
 "dystrybutorzy bez względu\n"
 "na okoliczności nie będą odpowiedzialni za żadne specjalne, uboczne, "
 "bezpośrednie i pośrednie uszkodzenia\n"
@@ -6260,9 +6254,9 @@ msgstr ""
 "komponentu przed\n"
 "jego użyciem. Dowolne pytanie dotyczące licencji powinno być przesyłane do "
 "autora, nie\n"
-"do firmy MandrakeSoft. Programy stworzone przez MandrakeSoft S.A. są wydane "
+"do firmy Mandrakesoft. Programy stworzone przez Mandrakesoft S.A. są wydane "
 "na zasadach\n"
-"licencji GPL. Dokumentacja napisana przez MandrakeSoft S.A. jest wydana na "
+"licencji GPL. Dokumentacja napisana przez Mandrakesoft S.A. jest wydana na "
 "zasadach\n"
 "wybranej licencji. Zajrzyj do dokumentacji, aby uzyskać więcej szczegółów.\n"
 "\n"
@@ -6273,12 +6267,12 @@ msgstr ""
 "chronione\n"
 "przez prawo własności intelektualnej i prawo autorskie stosowane do "
 "programów komputerowych.\n"
-"Firma MandrakeSoft S.A. zastrzega sobie prawo do zmiany lub przystosowania "
+"Firma Mandrakesoft S.A. zastrzega sobie prawo do zmiany lub przystosowania "
 "Oprogramowania,\n"
 "jako całości lub w częściach, w każdym sensie i w dowolny celu.\n"
 "\"Mandrake\", \"Mandrakelinux\" oraz związane znaki graficzne są znakami "
 "handlowymi firmy\n"
-"MandrakeSoft S.A.\n"
+"Mandrakesoft S.A.\n"
 "\n"
 "\n"
 "5. Prawa Nadrzędne\n"
@@ -6295,9 +6289,9 @@ msgstr ""
 "Paryża we Francji.\n"
 "W przypadku jakichkolwiek wątpliwości dotyczących tego dokumentu, w celu ich "
 "wyjaśnienia\n"
-"można skontaktować się z firmą MandrakeSoft S.A.\n"
+"można skontaktować się z firmą 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"
@@ -6316,7 +6310,8 @@ msgstr ""
 "patent ma zastosowanie w odniesieniu do Ciebie, sprawdź prawo\n"
 "w swoim kraju."
 
-#: 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"
@@ -6380,7 +6375,7 @@ msgstr ""
 "należą do ich autorów i są chronione przez prawa autorskie\n"
 "dotyczące oprogramowania komputerowego.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6412,30 +6407,31 @@ msgstr ""
 "Informacje o konfiguracji systemu znajdują się\n"
 "w Oficjalnym Podręczniku Użytkownika 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 "Powielony punkt montowania %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 ""
 "Pewne istotne pakiety nie zostały poprawnie zainstalowane.\n"
 "Prawdopodobnie uszkodzona jest płyta lub napęd CDROM.\n"
 "Sprawdź płytę w innym komputerze używając polecenia:\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+"\"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Niedostępna stacja dyskietek"
@@ -6445,7 +6441,7 @@ msgstr "Niedostępna stacja dyskietek"
 msgid "Entering step `%s'\n"
 msgstr "Przechodzę do kroku `%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"
@@ -6457,93 +6453,93 @@ msgstr ""
 "Jeśli tak się stanie, spróbuj instalacji w trybie tekstowym.\n"
 "By ją uruchomić, naciśnij F1 podczas startu z CD i wpisz \"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 "Wybór grup pakietów"
 
-#: 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 "Rozmiar: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Uszkodzony pakiet"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Wersja: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#: 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 "Ważność: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Nie można zmienić statusu tego pakietu."
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "z powodu brakującego %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "na skutek niespełnienia %s"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "próba aktualizacji wersji %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "w celu utrzymania %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"
 msgstr "Nie możesz wybrać tego pakietu. Nie ma już miejsca, by go zainstalować"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Zostaną zainstalowane następujące pakiety"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Zostaną usunięte następujące pakiety"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ten pakiet jest wymagany, nie można go pominąć"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Nie można odznaczyć tego pakietu. Został już zainstalowany."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6552,219 +6548,224 @@ msgstr ""
 "Ten pakiet musi zostać uaktualniony.\n"
 "Na pewno chcesz go odznaczyć?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Nie można odznaczyć tego pakietu. Musi zostać zaktualizowany"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Pokaż automatycznie wybrane pakiety"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Odczytaj/Zapisz na dyskietkę"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Uaktualnianie listy wybranych pakietów"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalna instalacja"
 
-#: 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 "Wybierz pakiety do zainstalowania"
 
-#: 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 "Instalowanie"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Bez szczegółów"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Szacowanie"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Pozostały czas "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Proszę czekać, trwa przygotowywanie instalacji..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Bez szczegółów"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pakietów"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalowanie pakietu %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 "Odrzuć"
 
-#: 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 ""
 "Zmień płytę CD!\n"
 "\n"
-"Włóż płytę zatytułowaną \"%s\" do kieszeni napędu i naciśnij Ok.\n"
-"Jeśli jej nie masz, naciśnij Anuluj, by pominąć instalację pakietów z niej"
+"Włóż płytę opisaną \"%s\" do kieszeni napędu i naciśnij Ok.\n"
+"Jeśli jej nie posiadasz, naciśnij Anuluj, by pominąć instalację pakietów z "
+"niej."
 
-#: 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 "Wystąpił błąd porządkowania pakietów:"
 
-#: 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 "Kontynuować?"
 
-#: 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 "Wystąpił błąd podczas instalowania pakietów:"
 
-#: 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 "nie skonfigurowano"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Czy chcesz przywrócić swój system?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Umowa licencyjna"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Uwagi o wydaniu"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Wybierz układ klawiatury."
 
-#: 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 "Oto pełna lista dostępnych krajów"
+msgstr "Oto pełna lista dostępnych klawiatur"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalacja/Uaktualnienie"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Czy to instalacja, czy uaktualnienie?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Uaktualnienie %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Klucz szyfrujący dla %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Wybierz typ myszy."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Port myszy"
 
-#: 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 "Do którego portu szeregowego jest podłączona mysz?"
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulacja przycisków"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulacja 2 przycisku"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulacja 3 przycisku"
 
-#: 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 "Konfiguracja kart 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 "Konfiguracja 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 "Brak dostępnych partycji"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Przeszukiwanie partycji w celu określenia punktów montowania"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
-#: 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 "
@@ -6773,17 +6774,17 @@ msgstr ""
 "Brak wolnej przestrzeni na 1MB bootstrap. Instalacja będzie kontynuowana,\n"
 "lecz należy utworzyć partycję bootstrap."
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Wybierz partycje do sformatowania"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Sprawdzić partycje w poszukiwaniu uszkodzonych sektorów?"
 
-#: 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, "
@@ -6792,39 +6793,51 @@ msgstr ""
 "Błąd podczas sprawdzania systemu plików %s. Czy chcesz naprawić błędy? "
 "(uwaga - możesz utracić dane)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "Wielkość partycji wymiany jest niewystarczająca, należy ją zwiększyć"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "Wyszukiwanie dostępnych pakietów i przebudowywanie bazy danych 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 "Wyszukiwanie dostępnych pakietów..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Wyszukiwanie już zainstalowanych pakietów..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Wyszukiwanie pakietów do uaktualnienia..."
 
-#: 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 ""
+"Łączenie ze stroną Mandrakelinux w celu pobrania listy dostępnych serwerów..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Wybierz serwer lustrzany, z którego chcesz pobrać pakiety"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "Zbyt mało miejsca na instalację lub uaktualnienie (%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"
@@ -6834,42 +6847,42 @@ msgstr ""
 "na dyskietkę. Format jest identyczny z dyskiem automatycznej\n"
 "instalacji."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Odczytaj z dyskietki"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Zapisz na dyskietkę"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Wybór pakietów"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Odczytywanie z dyskietki"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Włóż dyskietkę zawierającą listę wybranych pakietów"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Wybrany rozmiar przekracza dostępne miejsce"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Typ instalacji"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6878,22 +6891,22 @@ msgstr ""
 "Nie wybrano żadnej grupy pakietów.\n"
 "Wybierz minimalną żądaną instalację:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Z podstawową dokumentacją (zalecane!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Naprawdę minimalna instalacja (w szczególności bez urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Wszystkie"
 
-#: 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"
@@ -6904,17 +6917,17 @@ msgstr ""
 "Jeżeli nie masz żadnej z płyt z listy, kliknij Anuluj.\n"
 "Jeżeli nie posiadasz niektórych płyt z listy, odznacz je i kliknij Ok."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM oznaczony \"%s\" "
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Przygotowywanie instalacji"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6923,17 +6936,17 @@ msgstr ""
 "Instalowanie pakietu %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfiguracja poinstalacyjna"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Włóż dyskietkę z uaktualnionymi modułami do stacji %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"
@@ -6943,7 +6956,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 ""
 "Masz teraz możliwość pobrania zaktualizowanych pakietów, które\n"
 "zostały wydane po udostępnieniu dystrybucji. Mogą zawierać one poprawki\n"
@@ -6953,183 +6966,166 @@ msgstr ""
 "\n"
 "Czy chcesz zainstalować uaktualnienia ?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Łączenie ze stroną Mandrakelinux w celu pobrania listy dostępnych serwerów..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Wybierz serwer lustrzany, z którego chcesz pobrać pakiety"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Łączenie z serwerem - pobieranie listy dostępnych pakietów..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Nie można skontaktować się z serwerem zwierciadlanym %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Czy chcesz spróbować jeszcze raz?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Wybierz strefę czasową."
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatyczna synchronizacja czasu (przy użyciu NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "Serwer NTP"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Różne"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "Sprzęt"
 
-#: 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 "Zdalny serwer CUPS"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Brak drukarki"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Czy posiadasz kartę dźwiękową 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 ""
-"Uruchom \"sndconfig\" po zakończeniu instalacji aby skonfigurować kartę "
-"dźwiękową"
+"Uruchom \"alsaconf\" lub \"sndconfig\" po zakończeniu instalacji aby "
+"skonfigurować kartę dźwiękową"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Karta dźwiękowa nie została wykryta. Wypróbuj \"harddrake\" po zakończeniu "
 "instalacji"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfejs graficzny"
 
-#: 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 "Sieć i Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Serwery pośredniczące"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "skonfigurowano"
 
-#: 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 "Bezpieczeństwo"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "aktywowano"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "wyłączono"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Uruchamianie"
 
 #. -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 na %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 "Usługi: %d aktywowanych na %d zarejestrowanych"
 
-#: 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 "Nie masz skonfigurowanego systemu X Window. Czy na pewno chcesz tego?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Ustaw hasło roota i metody uwierzytelniania sieciowego"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Hasło roota"
 
-#: 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 "To hasło jest zbyt krótkie (musi zawierać co najmniej %d znaków)"
 
-#: 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 "Uwierzytelnianie"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Przygotowywanie programu rozruchowego..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7143,12 +7139,12 @@ msgstr ""
 "kontynuowana lecz trzeba będzie używać programu BootX\n"
 "aby uruchomić komputer"
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Czy chcesz używać aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7157,38 +7153,7 @@ msgstr ""
 "Błąd podczas instalowania aboot. \n"
 "Wymusić instalację, nawet gdyby groziło to zniszczeniem pierwszej partycji?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Instalacja programu rozruchowego"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"Instalacja programu rozruchowego nie powiodła się. Wystąpił następujący błąd:"
-
-#: 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 ""
-"Może zachodzić potrzeba zmiany urządzenia rozruchowego Open\n"
-"Firmware aby włączyć program rozruchowy (ang. bootloader). Jeśli\n"
-"nie wyświetla się ekran powitalny w trakcie ponownego\n"
-"uruchamiania, należy przytrzymać Command-Option-O-F w trakcie\n"
-"uruchamiania i wpisać:\n"
-"setenv boot-device %s,\\\\:tbxi\n"
-"Następnie wpisać: shut-down\n"
-"Podczas następnego uruchamiania ekran powitalny programu\n"
-"rozruchowego powinien być widoczny."
-
-#: 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 "
@@ -7197,22 +7162,22 @@ msgstr ""
 "W tym poziomie zabezpieczeń, dostęp do plików na partycji Windows jest "
 "ograniczony do administratora."
 
-#: 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 "Włóż pustą dyskietkę do stacji %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Włóż kolejną dyskietkę startową na dyskietkę sterowników"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Tworzenie dyskietki automatycznej instalacji..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7223,12 +7188,12 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz teraz zakończyć?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Tworzenie dyskietki automatycznej instalacji"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7249,7 +7214,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Instalacja 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 "
@@ -7261,17 +7227,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Wybierz plik"
 
+#: 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 "Dodaj"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Modyfikuj"
+
+#: 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 "Usuń"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: 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 "Zakończ"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Wykonaj"
@@ -7350,572 +7336,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Potwierdź ponownie"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "czeski (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "niemiecki"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvoraka"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "hiszpański"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "fiński"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "francuski"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "norweski"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "polski"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "rosyjski"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "szwedzki"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "angielski"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "amerykański"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "albański"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "armeński (stary)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "armeński - fonetyczny"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "armeński - fonetyczny"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "arabski"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "azerski (latin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "belgijski"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "bengalski"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "bułgarski - fonetyczny"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "bułgarski (BSD)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "brazylijski (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "bośniacki"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "białoruski"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "szwajcarski (układ niemiecki)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "szwajcarski (układ francuski)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "czeski (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "niemiecki (bez martwych klawiszy)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "devenagari"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "duński"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvoraka (norweski)"
-
 #: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Norwegian)"
-msgstr "Dvoraka (norweski)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr "Dvoraka (Esperanto)"
 
 #: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Swedish)"
-msgstr "Dvoraka (szwedzki)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
+msgstr "Dvoraka (norweski)"
 
 #: keyboard.pm:203
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
+msgstr "Dvoraka (szwedzki)"
+
+#: keyboard.pm:205
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "estoński"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "gruziński (układ rosyjski)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "gruziński (układ łaciński)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "grecki"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "grecki (politoniczny)"
 
-#: 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 "węgierski"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "chorwacki"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irlandzki"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "izraelski"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "izraelski (fonetyczny)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "irański"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "islandzki"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "włoski"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "inkuktit"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "japoński 106 klawiszy"
 
-#: 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 "koreański"
 
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "angielski"
+#: keyboard.pm:234
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
+msgstr "Klawiatura kirgizka"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "latyno-amerykański"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "laotański"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "litewski AZERTY (stary)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "litewski AZERTY (nowy)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "litweski QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "litewski QWERTY - fonetyczny"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "łotewski"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "malajski"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "macedoński"
 
-#: 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 "mongolski (cyrylica)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "maltański (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "maltański (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "holenderski"
 
-#: 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 "polski (programisty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "polski (maszynistki)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "portugalski"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "kanadyjski (Quebec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "rumuński (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "rumuński (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "rosyjski (fonetyczny)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (norweski)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (szwedzki/fiński)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "słoweński"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "słowacki (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "słowacki (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "serbski (cyrylica)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syria"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "syryjski (fonetyczny)"
 
-#: 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 "tamilski (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "tamilski (maszynistki)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "tajski"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "tadżycki"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "turecki"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "turecki (nowy)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "ukraiński"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "amerykański (międzynarodowy)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "uzbecki (cyrylica)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "wietnamski QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "jugosłowiański (łaciński)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Prawy klawisz ALT"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Równocześnie oba klawisze SHIFT"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Równocześnie klawisze Control i Shift"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "Klawisz Capslock"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Równocześnie klawisze Shift i Capslock"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Równocześnie klawisze Ctrl i Alt"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Równocześnie klawisze Alt i Shift"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Klawisz \"Menu\""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Lewy klawisz \"Windows\""
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Prawy klawisz \"Windows\""
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Równocześnie oba klawisze Control"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Równocześnie oba klawisze ALT"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Lewy klawisz Shift"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Prawy klawisz Shift"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Lewy klawisz ALT"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Lewy klawisz Control"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Prawy klawisz Control"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7926,7 +8105,7 @@ msgstr ""
 "umożliwiających przełączanie pomiędzy różnymi układami\n"
 "klawiatur (np: latin na non-latin)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7938,1164 +8117,1188 @@ msgstr ""
 "z prawego klawisza Control w celu przełączania się pomiędzy\n"
 "różnymi układami klawiatur."
 
-#: 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 "Andora"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: 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 "Albania"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Antyle Holenderskie"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktyka"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentyna"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Samoa Zachodnie"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbejdżan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bośnia i Hercegowina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: 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 "Bułgaria"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrajn"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunea"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Boliwia"
 
-#: 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 "Brazylia"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Wyspa Bouvet"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Bostwana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Białoruś"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Wyspa Kokosowa (Keeling)"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo (Kinszasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Republika Środkowej Afryki"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo (Brazzaville)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Wybrzeże Kości Słoniowej"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Wyspy Cooka"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "Chiny"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia i Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Kuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Wyspa Bożego Narodzenia"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Cypr"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Dżibuti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Dania"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominika"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikana"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algieria"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ekwador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egipt"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Sahara Zachodnia"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Erytrea"
 
-#: 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 "Hiszpania"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Fidżi"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandy (Malwiny)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Mikronezja"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Wyspy Faroe"
 
-#: 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 "Wielka Brytania"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Gruzja"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Gwinea Francuska"
 
-#: 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 "Grenlandia"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Gwinea"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Gwadelupa"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Gwinea Równikowa"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Południowa Georgia i Południowe Wyspy Kanapkowe"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Gwinea-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Gujana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Chiny (Hongkong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Wyspy Heard i McDonalda"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Węgry"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "Indie"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Brytyjskie Terytoria Oceanu Indyjskiego"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Irak"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Islandia"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Jordania"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenia"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kirgistan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodża"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Komory"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts and Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Korea (Północna)"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Kajmany"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Liban"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Liberia"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Litwa"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Łotwa"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libia"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Maroko"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monako"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Mołdowa"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Wyspy Marshall'a"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Północne Wyspy Mariańskie"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martynika"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauretania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Malediwy"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Wyspy Norfolk"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: 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 "Nowa Zelandia"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua Nowa Gwinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: 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 "Polska"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre and Miquelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Palestyna"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paragwaj"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Katar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Rumunia"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Rosja"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Wyspy Salomona"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seszele"
 
-#: 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 "Święta Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Słowenia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Wyspy Svalbard i Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Surinam"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome i Principe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "El Salwator"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Syria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Wyspy Turks i Caicos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Czad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Francuskie Terytoria Południowe"
 
-#: 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 "Tajlandia"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadżykistan"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Wschodni Timor"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turcja"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trynidad 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 "Tajwan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Wyspy Zewnętrzne Stanów Zjednoczonych"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Watykan"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent i Grenadiny"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Wyspy Dziewicze (Brytyjskie)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Wyspy Dziewicze (USA)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Wietnam"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanutau"
 
-#: 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 "Jemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia i Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Afryka Południowa"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Należy zainstalować następujące pakiety: %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 "Witaj w %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Zapętlone montowanie %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Zacznij od usunięcia logicznych dysków (LV)\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parametry"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "BRAK"
@@ -9112,8 +9315,8 @@ msgstr "W tym miejscu można skonfigurować każdy parametr modułu."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Znaleziono %s  %s interfejsów"
+msgid "Found %s interfaces"
+msgstr "Znaleziono %s interfejsów"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9169,12 +9372,12 @@ msgid "Module options:"
 msgstr "Opcje modułu:"
 
 #. -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 "Który sterownik %s wypróbować?"
 
-#: 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"
@@ -9192,17 +9395,17 @@ msgstr ""
 "Czasami wykrywanie może zawiesić komputer, nie powinno\n"
 "wywołać to jednak żadnych uszkodzeń (utraty danych)."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Autodetekcja"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Określ parametry"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9261,11 +9464,11 @@ msgstr "Mysz standardowa PS/2 z kółkiem"
 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 "Automatycznie"
@@ -9410,50 +9613,55 @@ msgstr "Uniwersalny"
 msgid "Any PS/2 & USB mice"
 msgstr "Dowolna mysz PS/2 i USB"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Synaptics Touchpad"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "brak"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Brak myszy"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Przetestuj mysz"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "By uaktywnić mysz,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "RUSZ KÓŁKIEM!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "użyj pppoe"
+msgid "use PPPoE"
+msgstr "użyj PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "użyj pptp"
+msgid "use PPTP"
+msgstr "użyj PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "użyj dhcp"
+msgid "use DHCP"
+msgstr "użyj DHCP"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9462,36 +9670,36 @@ msgstr "- wykryto"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (wykorzystujący pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (wykorzystujący PPPoA) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (wykorzystujący dhcp) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (wykorzystujący DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Połączenie z Internetem"
 
-#: 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 ""
 "Najbardziej typowym sposobem połączenia przez ADSL jest ppoe.\n"
-"Istnieją jednak połączenia używające pptp oraz nieliczne - dhcp.\n"
-"Jeśli nie wiesz, wybierz \"użyj pppoe\""
+"Istnieją jednak połączenia używające pptp oraz nieliczne - DHCP.\n"
+"Jeśli nie wiesz, wybierz \"użyj 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 "Typ połączenia ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Serwer WWW"
@@ -9544,7 +9752,7 @@ msgstr "Żądanie echa (ping)"
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -9618,106 +9826,107 @@ msgstr "Wszystko (brak zapory)"
 msgid "Other ports"
 msgstr "Inne porty"
 
-#: 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 "Niewypisane - zmodyfikuj ręcznie"
 
-#: 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 "Nie wiem"
 
-#: 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 "Ręcznie"
 
-#: 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 "Ręczny wybór"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Wewnętrzna karta ISDN"
 
-#: 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 "Zarządzany"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Główny"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Powielający"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Zapasowy"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Automatyczny"
 
-#: 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 "Konfiguracja ręczna"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automatyczne IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Automatyczne IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Reszta świata"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protokół europejski (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"
@@ -9726,163 +9935,168 @@ msgstr ""
 "Protokół reszty świata\n"
 "Bez kanału D (linie dzierżawione)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem Alcatel speedtouch usb"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem Sagem USB"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Protokół dynamicznej konfiguracji komputera (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Konfiguracja ręczna TCP/IP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protokół tunelowania punkt-do-punktu (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP przez Ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP przez 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 "Karta ethernet LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Karta ethernet VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Routowane IP LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "Routowane IP VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Oparta o skrypt"
 
-#: 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 "Poprzez 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 "Konfiguracja sieci i Internetu"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(wykryto na porcie %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 "(wykryto %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(wykryto)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Połączenie modemowe"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "Połączenie ISDN"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "Połączenie ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Połączenie przez kablówkę"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "Sieć lokalna"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Połączenie bezprzewodowe"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Wybierz połączenie, które chcesz skonfigurować"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9895,131 +10109,130 @@ msgstr ""
 "\n"
 "Aby kontynuować naciśnij \"%s\"."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Konfiguracja połączenia"
 
-#: 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 "Wypełnij lub zaznacz pole poniżej"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ karty"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "DMA karty"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "IO karty"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_0 karty"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 karty"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Numer Twojego telefonu"
 
-#: 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 "Nazwa dostawcy usług (np. Dialog, Netia, TPSA)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Numer telefonu dostawcy usług"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "1 DNS dostawcy (opcjonalnie)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "2 DNS dostawcy (opcjonalnie)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Sposób wybierania"
 
-#: 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 "Szybkość połączenia"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Limit czasu bezczynności (w sek.)"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konto (nazwa użytkownika)"
 
-#: 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 "Hasło:"
 
-#: 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 "Wybierz interfejs sieciowy do skonfigurowania:"
 
-#: 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 "Urządzenie sieciowe"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Zewnętrzny modem ISDN"
 
-#. -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 "Wybierz urządzenie !"
 
-#: 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 "Konfiguracja ISDN"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Jaki rodzaj karty posiadasz?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10033,34 +10246,48 @@ msgstr ""
 "powinny być odpowiednie.\n"
 "Jeśli posiadasz kartę PCMCIA, trzeba znać IRQ i IO swojej karty.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Przerwij"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Która z poniższych, jest twoją kartą ISDN?"
 
-#: 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 "Sterownik"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Którego protokołu chcesz użyć?"
 
-#: 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 "Protokół"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10069,13 +10296,13 @@ msgstr ""
 "Wybierz swojego dostawcę Internetu.\n"
 "Jeśli nie ma go na liście, wybierz \"Nie wypisany\""
 
-#: 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 "Dostawca:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10084,122 +10311,117 @@ msgstr ""
 "Twój modem nie jest obsługiwany przez system.\n"
 "Zajrzyj na stronę http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Wybierz modem do skonfigurowania:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Niestety obsługiwane są jedynie jądra serii 2.4 i wyższe."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Wskaż port szeregowy, do którego podłączony jest modem."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Wybierz system wydruku:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Połączenie wdzwaniane: opcje konta"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Nazwa połączenia"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Numer telefonu"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Identyfikator logowania"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Połączenie wdzwaniane: parametry IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Parametry 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 "Adres IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "Maska podsieci"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Połączenie wdzwaniane: parametry 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 "Domena"
 
-#: 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 "Pierwszy serwer DNS (opcjonalnie)"
 
-#: 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 "Drugi serwer DNS (opcjonalnie)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Ustaw nazwę komputera na podstawie IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Router"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Adres IP bramy"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Konfiguracja ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Wybierz swojego dostawcę ADSL"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10210,32 +10432,32 @@ msgstr ""
 "Można go podać przy użyciu dyskietki lub ze swoich partycji\n"
 "windows. Można także pominąć ten krok i uczynić to później."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Użycie dyskietki"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Użycie partycji Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Zrób to później"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Kopiowanie firmware nie powiodło się, plik %s nie został znaleziony"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Kopiowanie firmware zakończone powodzeniem"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10248,22 +10470,22 @@ msgstr ""
 "%s\n"
 "i skopiuj plik mgmt.o do /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "ID wirtualnej ścieżki (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "ID wirtualnego obwodu (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Kapsułkowanie :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10276,25 +10498,25 @@ msgstr ""
 "\n"
 "Można go znaleźć na stronie http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Ręcznie załaduj sterownik"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
 "OSTRZEŻENIE: Urządzenie to zostało poprzednio skonfigurowane do połączenia z "
 "Internetem.\n"
-"Naciśnij po prostu OK by zachować konfigurację.\n"
-"Modyfikacja poniższych pól spowoduje nadpisanie istniejącej konfiguracji."
+"Modyfikacja poniższych pól nadpisze konfigurację.\n"
+"Czy na pewno chcesz przekonfigurować to urządzenie?"
 
-#: 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"
@@ -10303,17 +10525,17 @@ msgstr ""
 "Gratulacje, konfiguracja sieci i Internetu została zakończona.\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Rozwiązywanie nazw komputerów Zeroconf"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Konfiguracja urządzenia sieciowego %s (sterownik %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10322,7 +10544,7 @@ msgstr ""
 "Do konfiguracji połączenia ethernetowego można użyć poniższych protokołów. "
 "Wybierz ten, który ma zostać użyty"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10333,89 +10555,95 @@ msgstr ""
 "Każda pozycja powinna być wpisana w formacie dziesiętnym\n"
 "oddzielonym kropkami (np. 192.168.1.1)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Przypisywanie nazwy komputera z adresu DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Nazwa DHCP komputera"
 
-#: 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 "Maska"
 
-#: 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 "Śledzenie ID karty sieciowej (użyteczne przy laptopach)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging sieci"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Uruchamianie przy starcie"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "Klient 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 "Adres IP powinien być w formacie typu 192.168.1.1"
 
-#: 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 "Ostrzeżenie : Adres IP %s jest zazwyczaj zarezerwowany !"
 
-#: 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 jest już w użyciu\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Podaj parametry sieci bezprzewodowej dla tej karty:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Tryb operacyjny"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nazwa sieci (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "ID Sieci"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Częstotliwość operacyjna"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Próg czułości"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Stopa bitowa (w 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 "
@@ -10424,7 +10652,7 @@ msgstr ""
 "Częstotliwość powinna posiadać przyrostek k, M lub G (na przykład \"2.46G\" "
 "dla częstotliwości 2.46GHz, lub też dodaj wystarczającą ilość zer."
 
-#: 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 "
@@ -10433,12 +10661,12 @@ msgstr ""
 "Współczynnik powinien posiadać przyrostek k, M lub G (na przykład, \"11M\" "
 "oznaczający 11M), lub też wystarczy podać wystarczającą liczbę zer."
 
-#: 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 "
@@ -10459,39 +10687,39 @@ msgstr ""
 "pakietu wyłączającego schemat. Można ustawić ten parametr na wartość\n"
 "automatyczną, ustaloną lub wyłączyć go."
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentacja"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Dodatkowe argumenty dla polecenia iwconfig"
 
-#: 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 ""
 "Tutaj można skonfigurować kilka dodatkowych parametrów sieci bezprzewodowej\n"
 "takich jak:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (pseudonim jest już\n"
 "ustawiany jako nazwa komputera).\n"
 "\n"
-"Zobacz stronę podręcznikową man iwpconfig(8) aby uzyskać więcej informacji."
+"Zobacz stronę podręcznikową man iwconfig(8) aby uzyskać więcej informacji."
 
 #. -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 "Dodatkowe argumenty polecenia iwspy"
 
-#: 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"
@@ -10511,12 +10739,12 @@ msgstr ""
 "\n"
 "Zajrzyj na stronę manuala iwpspy(8) aby uzyskać więcej informacji."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Dodatkowe argumenty polecenia iwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10545,27 +10773,7 @@ msgstr ""
 "\n"
 "Zajrzyj na stronę manuala iwpriv(8) aby uzyskać więcej informacji."
 
-#: 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 ""
-"Nie wykryto w systemie karty sieciowej.\n"
-"Nie można skonfigurować tego typu połączenia."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Wybierz interfejs sieciowy"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "Wybierz kartę sieciową, którą ma być używana do łączenia z Internetem"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10578,88 +10786,93 @@ msgstr ""
 "np. \"mojkomputer.mojadomena.pl\". (bez używania polskich liter)\n"
 "Jeśli jest to konieczne, należy wpisać też adres routera."
 
-#: 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 "Na końcu, lecz nie mniej ważne jest wpisanie adresów IP serwera DNS."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nazwa komputera (opcjonalnie)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Nazwa komputera"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "Serwer DNS 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "Serwer DNS 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "Serwer DNS 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "Domena wyszukiwania"
 
-#: 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 ""
 "Domyślnie domena wyszukiwania zostanie ustawiona na podstawie pełnej nazwy "
 "komputera"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Brama (np. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Interfejs bramy (np. eth0)"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adres serwera DNS powinien być w formacie typu 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 "Adres IP bramy powinien być w formacie typu 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 ""
-"Podaj nazwę komputera zeroconf, z którego będą pobierane parametry dla "
-"komputerów pracujących w sieci:"
+"W razie potrzeby podaj nazwę komputera Zeroconf.\n"
+"To jest nazwa komputera używana do rozgłaszania\n"
+"dowolnego ze współdzielonych zasobów, które\n"
+"nie są zarządzane przez sieć. To nie jest konieczne\n"
+"w przypadku większości sieci."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Nazwa komputera zeroconf"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Nazwa komputera zeroconf nie może zawierać kropki."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10670,36 +10883,56 @@ msgstr ""
 "Wybierz ten, z którego chcesz korzystać.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Połączenie z Internetem"
 
-#: 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 "Konfiguracja została zakończona, czy chcesz zastosować ustawienia?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Czy chcesz łączyć się Internetem przy uruchamianiu komputera?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Automatycznie przy uruchamianiu"
+
+#: network/netconnect.pm:1260
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "By using Net Applet in the system tray"
+msgstr "Poprzez użycie apletu sieci w obszarze powiadamiania"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "Ręcznie (interfejs wciąż może być aktywowany przy uruchomieniu)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "W jaki sposób chcesz nawiązywać to połączenie?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "Sieć musi zostać ponownie uruchomiona. Czy chcesz ją ponownie uruchomić ?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Konfiguracja sieci"
 
-#: 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 ""
@@ -10707,27 +10940,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 "Czy chcesz teraz spróbować połączyć się Internetem?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Testowanie połączenia..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "System jest teraz połączony z Internetem."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Ze względów bezpieczeństwa połączenie zostanie teraz rozłączone."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10736,7 +10969,7 @@ msgstr ""
 "Wygląda na to, że system nie został połączony z Internetem.\n"
 "Spróbuj zmienić konfigurację połączenia."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10745,10 +10978,10 @@ msgstr ""
 "Po zakończeniu zalecane jest ponowne uruchomienie X w celu pominięcia "
 "problemów wynikających ze zmianą nazwy komputera."
 
-#: 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 ""
@@ -10756,7 +10989,7 @@ msgstr ""
 "Przetestuj połączenie za pomocą net_monitora lub mcc. Jeśli twoje połączenie "
 "nie działa, być może należy ponownie uruchomić konfigurację"
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10768,7 +11001,7 @@ msgstr ""
 "Wybierz OK by zachować konfigurację, lub Anuluj by ponownie skonfigurować "
 "sieć/połączenie z Internetem.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10777,27 +11010,27 @@ msgstr ""
 "Wystąpił nieoczekiwany błąd:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Konfiguracja pośredników (proxy)"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Pośrednik HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Pośrednik FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Nazwa pośrednika powinna być typu: http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL powinien zaczynać się od \"ftp:\" lub \"http:\""
@@ -10816,7 +11049,7 @@ msgstr ""
 "Ostrzeżenie! Została wykryta istniejąca konfiguracja zapory ogniowej. Może "
 "być konieczne dokonanie kilku ręcznych poprawek po instalacji. Kontynuować?"
 
-#: 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"
@@ -10833,12 +11066,12 @@ msgstr ""
 "\t\teth0 lub eth1 dla połączenia kablowego, \n"
 "\t\tippp+ dla połączenia isdn.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Włóż dyskietkę"
 
-#: 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 "
@@ -10847,22 +11080,22 @@ msgstr ""
 "Włóż sformatowaną (FAT) dyskietkę do stacji %s z %s w katalogu roota i "
 "naciśnij %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Błąd dostępu do dyskietki, nie można zamontować urządzenia %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "nieudane montowanie: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Na tej platformie nie istnieją partycje rozszerzone"
 
-#: 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"
@@ -10873,22 +11106,22 @@ msgstr ""
 "nie można wykorzystać. Jedynym rozwiązaniem jest przesunięcie\n"
 "partycji podstawowych, by puste miejsce było obok partycji rozszerzonych."
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Przywracanie z pliku %s nie powiodło się: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Uszkodzony plik archiwum"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Błąd zapisu do pliku %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10901,27 +11134,27 @@ msgstr ""
 "Oznacza to, że zapisanie czegokolwiek na dysku może się skończyć zapisem "
 "losowych, uszkodzonych danych."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "trzeba posiadać"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "ważny"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "bardzo fajny"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "fajny"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "taki sobie"
@@ -10936,7 +11169,7 @@ msgstr "(na %s)"
 msgid "(on this machine)"
 msgstr "(na tej maszynie)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Konfigurowane na innych komputerach"
@@ -10946,296 +11179,306 @@ msgstr "Konfigurowane na innych komputerach"
 msgid "On CUPS server \"%s\""
 msgstr "Na serwerze 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 " (Domyślne)"
 
-#: 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 (serwer zdalny)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Zdalny CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Nieznany model"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Drukarka lokalna"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Drukarka sieciowa"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Drukarka podłączona do zdalnego serwera CUPS"
 
-#: 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 "Drukarka podłączona do zdalnego serwera lpd"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Drukarka sieciowa (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Drukarka podłączona do serwera SMB/Windows 95/98/NT"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Drukarka na serwerze 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 "Podaj URI urządzenia drukarki"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Potok do polecenia"
 
-#: 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 "Nieznany model"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Konfigurowane na tym komputerze"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " na porcie równoległym #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", drukarka USB #%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", drukarka USB"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", wielofunkcyjne urządzenie podłączone do portu równoległego #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", wielofunkcyjne urządzenie podłączone do portu równoległego"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", wielofunkcyjne urządzenie podłączone do portu USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ",wielofunkcyjne urządzenie podłączone do HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", wielofunkcyjne urządzenie"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", drukowanie do %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " na serwerze LPD \"%s\", drukarka \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", komputer TCP/IP \"%s\", port %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " na serwerze SMB/Windows \"%s\", współudział \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " na serwerze Novellowym \"%s\", drukarka \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", używanie polecenia %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Port równoległy #%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 "Drukarka USB #%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "Drukarka USB"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Wielofunkcyjne urządzenie podłączone do portu równoległego #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Wielofunkcyjne urządzenie podłączone do portu równoległego"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Wielofunkcyjne urządzenie podłączone do portu USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Wielofunkcyjne urządzenie podłączone do HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Wielofunkcyjne urządzenie"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Drukowanie do %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Serwer LPD \"%s\", drukarka \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Komputer TCP/IP \"%s\", port %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Serwer SMB/Windows \"%s\", współudział \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Serwer Novell \"%s\", drukarka \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Używanie polecenia %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 "Surowa drukarka (raw) (Brak sterownika)"
 
-#: 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 "Sieć/sieci lokalne"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interfejs \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Sieć %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Komputer %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"
@@ -11249,12 +11492,12 @@ msgstr ""
 "skryptu automatycznego ładowania oraz ładowany podczas podłączania drukarki "
 "i jej uruchamiania.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Konfiguracja drukarki 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 "
@@ -11264,7 +11507,7 @@ msgstr ""
 "powinny być dostępne za pośrednictwem zdalnych komputerów i poprzez zdalne "
 "komputery."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11273,43 +11516,38 @@ msgstr ""
 "Można także zdecydować czy drukarki na komputerach zdalnych powinny zostać "
 "automatycznie dostępne dla tego komputera."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Drukarki na tej maszynie są dostępne dla innych komputerów"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "Automatyczne wyszukiwanie dostępnych drukarek lub maszyn zdalnych"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Współdzielenie drukarki dla komputerów/sieci: "
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Własna konfiguracja"
 
-#: 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 "Brak zdalnych komputerów"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Dodatkowe serwery CUPS: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Brak"
-
-#: 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 "
@@ -11330,20 +11568,20 @@ msgstr ""
 "lokalnej, należy podać w tym miejscu adres(y) IP oraz opcjonalnie numer(y) "
 "portu aby uzyskać z serwera (serwerów) informacje na temat drukarek."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Japoński tryb drukowania tekstu"
 
-#: 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 ""
 "Włączenie tej funkcji umożliwia wydruk zwykłych plików tekstowych w języku "
@@ -11355,12 +11593,12 @@ msgstr ""
 "drukować teksty w języku japońskim na drukarce skonfigurowanej na zdalnym "
 "komputerze, należy na nim aktywować tą funkcję."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Automatyczne poprawianie konfiguracji 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 "
@@ -11390,12 +11628,42 @@ msgstr ""
 "Jeśli niektóre z tych rzeczy są przyczyną problemów, można wyłączyć tą "
 "opcję, lecz wówczas użytkownik sam musi o nie zadbać."
 
-#: 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 "Zdalny serwer CUPS bez lokalnego demona CUPS"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "Włącz"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Wyłącz"
+
+#: 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 ""
+"W tym trybie lokalny demon CUPS zostanie zatrzymany i wszystkie żądania "
+"wydruku przejdą bezpośrednio do wybranego serwera. Zauważ, że nie jest "
+"możliwe wówczas zdefiniowanie kolejek wydruku lokalnego i jeśli wybrany "
+"serwer zostanie wyłączony nie będzie można w ogóle drukować z tej maszyny."
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Współdzielenie drukarek lokalnych"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11404,29 +11672,29 @@ msgstr ""
 "To są maszyny lub sieci, dla których powinny być dostępne lokalnie "
 "podłączone drukarki:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Dodawanie komputera/sieci"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Edycja wybranego komputera/sieci"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Usuwanie wybranego komputera/sieci"
 
-#: 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 "Adres IP komputera/sieci:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11434,32 +11702,32 @@ msgid ""
 msgstr ""
 "Wybierz sieć lub komputer, dla których powinny być dostępne drukarki lokalne:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Brak adresu IP komputera/sieci."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Wprowadzony adres IP komputera/sieci jest niepoprawny.\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 "Przykłady poprawnych adresów IP:\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 "Ten komputer/sieć już jest na liście, nie można go ponownie dodać.\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 "Uzyskiwanie dostępu do zdalnych serwerów CUPS"
 
-#: 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 "
@@ -11470,102 +11738,118 @@ msgstr ""
 "to tylko gdy serwery nie rozgłaszają informacji o swoich drukarkach w sieci "
 "lokalnej."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Dodawanie serwera"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Edycja wybranego serwera"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Usuwanie wybranego serwera"
 
-#: 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 "Podaj adres IP i port komputera, którego chcesz używać."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Jeśli nie podano żadnego portu, port 631 będzie portem domyślnym."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Brakuje adresu IP serwera!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Wprowadzony adres IP jest niepoprawny.\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 "Numer portu powinien być liczbą całkowitą!"
 
-#: 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 "Ten serwer już jest na liście, nie można go ponownie dodać.\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 "Włącz, Nazwa lub IP serwera zdalnego:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "Brak nazwy serwera CUPS lub adresu IP."
+
+#: 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 "Odczytywanie danych drukarki ..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "Ponowne uruchamianie CUPS..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Wybierz sposób podłączenia drukarki"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "W jaki sposób jest podłączona drukarka?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11577,7 +11861,7 @@ msgstr ""
 "konfiguracji w tym miejscu żadnych drukarek; zostaną one automatycznie\n"
 "wykryte."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11588,7 +11872,7 @@ msgstr ""
 "OSTRZEŻENIE: brak aktywnych połączeń sieciowych, nie można ani wykryć ani "
 "przetestować zdalnych drukarek."
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
@@ -11596,22 +11880,22 @@ msgstr ""
 "Automatyczne wykrywanie drukarki (drukarki lokalne, TCP/Gniazdo, SMB i URI "
 "urządzenia)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Sprawdzanie systemu..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "oraz jedna nieznana drukarka"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "oraz %d nieznanych drukarek(-ki)"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11624,7 +11908,7 @@ msgstr ""
 "%s%s\n"
 "są bezpośrednio podłączone do systemu"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11637,7 +11921,7 @@ msgstr ""
 "%s%s\n"
 "jest bezpośrednio podłączona do systemu"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11650,7 +11934,7 @@ msgstr ""
 "%s%s\n"
 "jest bezpośrednio podłączona do systemu"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11659,7 +11943,7 @@ msgstr ""
 "\n"
 "Znaleziono jedną nieznaną drukarkę bezpośrednio podłączoną do komputera"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11668,18 +11952,18 @@ msgstr ""
 "\n"
 "Znaleziono %d nieznane drukarki bezpośrednio podłączone do komputera"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Nie wykryto drukarek bezpośrednio podłączonych do komputera"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (Upewnij się że wszystkie drukarki są podłączone i włączone).\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 "
@@ -11688,22 +11972,22 @@ msgstr ""
 "Czy chcesz umożliwić drukowanie na powyższych drukarkach lub na drukarkach "
 "sieciowych?\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 "Czy chcesz umożliwić drukowanie na drukarkach sieciowych?\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 "Czy chcesz umożliwić drukowanie na powyższych drukarkach?\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 "Czy na pewno chcesz konfigurować system wydruku na tym komputerze?\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 "
@@ -11712,48 +11996,42 @@ msgstr ""
 "UWAGA: W zależności od modelu drukarki oraz systemu wydruku zostanie "
 "zainstalowane do %d MB dodatkowego oprogramowania."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Wyszukiwanie nowych drukarek..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "Konfigurowanie drukarki ..."
+msgid "Found printer on %s..."
+msgstr "Znaleziono drukarkę na %s..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Konfigurowanie drukarki \"%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 " na "
 
-#: 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 "Wybór modelu drukarki"
 
-#: 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 "Jaki model drukarki posiadasz?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11766,7 +12044,7 @@ msgstr ""
 "Program Printerdrake nie mógł określić modelu drukarki %s. Wybierz poprawny "
 "model z listy."
 
-#: 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 "
@@ -11775,21 +12053,24 @@ msgstr ""
 "Jeśli drukarka nie została wyświetlona, wybierz zgodną drukarkę (zajrzyj do "
 "podręcznika) lub drukarkę podobną."
 
-#: 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 "Konfigurowanie drukarki na %s..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Konfigurowanie aplikacji..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Konfigurowanie drukarki \"%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 "Dodaj nową drukarkę"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11812,7 +12093,7 @@ msgstr ""
 "udostępni ci wszystkie dostępne sterowniki drukarek, opcje sterowników oraz "
 "typy połączeń drukarek."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11854,7 +12135,7 @@ msgstr ""
 "Kliknij przycisk \"Dalej\" w przypadku gotowości lub \"Anuluj\" jeśli nie "
 "chcesz ustawiać teraz drukarki (drukarek)."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11881,7 +12162,7 @@ msgstr ""
 "Kliknij przycisk \"Dalej\" w przypadku gotowości lub \"Anuluj\" jeśli nie "
 "chcesz ustawiać teraz drukarki (drukarek)."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -11920,7 +12201,7 @@ msgstr ""
 "Kliknij przycisk \"Dalej\" w przypadku gotowości lub \"Anuluj\" jeśli nie "
 "chcesz ustawiać teraz drukarki (drukarek)."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -11947,22 +12228,22 @@ msgstr ""
 "Kliknij przycisk \"Dalej\" w przypadku gotowości lub \"Anuluj\" jeśli nie "
 "chcesz ustawiać teraz drukarki (drukarek)."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Automatycznie wykryj drukarki podłączone do komputera"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Automatycznie wykryj drukarki bezpośrednio podłączone do sieci"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Automatycznie wykryj drukarki podłączone do komputerów z MS Windows"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -11985,70 +12266,70 @@ msgstr ""
 "zmienić domyślną opcję ustawień (podajnik papieru, jakość wydruku,...), "
 "wybierz \"Drukarka\" w sekcji \"%s\" Centrum Sterowania Mandrake."
 
-#: 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 "Nie można zainstalować pakietów %s!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Pomijanie automatycznego wykrywania serwera 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 "Automatyczne wykrywanie drukarki"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Wykrywanie urządzeń..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", drukarka sieciowa \"%s\", port %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", drukarka \"%s\" na serwerze SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Wykryto %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 "Drukarka podłączona do portu równoległego #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Drukarka sieciowa \"%s\", port %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Drukarka \"%s\" na serwerze SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Drukarka lokalna"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12061,32 +12342,32 @@ msgstr ""
 "dev/lp1, ..., określa porty LPT1:, LPT2:, ..., 1-sza drukarka USB: /dev/usb/"
 "lp0, 2-ga drukarka USB: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Należy podać nazwę urządzenia lub pliku!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Nie znaleziono drukarki!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Drukarki lokalne"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Dostępne drukarki"
 
-#: 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 "Następujące drukarki zostały automatycznie wykryte. "
 
-#: 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 "
@@ -12095,19 +12376,19 @@ msgstr ""
 "Jeśli urządzenie nie jest tym, które chcesz skonfigurować, podaj nazwę "
 "urządzenia/pliku w wierszu wejściowym"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 "Inną możliwością, jest wybranie nazwy urządzenia/pliku w wierszu wejściowym"
 
-#: 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 "To jest lista wszystkich automatycznie wykrytych drukarek. "
 
-#: 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 "
@@ -12116,7 +12397,7 @@ msgstr ""
 "Wybierz drukarkę, którą chcesz skonfigurować lub podaj nazwę urządzenia/"
 "pliku w wierszu wejściowym"
 
-#: 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 "
@@ -12125,7 +12406,7 @@ msgstr ""
 "Wybierz drukarkę, na której ma zostać wykonany wydruk lub podaj nazwę "
 "urządzenia/pliku w wierszu wejściowym"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12136,12 +12417,12 @@ msgstr ""
 "nie została poprawnie wykryta lub też wolisz ustawić własną konfigurację "
 "drukarki, wybierz opcję \"Ręczna konfiguracja\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Brak aktualnie alternatywnych możliwości"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12154,12 +12435,12 @@ msgstr ""
 "wykryta lub też wolisz skonfigurować ją ręcznie wybierz opcję \"Ręczna "
 "konfiguracja\"."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Wybierz drukarkę, na której ma być wykonany wydruk."
 
-#: 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 "
@@ -12168,12 +12449,12 @@ msgstr ""
 "Wybierz port, do którego jest podłączona drukarka lub wprowadź nazwę "
 "urządzenia/nazwę pliku"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Wybierz port do którego podłączona jest drukarka."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12183,26 +12464,26 @@ msgstr ""
 "LPT2:, ..., 1-sza drukarka USB: /dev/usb/lp0, 2-ga drukarka USB: /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Należy wybrać/podać drukarkę/urządzenie!"
 
-#: 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 "Przerwanie"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Opcje drukarki sieciowej lpd"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12211,63 +12492,63 @@ msgstr ""
 "By używać drukarki sieciowej lpd należy podać nazwę serwera wydruku oraz "
 "nazwę drukarki na tym serwerze."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Nazwa zdalnego komputera"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Nazwa zdalnej drukarki"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Nie podano nazwy zdalnego komputera!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Nie podano nazwy zdalnej drukarki!"
 
-#: 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 "Informacje"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Wykryty model: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Skanowanie sieci..."
 
-#: 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 ", drukarka \"%s\", na serwerze \"%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 "Drukarka \"%s\" na serwerze \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opcje drukarki 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 "
@@ -12280,7 +12561,7 @@ msgstr ""
 "adres IP serwera wydruku, nazwę użytkownika, grupę, hasło oraz\n"
 "oczywiście nazwę drukarki."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12290,47 +12571,47 @@ msgstr ""
 "dodać z listy a następnie dodać nazwę użytkownika, hasło i/lub grupę "
 "roboczą, jeśli te informacje są wymagane."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Nazwa serwera SMB"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "IP serwera SMB"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Nazwa drukarki"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Grupa robocza"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Wykryto automatycznie"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Należy podać nazwę serwera lub jego adres IP!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Brakuje nazwy udziału Samby!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "OSTRZEŻENIE DOTYCZĄCE BEZPIECZEŃSTWA!"
 
-#: 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 "
@@ -12372,7 +12653,7 @@ msgstr ""
 "wówczas ustawić drukowanie z tej maszyny przy użyciu połączenia typu \"%s\" "
 "w Printerdrake.\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 "
@@ -12384,7 +12665,7 @@ msgstr ""
 "IPP oraz ustawić drukowanie z tego komputera za pomocą połączenia typu \"%s"
 "\" w Printerdrake.\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) "
@@ -12397,12 +12678,12 @@ msgstr ""
 "\n"
 "Chcesz kontynuować ustawianie tej drukarki tak jak to teraz robisz?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Opcje drukarki 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 "
@@ -12414,42 +12695,42 @@ msgstr ""
 "(nie zawsze to samo co nazwa TCP/IP!), nazwę kolejki drukarki, do której "
 "chcesz uzyskać dostęp, oraz właściwą nazwę użytkownika i hasło."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Serwer wydruku"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nazwa kolejki drukarki"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Brakuje nazwy serwera NCP!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Brakuje nazwy kolejki 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 ", komputer \"%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 "Komputer \"%s\", port %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Opcje drukarki TCP/Gniazdo"
 
-#: 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 "
@@ -12459,7 +12740,7 @@ msgstr ""
 "komputera lub adres IP i opcjonalnie numer portu (domyślnie 9100) do "
 "odpowiednich pól."
 
-#: 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 "
@@ -12472,27 +12753,27 @@ msgstr ""
 "serwerów HP JetDirect numerem portu jest najczęściej 9100, w przypadku "
 "innych serwerów numery portów mogą się różnić. Zajrzyj do instrukcji sprzętu."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Brak nazwy komputera lub adresu IP!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nazwa lub adres IP komputera z drukarką"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Odświeżanie listy URI urządzeń..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Adres URI urządzenia wydruku"
 
-#: 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 "
@@ -12503,17 +12784,17 @@ msgstr ""
 "specyfikację CUPS albo Foomatic. Należy zauważyć, że nie wszystkie typy "
 "adresów URI są obsługiwane przez kolejki."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Należy podać poprawny URI!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Potok do polecenia"
 
-#: 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 "
@@ -12522,17 +12803,17 @@ msgstr ""
 "W tym miejscu można określić odpowiedni wiersz poleceń, do którego zadanie "
 "powinno zostać przekierowane zamiast przesyłania go bezpośrednio do drukarki."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Wiersz poleceń"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Należy podać wiersz polecenia!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12543,74 +12824,74 @@ msgstr ""
 "(OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 ze skanerem, DeskJet 450, "
 "Sony IJP-V100), HP PhotoSmart lub też HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Instalowanie pakietu HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Na %s będzie możliwe tylko drukowanie."
 
-#: 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 "Sprawdzanie urządzenia i konfigurowanie HPOJ..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Instalowanie pakietów SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Skanowanie na %s nie będzie możliwe."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Instalowanie pakietów mtools..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "Dostęp do karty pamięci na %s nie będzie możliwy."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Wyszukiwanie wielofunkcyjnego urządzenia HP"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Dostęp do karty pamięci urządzenia wielofunkcyjnego HP"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Udostępnianie portu drukarki dla systemu CUPS..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Odczytywanie bazy danych drukarek ..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Podaj nazwę drukarki i komentarze"
 
-#: 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 ""
 "Nazwa drukarki powinna zawierać tylko litery, cyfry i znak podkreślenia"
 
-#: 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"
@@ -12619,7 +12900,7 @@ msgstr ""
 "Drukarka \"%s\" już istnieje,\n"
 "czy chcesz nadpisać jej konfigurację?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12628,35 +12909,35 @@ msgstr ""
 "Każda drukarka musi mieć nazwę (na przykład \"drukarka\"). Pola Opis i "
 "Lokalizacja nie muszą być wypełniane. Są to komentarze dla użytkowników."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Nazwa drukarki"
 
-#: 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 "Opis"
 
-#: 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 "Lokalizacja"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Przygotowywanie bazy danych drukarek ..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Twój model drukarki"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12681,18 +12962,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Model jest poprawny"
 
-#: 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 "Wybierz model ręcznie"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12707,12 +12988,12 @@ msgstr ""
 "poprawny model na liście gdy podświetlony jest niepoprawna wartość lub "
 "\"Surowa drukarka\"."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Zainstaluj plik PPD dostarczony przez producenta"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12721,7 +13002,7 @@ msgstr ""
 "Każda drukarka PostScript jest dostarczana z plikiem PPD opisującym opcje i "
 "funkcje drukarki."
 
-#: 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 "
@@ -12730,12 +13011,12 @@ msgstr ""
 "Ten plik jest zazwyczaj gdzieś na płycie CD ze sterownikami Windows i Mac "
 "dostarczonej z drukarką."
 
-#: 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 "Można znaleźć pliki PPD także na witrynach internetowych producentów."
 
-#: 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 "
@@ -12744,7 +13025,7 @@ msgstr ""
 "Jeśli zainstalowano system Windows na tym komputerze, można znaleźć plik PPD "
 "także na partycji 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 "
@@ -12754,7 +13035,7 @@ msgstr ""
 "Instalowanie pliku PPD drukarki i użycie go podczas ustawiania drukarki "
 "udostępnia wszystkie fizycznie dostępne opcje drukarki"
 
-#: 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 "
@@ -12763,58 +13044,51 @@ msgstr ""
 "Tutaj można wybrać plik PPD do zainstalowania na komputerze, następnie "
 "będzie on używany do konfiguracji drukarki."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Zainstaluj plik PPD z"
 
-#: 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 "Dyskietka"
 
-#: 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 "Inne miejsce"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Wybierz plik PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "Plik PPD %s nie istnieje lub nie można go odczytać!"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "Plik PPD %s nie spełnia specyfikacji PPD!"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Instalowanie pliku PPD..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Konfiguracja windrukarki OKI"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12833,12 +13107,12 @@ msgstr ""
 "przypadku drukarka nie będzie działała. Ustawienia typu połączenia zostaną "
 "zignorowane przez sterownik."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Konfiguracja drukarki Lexmark inkjet"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12851,7 +13125,7 @@ msgstr ""
 "drukujących. Należy podłączyć drukarkę do portu lokalnego lub skonfigurować "
 "ją na komputerze do którego jest ona podłączona."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12873,12 +13147,12 @@ msgstr ""
 "licencyjnej. Następnie wydrukuj strony dopasowujące głowice za pomocą opcji "
 "\"lexmarkmaintain\" oraz dopasuj ustawienia głowic za pomocą tego programu."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Konfiguracja drukarki Lexmark X125"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -12891,12 +13165,36 @@ msgstr ""
 "swoją drukarkę do lokalnego portu USB lub skonfiguruj ją na komputerze do "
 "którego jest ona podłączona."
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Konfiguracja Samsung ML/QL-85G"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"Sterownik dla tej drukarki wspiera tylko drukarki lokalnie podłączone do "
+"portu równoległego nie wspiera drukarek na maszynach zdalnych i serwerach "
+"wydruku lub podłączone do innych portów równoległych. Podłącz swoją drukarkę "
+"do lokalnego portu równoległego lub skonfiguruj ją na komputerze do którego "
+"jest ona podłączona."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Konfiguracja Canon LBP-460/660"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Firmware-Upload dla HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12914,27 +13212,27 @@ msgstr ""
 "poprawnie. Uwaga: dla bardzo dużych obszarów drukowania lub wysokiej jakości/"
 "rozdzielczości, drukowanie może być bardzo wolne."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Domyślne ustawienia drukarki"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Opcja %s musi być liczbą całkowitą!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Opcja %s musi być liczbą!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Opcja %s poza zakresem!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12943,12 +13241,12 @@ msgstr ""
 "Czy chcesz ustawić tę drukarkę (\"%s\"\n"
 "jako drukarkę domyślną?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Strony testowe"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12961,57 +13259,57 @@ msgstr ""
 "drukarek laserowych z małą ilością pamięci może nawet się nie powieść. W "
 "większości przypadków wystarcza wydruk zwykłej strony testowej."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Brak stron testowych"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Standardowa strona testowa"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Alternatywna Strona testowa (Letter)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Alternatywna strona testowa (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Strona testowa foto"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Nie drukuj strony testowej"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Drukowanie stron/y testowych/ej..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Nie można zainstalować pakietu %s!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Pominięcie strony testowej zdjęcia."
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13026,7 +13324,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13035,17 +13333,17 @@ msgstr ""
 "Strona testowa została wysłana do drukarki.\n"
 "Może chwilę potrwać, zanim pojawi się wydruk\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Czy wydruk jest prawidłowy?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Drukarka surowa (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 "
@@ -13058,7 +13356,7 @@ msgstr ""
 "\" lub \"kprinter <plik>\". Narzędzia graficzne umożliwiają wybór drukarki "
 "oraz na łatwą zmianę ustawień.\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 "
@@ -13069,8 +13367,8 @@ msgstr ""
 "wielu aplikacji, lecz nie należy podawać nazwy pliku ponieważ plik do "
 "drukowania jest dostarczany przez aplikację.\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"
@@ -13083,7 +13381,7 @@ msgstr ""
 "zadania drukowania. Dodaj po prostu żądaną opcję w wierszu poleceń, np. \"%s "
 "<plik>\"."
 
-#: 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 "
@@ -13095,7 +13393,7 @@ msgstr ""
 "opcji\".%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"
@@ -13104,7 +13402,7 @@ msgstr ""
 "To jest lista dostępnych opcji drukowania dla bieżącej drukarki:\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 "
@@ -13113,8 +13411,8 @@ msgstr ""
 "Aby wydrukować plik z wiersza poleceń (okno terminala) użyj polecenia \"%s "
 "<plik>\"\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 "
@@ -13125,7 +13423,7 @@ msgstr ""
 "wielu aplikacji. Nie należy w tym miejscu wprowadzać nazwy pliku ponieważ "
 "plik do wydruku jest dostarczany przez aplikację.\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 "
@@ -13134,7 +13432,7 @@ msgstr ""
 "Aby pobrać listę opcji dostępnych dla bieżącej drukarki kliknij przycisk "
 "\"Wydrukuj listę opcji\"."
 
-#: 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 "
@@ -13143,7 +13441,7 @@ msgstr ""
 "Aby wydrukować plik z wiersza poleceń (okno terminala) użyj polecenia \"%s "
 "<plik>\" lub \"%s <plik>\"\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13161,7 +13459,7 @@ msgstr ""
 "po kliknięciu jej. Jest to użyteczne na przykład w przypadku zatorów "
 "papieru.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13174,42 +13472,32 @@ msgstr ""
 "określonego zadania drukowania. Po prostu należy dodać odpowiedni wpis w "
 "wierszu poleceń, np. \"%s <plik>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Drukowanie/Skanowanie/Karty foto na \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Drukowanie/Skanowanie na \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Drukowanie/Dostęp do kart foto na \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Drukowanie na drukarce \"%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 "Zamknij"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Wydrukuj opcje drukarki"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13220,19 +13508,22 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
-"Urządzenie wielofunkcyjne HP zostało skonfigurowane automatycznie aby "
-"posiadać możliwość skanowania. Teraz można skanować za pomocą programu "
-"\"scanimage\" (\"scanimage -d hp:%s\" aby wybrać skaner jeśli jest więcej "
-"niż jeden) z wiersza poleceń lub za pomocą graficznych interfejsów "
-"\"xscanimage\" lub \"xsane\". Jeśli używany jest także GIMP, można także "
-"skanować po wyborze opcji \"Plik/Pobierz\" z menu. Aby uzyskać więcej "
-"informacji można wywołać polecenie \"man scanimage\".\n"
+"Urządzenie wielofunkcyjne zostało skonfigurowane automatycznie aby posiadać "
+"możliwość skanowania. Teraz można skanować za pomocą programu \"scanimage"
+"\" (\"scanimage -d hp:%s\" aby wybrać skaner jeśli jest więcej niż jeden) z "
+"wiersza poleceń lub za pomocą graficznych interfejsów \"xscanimage\" lub "
+"\"xsane\". Jeśli używany jest także GIMP, można także skanować po wyborze "
+"opcji \"Plik/Pobierz\" z menu. Aby uzyskać więcej informacji można wywołać "
+"polecenie \"man scanimage\" z wiersza poleceń.\n"
 "\n"
-"Nie należy używać programu \"scannerdrake\" dla tego urządzenia!"
+"Nie należy używać programu \"scannerdrake\" dla tego urządzenia. Można go "
+"używać tylko w przypadku chęci współdzielenia skanera w sieci."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13256,18 +13547,13 @@ msgstr ""
 "\"MtoolsFM\" można przełączać się między literami napędów w polu "
 "wyświetlanym w prawym górnym rogu listy plików."
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Odczytywanie danych drukarki ..."
-
-#: 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 "Prześlij konfigurację drukarki"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13282,7 +13568,7 @@ msgstr ""
 "lecz zadania nie zostaną przesłane.\n"
 "Nie wszystkie kolejki mogą być przesyłane z poniższych powodów:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13291,7 +13577,7 @@ msgstr ""
 "CUPS nie obsługuje drukarek na serwerach Novell lub drukarek wysyłających "
 "dane do polecenia typu \"free-formed\".\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13300,12 +13586,12 @@ msgstr ""
 "PDQ obsługuje tylko drukarki lokalne, zdalne drukarki LPD i drukarki Gniazdo/"
 "TCP.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD oraz LPRng nie obsługują drukarek IPP.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13314,7 +13600,7 @@ msgstr ""
 "Dodatkowo, kolejki nie utworzone za pomocą tego programu lub \"foomatic-"
 "configure\" nie mogą zostać przesłane."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13325,7 +13611,7 @@ msgstr ""
 "Także drukarki skonfigurowane z plikami PPD dostarczone przez ich "
 "producentów lub z natywnymi sterownikami CUPS nie mogą zostać przesłane."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13336,17 +13622,17 @@ msgstr ""
 "Zaznacz drukarki, które chcesz przesłać i kliknij\n"
 "\"Prześlij\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Nie przesyłaj drukarek"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Prześlij"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13357,17 +13643,17 @@ msgstr ""
 "Kliknij \"Prześlij\" aby ją nadpisać.\n"
 "Należy także określić nową nazwę lub pominąć tą drukarkę."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Nowa nazwa drukarki"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "Przesyłanie %s..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13376,28 +13662,28 @@ msgstr ""
 "Została przesłana domyślna drukarka (\"%s\"), czy ma być ona także domyślną "
 "drukarką dla nowego systemu wydruku %s?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Odświeżanie danych drukarki..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Uruchamianie sieci..."
 
-#: 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 "Skonfiguruj teraz sieć"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Opcje sieciowe nie zostały skonfigurowane"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13410,12 +13696,12 @@ msgstr ""
 "skonfigurowana. Bez skonfigurowanej sieci nie można użyć drukarki zdalnej. "
 "Jak chcesz kontynuować?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Kontynuuj bez konfiguracji sieci"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13430,7 +13716,7 @@ msgstr ""
 "Internet\"/\"Połączenie\", a następnie ustaw drukarkę z sekcji \"Sprzęt\"/"
 "\"Drukarka\", także używając Centrum Sterowania %s."
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13440,27 +13726,27 @@ msgstr ""
 "Dostęp do sieci nie działa lub nie został uruchomiony. Sprawdź konfigurację "
 "swojego sprzętu. Następnie spróbuj skonfigurować ponownie drukarkę zdalną."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Ponowne uruchamianie systemu wydruku..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "Wysoki"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "Paranoidalny"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Instalowanie systemu wydruku na poziomie bezpieczeństwa %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 %"
@@ -13485,12 +13771,12 @@ msgstr ""
 "\n"
 "Chcesz skonfigurować drukowanie na tym komputerze?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Uruchamianie systemu wydruku przy uruchamianiu komputera"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13512,67 +13798,171 @@ msgstr ""
 "\n"
 "Czy chcesz włączyć ponownie automatyczne uruchamianie systemu wydruku?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Sprawdzanie zainstalowanego oprogramowania"
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Usuwanie %s ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Nie można usunąć systemu wydruku %s!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "Instalowanie %s ..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "Nie można zainstalować systemu wydruku %s!"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"W tym trybie brak jest lokalnego systemu wydruku, wszystkie żądania wydruku "
+"idą bezpośrednio do wybranego serwera. Zauważ, że nie jest możliwe "
+"zdefiniowanie lokalnych kolejek wydruku i jeśli wybrany serwer zostanie "
+"wyłączony, nie będzie można wcale drukować z tego komputera."
+
+#: 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 ""
+"Wprowadź nazwę komputera lub IP serwera CUPS i kliknij OK jeśli chcesz użyć "
+"tego trybu. W innym przypadku kliknij \"Zakończ\"."
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Nazwa lub adres IP serwera zdalnego:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Ustawianie drukarki domyślnej..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Lokalny system wydruku CUPS czy zdalny serwer CUPS?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "System wydruku CUPS może być używany na dwa sposoby: "
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. System wydruku CUPS pracujący lokalnie."
+
+#: 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 ""
+"Wówczas lokalnie podłączone drukarki mogą być używane zaś drukarki zdalne na "
+"innych serwerach wydruku CUPS w tej samej sieci zostaną automatycznie "
+"wykryte."
+
+#: 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 ""
+"Niedogodnością tego podejścia jest to, że potrzeba więcej zasobów na "
+"komputerze lokalnym: dodatkowe pakiety oprogramowania będą musiały zostać "
+"zainstalowane, demon CUPS będzie musiał zostać uruchomiony w tle oraz zajęte "
+"zostanie trochę pamięcie. Także port IPP (631) zostanie otwarty."
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+"2. Wszystkie żądania wydruku natychmiast zostaną przesłane do serwera CUPS."
+
+#: 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 ""
+"Tutaj zajętość lokalnych zasobów jest zredukowana do minimum. Żaden demon "
+"CUPS nie jest uruchamiany, żaden port otwierany, żadna infrastruktura "
+"informatyczna do konfiguracji lokalnych kolejek wydruku nie jest "
+"instalowana. Także potrzeba mniej pamięci i przestrzeni dyskowej."
+
+#: 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 ""
+"Niedogodnością jest to, że nie będzie możliwe zdefiniowanie lokalnych "
+"drukarek oraz w przypadku zatrzymania serwera zdalnego nie będzie można "
+"drukować z tego komputera."
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "W jaki sposób CUPS będzie konfigurowany na tej maszynie?"
+
+#: 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 "Serwer zdalny, określ tutaj nazwę lub IP:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Lokalny system wydruku CUPS"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Wybierz system wydruku"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Jakiego systemu wydruku zamierzasz używać?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Konfigurowanie drukarki \"%s\" zakończone niepowodzeniem!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Instalowanie Foomatica..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "Nie można zainstalować pakietów %s, nie można uruchomić %s!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Nie można zainstalować wymaganych pakietów, nie można uruchomić %s!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13583,188 +13973,159 @@ msgstr ""
 "zmienić jej ustawienia; uczynić drukarką domyślną; lub też zobaczyć "
 "informacje o niej."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Wyświetl wszystkie dostępne zdalne drukarki CUPS"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "Odśwież listę drukarek (aby wyświetlić dostępne zdalne drukarki CUPS)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "Konfiguracja CUPS"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Zmień system drukowania"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Tryb zwykły"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Tryb zaawansowany"
 
-#: 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 "Opcje drukarki"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Zmień konfigurację drukarki"
 
-#: 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 ""
-"Drukarka %s\n"
+"Drukarka %s%s\n"
 "Jakie parametry chcesz zmodyfikować dla tej drukarki?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Ta drukarka jest wyłączona"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Zrób to!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Typ połączenia drukarki"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Nazwa drukarki, opis, lokalizacja"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Producent drukarki, model, sterownik"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Producent drukarki, 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 "Ustaw tą drukarkę jako domyślną"
 
-#: 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 "Dodaj tą drukarkę do Star Office/OpenOffice.org/GIMP"
+msgid "Enable Printer"
+msgstr "Włącz drukarkę"
 
-#: 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 "Usuń tą drukarkę ze Star Office/OpenOffice.org/GIMP"
+msgid "Disable Printer"
+msgstr "Wyłącz drukarkę"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Wydrukuj strony testowe"
 
-#: 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 "Dowiedz się jak używać tą drukarkę"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Usuń drukarkę"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Usuwanie starej drukarki \"%s\"..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Dodawanie drukarki do Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Drukarka \"%s\" została pomyślnie dodana do Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "Nie można dodać drukarki \"%s\" do Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Usuwanie drukarki ze Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"Drukarka \"%s\" została pomyślnie usunięta ze Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now enabled."
+msgstr "Drukarka \"%s\" jest teraz włączona."
 
-#: printer/printerdrake.pm:4499
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "Nie można usunąć drukarki \"%s\" ze Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now disabled."
+msgstr "Drukarka \"%s\" jest teraz wyłączona."
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Czy naprawdę chcesz usunąć drukarkę \"%s\"?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Usuwanie drukarki \"%s\"..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Drukarka domyślna"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Drukarka \"%s\" jest od teraz ustawiona jako domyślna drukarka."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Nie można dodać partycji do sformatowanego RAID md%d"
-
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid padł (może brak raidtools)?"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "Nie można dodać partycji do _sformatowanego_ RAID-a %s"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid padł"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Za mało partycji dla RAID poziom %d\n"
@@ -13789,16 +14150,16 @@ msgstr "Nie można skopiować pliku firmware %s do /usr/share/sane/firmware!"
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Nie można ustawić uprawnień pliku 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 ""
@@ -13830,7 +14191,8 @@ msgstr " Akceptuj/odrzucaj pakiety echo icmp."
 msgid "Allow/Forbid autologin."
 msgstr "Zezwolenie/zabronienie korzystania z mechanizmu autologin."
 
-#: 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"
@@ -13846,23 +14208,23 @@ msgstr ""
 "\n"
 "W przeciwnym przypadku dozwolony jest tylko /etc/issue."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr ""
 "Zezwól/zabroń ponownego uruchamiania komputera przez użytkowników konsoli."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Zezwalanie/zabronienie zdalnego logowania użytkownika root."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Zezwalanie/zabranianie bezpośredniego logowania użytkownika 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 "
@@ -13871,7 +14233,20 @@ msgstr ""
 "Zezwól/zabro wywietlania listy uytkownikw w menederach wywietlania (kdm lub "
 "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 ""
+"Zezwala/zabrania eksportu ekranu podczas\n"
+"przechodzenia z konta root na innego użytkownika.\n"
+"\n"
+"Zobacz pam_xauth(8) aby uzyskać więcej szczegółów."
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13890,7 +14265,7 @@ msgstr ""
 "\n"
 "- NONE (brak połączeń)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -13899,7 +14274,8 @@ msgstr ""
 "Argument określa czy klienci są autoryzowani do łączenia\n"
 "się z serwerem X na porcie tcp 6000 czy nie."
 
-#: 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"
@@ -13926,7 +14302,7 @@ msgstr ""
 "Aby zautoryzować potrzebne usługi, wykorzystaj plik /etc/hosts.allow\n"
 "(zajrzyj do manuala hosts.allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13947,7 +14323,7 @@ msgstr ""
 "decydowaniu czy dodać usługę jeśli jest obecna w pliku podczas instalacji\n"
 "pakietów."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -13960,44 +14336,49 @@ msgstr ""
 "Umieść użytkowników, którzy mogą korzystać z tych mechanizmów\n"
 "w /etc/cron.allow i /etc/at.allow (zajrzyj do manuala at(1) i crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 "Włączenie/wyłączenie przesyłania informacji dziennika systemu do konsoli 12"
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 "Włącz wyłącz ochronę przed spoofingiem rozdzielczości nazw.\n"
-"Jeśli \"alert\" ma wartość prawda, także zgłaszaj\n"
+"Jeśli \"%s\" ma wartość prawda, także zgłaszaj\n"
 "takie przypadki do dziennika systemowego."
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Alarmy bezpieczeństwa:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Włączenie/wyłączenie ochrony przed spoofingiem IP."
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "Włączenie/wyłączenie funkcji określającej czy libsafe jest w systemie."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Włączenie/wyłączenie funkcji monitorowania dziwnych pakietów IPv4"
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 "Włączenie/wyłączenie cogodzinne procesów sprawdzania zabezpieczeń msec."
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
@@ -14005,46 +14386,46 @@ msgstr ""
 " Włączenie mechanizmu su tylko dla członków grupy wheel lub zezwolenie na "
 "wykonywanie su wszystkim użytkownikom."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Wykorzystanie hasła do uwierzytelniania użytkowników"
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr "Uaktywnij/wyłącz sprawdzanie \"gadatliwości\" karty sieciowej."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Uaktywnij/wyłącz codzienne procesy sprawdzania zabezpieczeń."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 " Włącz/wyłącz funkcję sulogin(8) przy pojedynczym poziomie użytkownika."
 
-#: 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 "Dodaj nazwę jako wyjątek przy obsłudze wieku hasła przez program msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Ustaw wiek hasła na \"max\" dni oraz opóźnienie w zmianie na \"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 "Ustaw rozmiar historii haseł aby zabezpieczyć przed ponownym użyciem tego "
 "samego hasła."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14053,20 +14434,20 @@ msgstr ""
 "Ustaw minimalną długość hasła lub minimalną liczbę cyfr oraz minimalną "
 "liczbę liter pisanych wielką literą."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Ustaw maskę umask roota."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "jeśli ustawiono na tak, sprawdź otwarte porty."
 
-#: 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"
@@ -14082,118 +14463,118 @@ msgstr ""
 "\n"
 "- użytkowników z identyfikatorem 0 innych niż 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 ""
 "jeśli ustawiono na tak, sprawdza uprawnienia plików w katalogach "
 "użytkowników."
 
-#: 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 "jeśli ustawiono na tak, sprawdza urządzenia sieciowe w tryb gadatliwy."
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr ""
 "jeśli ustawiono na tak, uruchamia codzienne procesy sprawdzające "
 "bezpieczeństwo systemu."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "jeśli ustawiono na tak, sprawdź dodatki/usunięcia plików sgid."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "jeśli ustawiono na tak, sprawdza puste hasła w pliku /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 "jeśli ustawiono na tak, sprawdza sumę kontrolną plików 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 ""
 "jeśli ustawiono na tak, sprawdza dodatki/usunięcia plików administratora z "
 "bitem suid."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "jeśli ustawiono na tak, zgłasza pliki bez właściciela."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 "jeśli ustawiono na tak, sprawdza czy pliki/katalogi mogą być zapisywalne "
 "przez każdego."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "jeśli ustawiono na tak, uruchamia funkcje sprawdzające 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."
 msgstr ""
 "jeśli ustawiono, wysyła raport pocztowy na ten adres lub do administratora."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "jeśli ustawiono na tak, przesyła wyniki sprawdzenia pocztą."
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "Nie przesyłaj poczty jeśli nie ma czego raportować"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 "jeśli ustawiono na tak, uruchamia kilka funkcji sprawdzających bazę danych "
 "rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 "jeśli ustawiono na tak, przesyła wyniki sprawdzenia do dziennika systemowego."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "jeśli ustawiono na tak, przesyła wyniki sprawdzania do konsoli tty."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Ustaw wielkość historii poleceń powłoki. Wartość -1 oznacza brak "
 "ograniczenia."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 "Ustaw czas wygaśnięcia powłoki. Wartość zero oznacza brak czasu wygasania."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "Jednostką limitu czasowego jest sekunda"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Ustaw maskę umask użytkownika."
@@ -14240,212 +14621,218 @@ msgstr "Lista użytkowników w menedżerach wyświetlania (kdm i gdm)"
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+"Eksportowanie ekranu podczas przechodzenia z roota na innego użytkownika"
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Możliwe połączenia X Window"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autoryzacja połączeń TCP X Window"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autoryzowanie wszystkich usług kontrolowanych przez tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig pomija zasady msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Włączony \"crontab\" i \"at\" dla użytkowników"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Dziennik systemu przesyła informacje do konsoli 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr "Ochrona przed spoofingiem wyszukiwania nazw"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Ochronę przed spoofingiem IP"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Funkcję określająca czy libsafe jest obecne w systemie"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Funkcja monitorowania dziwnych pakietów IPv4"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Cogodzinne procesy sprawdzania zabezpieczeń msec"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 "Mechanizm su tylko dla członków grupy wheel lub dla wszystkich użytkowników"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Wykorzystanie hasła do uwierzytelniania użytkowników"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Sprawdzanie statystyk odbierania przez karty sieciowe"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Dzienne sprawdzenie bezpieczeństwa"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8) na poziomie pojedynczego użytkownika"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Bez określania wieku hasła dla"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr "Ustaw termin ważności hasła oraz opóźnienie deaktywacji konta"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Rozmiar historii hasła"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr "Minimalna długość hasła i liczba cyfr oraz wielkich liter"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Maska roota"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Rozmiar historii powłoki"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Opóźnienie powłoki"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Maska użytkownika"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Sprawdź otwarte porty"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Sprawdzanie niezabezpieczonych kont"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Sprawdzanie uprawnień plików w katalogach użytkowników"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Sprawdzanie trybu odbierania urządzeń sieciowych"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Uruchamianie codziennych procesów sprawdzających bezpieczeństwo"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Sprawdzanie dodatków/usunięć plików sgid"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Sprawdzanie pustych haseł w pliku /etc/shadow"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Sprawdzanie sumy kontrolnej plików suid/sgid"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Sprawdzanie dodatków/usunięć plików administratora z bitem suid"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Zgłaszanie plików bez właściciela"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Sprawdzanie plików/katalogów dostępnych dla każdego do zapisu"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Uruchamianie funkcji sprawdzających chkrootkit"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "Bez przesyłania maili bez potrzeby"
 
-#: 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 ""
 "Jeśli ustawiono, wysyła raport pocztowy na ten adres lub do administratora."
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Przesyłanie wyników sprawdzania pocztą"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Uruchamianie kilku funkcji sprawdzających bazę danych rpm"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Zgłaszanie wyników sprawdzania do dziennika systemowego"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Przesyłanie wyniki sprawdzania do konsoli tty"
@@ -14779,7 +15166,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "Automatycznie przełącza klawiaturę numeryczną przy uruchamianiu\n"
 "w trybie konsoli oraz graficznym."
@@ -14875,7 +15262,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 ""
 "Protokół rwho działa jak who (podaje listę użytkowników) dla innych maszyn w "
 "sieci,\n"
@@ -14903,8 +15290,8 @@ msgstr "Ładuje sterowniki urządzeń USB."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Uruchamia serwer czcionek (konieczny do działania XFree)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Uruchamia serwer czcionek (konieczny do działania Xorg)."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -14948,7 +15335,7 @@ msgstr "zatrzymana"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Usługi i demony"
 
 #: services.pm:221
@@ -14960,7 +15347,7 @@ msgstr ""
 "Niestety brak dodatkowych informacji\n"
 "o tej usłudze."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Informacje"
@@ -14975,847 +15362,1372 @@ msgstr "Uruchamianie na żądanie"
 msgid "On boot"
 msgstr "Przy uruchamianiu"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Uruchom"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: 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>Gratulacje z powodu wyboru dystrybucji Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Czym jest 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 "Witaj w świecie Otwartego Oprogramowania!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Witaj w systemie <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 ""
-"Twój system operacyjny Mandrakelinux i wiele jego aplikacji jest wynikiem "
-"współpracy pomiędzy programistami MandrakeSoft oraz współautorami "
-"oprogramowania otwartego z całego świata."
+"Mandrakelinux jest <b>dystrybucją Linuksa</b> zawierającą podstawowy system "
+"zwany <b>systemem operacyjnym</b> (opartym o jądro Linuksa) wraz z <b>dużą "
+"liczbą aplikacji</b> realizujących wszystkie zadania o jakich można tylko "
+"pomyśleć."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Chcielibyśmy podziękować każdemu kto brał udział w tworzeniu tego "
-"najnowszego wydania."
+"Mandrakelinux jest  najbardziej <b>przyjazną dla użytkownika</b> dystrybucją "
+"Linuksa. Jest ona także jedną z <b>najczęściej używanych</b> dystrybucji "
+"Linuksa na świecie!"
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>Open Source</b>"
+msgstr "<b>Open Source</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Witaj w <b>świecie Otwartego Oprogramowania</b>!"
+
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
-"Discovery to najłatwiejsza i najbardziej przyjazna dla użytkownika "
-"dystrybucja Linuksa. Zawiera dobrze wybrane oprogramowanie dla biura, "
-"korzystaniu z multimediów i korzystaniu z Internetu."
+"Mandrakelinux został wydany na zasadzie modelu Open Source. To oznacza, że "
+"to nowe wydanie jest wynikiem <b>współpracy</b> pomiędzy <b>zespołem "
+"programistów Mandrakesoft</b> oraz <b>światową społecznością</b> "
+"Mandrakelinux."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
-"Menu jest zorientowane zadaniowo, z wybraną pojedynczą aplikacją na zadanie."
+"Chcielibyśmy <b>podziękować</b> każdemu kto brał udział w tworzeniu tego "
+"najnowszego wydania."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>Wybór KDE</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>Licencja GPL</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"Wydajne środowisko graficzne Open Source KDE jest domyślnym wyborem dla "
-"pakietu Discovery."
+"Większość oprogramowania załączonego w dystrybucji oraz wszystkie narzędzia "
+"Mandrakelinux jest licencjonowana na zasadach <b>Ogólnej Licencji "
+"Publicznej</b> (GPL)."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
-"<b>OpenOffice.org</b>: Pełny zbiór oprogramowania biurowego dla Linuksa."
+"GPL jest sercem modelu Open Source, gwarantuje każdemu <b>wolność</b> "
+"używania, studiowania, rozpowszechniania oraz ulepszania oprogramowania w "
+"dowolny sposób, zapewniając, że wyniki pracy będą dostępne każdemu."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
-"<b>WRITER</b> jest wydajnym procesorem tekstu do tworzenia wszystkich typów "
-"dokumentów tekstowych. Dokumenty mogą zawierać obrazy, diagramy i tabele."
+"Główną korzyścią jest to, że duża liczba programistów jest "
+"wirtualnie<b>nieograniczona</b>, w wyniku czego otrzymujemy oprogramowanie "
+"<b>o bardzo wysokiej jakości</b>."
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Dołącz do społeczności</b>"
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
-"<b>CALC</b> jest arkuszem kalkulacyjnym z wieloma funkcjami umożliwiającymi "
-"obliczenia, analizę i zarządzanie wszystkimi danymi."
+"Mandrakelinux posiada jedną z <b>największych społeczności</b> użytkowników "
+"i deweloperów. Rola takiej społeczności jest bardzo szeroka, poczynając od "
+"zgłaszania błędów a kończąc na tworzeniu nowych aplikacji. Społeczność "
+"odgrywa <b>kluczową rolę</b> w świecie Mandrakelinux."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"<b>IMPRESS</b> jest najszybszym, najwydajniejszym sposobem na utworzenie "
-"efektownych prezentacji multimedialnych."
+"Aby <b>dowiedzieć się więcej</b> na temat naszej dynamicznej społeczności, "
+"zajrzyj na stronę <b>www.mandrakelinux.com</b> lub bezpośrednio na <b>www."
+"mandrakelinux.com/en/cookerdevel.php3</b> jeśli chcesz <b>wziąć udział</b> w "
+"rozwijaniu dystrybucji."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Wersja Download</b>"
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"<b>DRAW</b> utworzy wszystko od prostych diagramów do dynamicznych "
-"ilustracji 3D."
+"Właśnie instalujesz <b>Mandrakelinux Download</b>. Ta wersja jest wersją "
+"darmową, którą Mandrakesoft chce utrzymać jako <b>dostępną dla wszystkich</"
+"b>."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:17
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Sufrowanie po Internecie</b>"
+msgid ""
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
+msgstr ""
+"Wersja Download <b>nie może zawierać</b> całego oprogramowania, które nie "
+"jest Open Source. Tak więc w wersji Download nie znajdziesz:"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"Odkryj nowy zbiór zintegrowanego oprogramowania osobistego KDE Kontact."
+"\t* <b>Sterowników własnościowych</b> (takich jak sterowniki do NVIDIA®, "
+"ATI™, itd.)."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"To nie tylko klient email zawierający wiele funkcji, <b>Kontact</b> zawiera "
-"także książkę adresową, kalendarz oraz terminarz, plus narzędzie do "
-"tworzenia notatek!"
+"\t* <b>Oprogramowania własnościowego</b> (takiego jak Acrobat® Reader®, "
+"RealPlayer®, Flash™, itd.)."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
-msgstr "Możesz także:"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+"Użytkownik nie będzie miał dostępu do <b>usług dołączanych</b> do innych "
+"produktów Mandrakesoft."
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- korzystać z sieci web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery, Twoja Pierwsza Dystrybucja Linuksowa</b>"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
-msgstr "\t- czatować"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Właśnie instalujesz <b>Mandrakelinux Discovery</b>."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organizować wideokonferencję"
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+"Discovery to <b>najłatwiejsza</b> i <b>najbardziej przyjazna</b> dla "
+"użytkownika dystrybucja Linuksa. Zawiera ręcznie wyselekcjonowane "
+"<b>najlepsze oprogramowanie</b> dla biura, korzystaniu z multimediów i "
+"korzystaniu z Internetu. Jej menu jest zorientowane zadaniowo, do realizacji "
+"każdego z zadań przeznaczona jest osobna aplikacja."
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t tworzyć swoją własną witrynę WWW"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack, Potężny Pulpit Linuksa</b>"
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Właśnie instalujesz <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimedia</b>: Oprogramowanie spełniające wszystkie potrzeby!"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
+"PowerPack jest <b>głównym produktem Linuksowym</b> firmy Mandrakesoft. "
+"PowerPack zawiera <b>tysiące aplikacji</b> - wszystko od najbardziej "
+"popularnych aplikacji do najbardziej technicznych."
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Słuchaj muzyki z płyt CD przy użyciu <b>KsCD</b>."
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "<b>PowerPack+, Rozwiązanie Linuksowe na Pulpity i Serwery</b>"
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Słuchanie plików muzycznych i oglądanie wideo z <b>Totemem</b>"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Właśnie instalujesz <b>Mandrakelinux PowerPack+</b>."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "Przeglądanie i edycja obrazów i zdjęć z <b>GQview</b> i <b>Gimpem</b>"
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
+msgstr ""
+"PowerPack+ jest <b>wielofunkcyjnym rozwiązaniem Linuksa</b> dla małych i "
+"średnich <b>sieci</b>. PowerPack+ zwiększa wartość standardowej wersji "
+"PowerPack poprzez dodanie wydajnego zbioru <b>aplikacji nabiurkowych<b> oraz "
+"<b>aplikacji serwerowych</b> klasy światowej."
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Centrum Sterowania Mandrake</b>"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Produkty Mandrakesoft</b>"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
-"Centrum Sterowania Mandrake jest zbiorem narzędzi specyficznych dla Mandrake "
-"upraszczających konfigurację komputera."
+"Firma <b>Mandrakesoft</b> stworzyła szeroką gamę produktów dla dystrybucji "
+"<b>Mandrakelinux</b>."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Produktami Mandrakelinux 10.1 są:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* <b>Discovery</b>, Twoja Pierwsza Dystrybucja Linuksa."
+
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* <b>PowerPack</b>, Potężna Dystrybucja Linuksowa."
+
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* <b>PowerPack+</b>, Rozwiązanie Linuksowe na Biurka i Serwery."
+
+#: 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 ""
-"Docenisz szybko ten zbiór przydatnych narzędzi do łatwej konfiguracji "
-"urządzeń sprzętowych, definiowania punktów montowania, konfiguracji sieci i "
-"Internetu, dopasowywania poziomu bezpieczeństwa komputera oraz do "
-"wszystkiego co jest związane z systemem."
+"\t* <b>Mandrakelinux 10.1 dla x86-64</b>, rozwiązanie Mandrakelinux dla "
+"procesorów 64-ro bitowych."
 
-#: 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>Sklep Mandrake</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Produkty Mandrakesoft (Produkty Nomada</b>"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Znajdź wszystkie produkty i usługi MandrakeSoft w <b>Sklepie Mandrake</b> -- "
-"naszej platformie e-commerce zawierającej wiele usług."
+"Mandrakesoft storzył dwa produkty umożliwiające używanie dystrybucji "
+"Mandrakelinux <b>na dowolnym komputerze</b> oraz bez potrzeby jej "
+"instalowania."
 
-#: 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 "Zatrzymaj się pod adresem <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
+"\t* <b>Move</b>, dystrybucja Mandrakelinux uruchamiana bezpośrednio z płyty "
+"CD-Rom."
 
-#: 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 "Zostań członkiem <b>Klubu Mandrake</b>!"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* <b>GlobeTrotter</b>, dystrybucja Mandrakelinux preinstalowana na "
+"ultrakompaktowym dysku LaCie Mobile."
 
-#: 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
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<b>Produkty Mandrakesoft (Rozwiązania Profesjonalne)</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 ""
-"Skorzystaj z ofert, produktów oraz usług poprzez wstąpienie do Klubu "
-"Mandrake. Do nich można zaliczyć:"
+"Poniżej wymienione są produkty Mandrakesoft zaprojektowane aby spełniać "
+"<b>potrzeby profesjonalne</b>:"
+
+#: share/advertising/11.pl:16
+#, c-format
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, Rozwiązanie Mandrakelinux dla Biznesu."
 
-#: 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:17
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Pełny dostęp do aplikacji komercyjnych"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, Rozwiązanie Serwerowe Mandrakelinux."
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
-"\t- Specjalna lista serwerów zwierciadlanych wyłącznie dla członków Klubu "
-"Mandrake"
+"\t* <b>Multi-Network Firewall</b>, Rozwiązanie Bezpieczeństwa Mandrakelinux."
+
+#: share/advertising/12.pl:13
+#, c-format
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>Wybór KDE</b>"
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/12.pl:15
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Głosowanie nad oprogramowaniem dodawanym do Linuksa Mandrake"
+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 ""
+"Dzięki Discovery, zostanie ci przedstawione <b>KDE</b>, najbardziej "
+"zaawansowane i przyjazne dla użytkownika <b>środowisko graficzne</b>."
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:17
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- Specjalne zniżki na produkty i usługi w Sklepie Mandrake"
+msgid ""
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
+msgstr ""
+"KDE uczyni twoje <b>pierwsz kroki</b> w Linuksie tak <b>łatwymi</b>, że "
+"nigdy więcej nie pomyślisz o innym systemie operacyjnym."
 
-#: 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:19
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- Oraz dużo więcej"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
+"KDE zawiera także wiele <b>dobrze zintegrowanych aplikacji</b> takich jak "
+"Konqueror, przeglądarka webowa oraz Kontact, menedżer informacji osobistych."
 
-#: 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/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Aby uzyskać więcej informacji, odwiedź <b>www.mandrakeclub.com</b>"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Wybierz swoje ulubione środowisko graficzne</b>"
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:15
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Potrzebujesz pomocy?"
+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 ""
+"Dzięki PowerPack, masz wybór <b>środowiska graficznego</b>, firma "
+"Mandrakesoft wybrała <b>KDE</b> jako środowisko domyślne."
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> jest podstawowym źródłem pomocy technicznej."
+msgid ""
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
+msgstr ""
+"KDE jest jednym z <b>najbardziej zaawansowanych</b> oraz <b>przyjaznych dla "
+"użytkownika</b> środowisk graficznych. Zawiera także wiele zintegrowanych "
+"aplikacji."
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
-"Jeśli masz pytania związane z Linuksem, zapisz się do Eksperta Mandrake na "
-"<b>www.mandrakeexpert.com</b>"
+"Zalecane jest wypróbowanie wszystkich dostępnych środowisk (włączając "
+"<b>GNOME</b>, <b>IceWM</b>, itd.) oraz wybranie ulubionego."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Mandrakelinux został wydany na zasadzie modelu Open Source i w pełni "
-"przestrzega licencji GPL. To nowe wydanie jest wynikiem współpracy pomiędzy "
-"programistami MandrakeSoft oraz współautorami oprogramowania otwartego z "
-"całego świata."
+"Dzięki PowerPack+ masz wybór <b>środowiska graficznego</b>, firma "
+"Mandrakesoft wybrała <b>KDE</b> jako środowisko domyślne."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Dołącz do społeczności Linuksa Mandrake!</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 "Dzięki Discovery, możesz odkryć <b>OpenOffice.org</b>."
+
+#: 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 ""
-"Jeśli chcesz wziąć udział w tworzeniu dystrybucji, zapisz się na listę "
-"mailingową \"Cooker\" odwiedzając <b>mandrake-linux.com/cooker</b>"
+"To jest <b>wielofunkcyjny zestaw biurowy</b> zawierający procesor tekstu, "
+"arkusz kalkulacyjny, aplikację do prezentacji oraz rysowania."
 
-#: 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 ""
-"Aby dowiedzieć się więcej o naszej dynamicznej społeczności, odwiedź <b>www."
-"mandrake-linux.com</b>!"
+"OpenOffice.org potrafi odczytywać i zapisywać wiele rodzajów dokumentów "
+"<b>Microsoft® Office</b> takich jak pliki programów Word, Excel oraz "
+"PowerPoint®."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Czym jest 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 ""
-"Mandrakelinux jest dystrybucją Open Source stworzoną przez tysiące "
-"najlepszych aplikacji ze świata Wolnego Oprogramowania. Mandrakelinux jest "
-"jedną z najpowszechniej używanych dystrybucji na świecie!"
+"Discovery zawiera <b>Kontact</b>, nowe rozwiązanie KDE <b>do pracy grupowej</"
+"b>."
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
-"Mandrakelinux zawiera słynne środowiska graficzne KDE i GNOME oraz ostatnie "
-"wersje najpopularniejszych aplikacji Open Source."
+"To nie tylko wielofunkcyjny <b>klient email</b>, Kontact zawiera także "
+"<b>książkę adresową</b>, <b>kalendarz</b> oraz narzędzie do <b>tworzenia "
+"notatek</b>!"
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
-"Mandrakelinux jest szeroko znaną z przyjazności dla użytkownika oraz "
-"łatwości instalacji i używania dystrybucją Linuksa."
+"To jest najłatwiejszy sposób do skomunikowania się ze swoimi znajomymi oraz "
+"zorganizowania swojego czasu."
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Korzystanie z Internetu</b>"
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:15
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Dowiedz się więcej o naszych <p>Rozwiązaniach osobistych</b>:"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr "Discovery daje ci dostęp do <b>każdego zasobu Internetu</b>."
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Przeglądanie <b>sieci www</b> za pomocą Konquerora."
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
-"\t- Dowiedz się o Linuksie Mandrake na uruchamialnej płycie CD o nazwie "
-"<b>MandrakeMove</b>"
+"\t* <b>Czatowanie</b> w sieci ze swoimi przyjaciółmi przy użyciu Kopete."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:18
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Przesyłanie</b> plików przy użyciu 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 "<b>Korzystanie z funkcji multimedialnych</b>"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
-"\t- Jeśli używasz Linuksa głównie w zastosowaniach biurowych, do Internetu i "
-"zadań multimedialnych, wersja <b>Discovery</b> spełnia dokładnie Twoje "
-"potrzeby"
+"Discovery także udostępnia <b>funkcje multimedialne</b> w łatwy dla ciebie "
+"sposób."
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/17.pl:16
 #, c-format
-msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* Oglądanie swoich ulubionych <b>filmów</b> przy użyciu Koffeine."
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
 msgstr ""
-"\t- Jeśli doceniasz największy zbiór oprogramowania włączając wydajne "
-"narzędzia programistyczne, wersja <b>PowerPack</b> jest dla Ciebie"
+"\t* Słuchanie swoich <b>plików muzycznych</b> za pomocą aplikacji amaroK."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Edycja <b>obrazów i zdjęć</b> przy użyciu aplikacji GIMP."
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Korzystaj z szerokiej gamy aplikacji</b>"
+
+#: share/advertising/18.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>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
-"\t- Jeśli potrzebujesz wielofunkcyjnego rozwiązania Linuksa dopasowanego dla "
-"małych i średnich sieci, wybierz <b>PowerPack+</b>"
+"W menu Linuksa Mandrake znajdziesz <b>łatwe w użyciu</b> aplikacje do "
+"<b>wielu swoich zadań</b>:"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Zobacz także nasze <b>Rozwiązania biznesowe</b>!"
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr ""
+"\t* Tworzenie, edycja i współdzielenie dokumentów biurowych za pomocą "
+"<b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.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."
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"<b>Corporate Server</b>: idealne rozwiązanie dla przedsiębiorstw. To jest "
-"pełne rozwiązanie \"wszystko w jednym\", zawierające wszystko co jest "
-"konieczne do szybkiego wykorzystania aplikacji serwerowych Linuksa."
+"\t* Zarządzaj swoimi danymi osobistymi przy użyciu zbioru zintegrowanych "
+"rozwiązań <b>Kontact</b> i <b>Evolution</b>"
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:18
 #, 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."
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Przeglądaj sieć przy użyciu <b>Mozilli</b> i <b>Konquerora</b>"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
 msgstr ""
-"<b>Multi Network Firewall</b>: oparty o \"bezpiecznym jądrze\" 2.4 w celu "
-"dostarczenia połączeń VPN oraz funkcji DMZ. To jest idealne wysokowydajne "
-"rozwiązanie sieciowe."
+"\t* Korzystanie z sieciowych czatów przy użyciu aplikacji <b>Kopete</b>"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
-"<b>MandrakeClustering</b>: siła i szybkość klastra linuksowego w połączeniu "
-"ze stabilnością i łatwością używania dystrybucji Linuksa Mandrake. Unikalna "
-"i nieporównywalna z niczym wdajność HPC."
+"\t* Słuchaj muzyki z <b>plików i płyt CD</b> oraz oglądaj <b>filmy</b>."
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Edycja obrazów i zdjęć przy użyciu aplikacji <b>Gimp</b>"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Środowiska programistyczne</b>"
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
-"Wszystkie produkty MandrakeSoft można znaleźć w <b>Sklepie Mandrake</b> -- "
-"naszej platformie e-commerce."
+"PowerPack daje ci najlepsze narzędzia do <b>tworzenia</b> swoich własnych "
+"aplikacji."
 
-#: 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 ""
-"Wykoszystaj także zdarzenia wsparcia jeśli napotkasz jakiś problem, od "
-"standardowej do profesjonalnej pomocy od 1 do 50 zdarzeń, wybierz jedno "
-"rozwiązanie dokładnie spełniające Twoje potrzeby!"
+"Skorzystasz w wydajnego, zintegrowanego środowiska programistycznego dla "
+"KDE, <b>KDevelop</b>, które pozwoli ci na tworzenie programów w wielu "
+"językach."
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/19.pl:19
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Zostań członkiem Klubu Mandrake!</b>"
+msgid ""
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
+"PowerPack także jest dostarczany z <b>GCC</b>, wiodącym kompilatorem Linuksa "
+"oraz <b>GDB</b>, powiązanym z nim debugerem."
 
-#: 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>Potrzebujesz pomocy?</b>"
+msgid "<b>Development Editors</b>"
+msgstr "<b>Edytory programistyczne</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:15
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Uwaga</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
+"PowerPack pozwoli ci wybrać pomiędzy tymi <b>popularnymi edytorami</b>:"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:16
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "To jest wersja <b>Download</b> Linuksa Mandrake."
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b>: dostosowywalny edytor czasu rzeczywistego"
 
-#: 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 ""
-"Darmowa wersja download nie zawiera oprogramowania komercyjnego oraz nie "
-"może pracować z niektórymi modemami (niektóre modemy ADSL i RTC) oraz "
-"kartami wideo (takimi jak niektóre modele ATI oraz NVIDIA)."
+"\t* <b>XEmacs</b>: kolejny edytor tekstowy Open Source oraz system tworzenia "
+"aplikacji"
 
-#: 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 ""
-"Twoja nowa dystrybucja Mandrakelinux oraz jej mnogość aplikacji są wynikiem "
-"współpracy pomiędzy programistami MandrakeSoft oraz ochotnikami pracującymi "
-"nad oprogramowaniem linuksowym na całym świecie."
+"\t* <b>Vim</b>: zaawansowany edytor tekstowy z większą liczbą funkcji niż "
+"standardowy Vi"
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:13
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "<b>Development Languages</b>"
+msgstr "<b>Języki programowania</b>"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
-"PowerPack+ jest wielofunkcyjnym rozwiązaniem Linuksa dla małych i średnich "
-"sieci. PowerPack+ zwiększa wartość standardowej wersji PowerPack poprzez "
-"dodanie wydajnego zbioru aplikacji serwerowych klasy światowej."
+"Za pomocą tych <b>potężnych narzędzi</b>, będziesz mieć możliwość tworzenia "
+"aplikacji w <b>wielu językach programowania</b>:"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* Sławny język <b>C</b>."
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Języki zorientowane obiektowo:"
+
+#: share/advertising/21.pl:18
+#, c-format
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
+
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
+
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* Języki skryptowe:"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
+
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#, c-format
+msgid "\t* And many more."
+msgstr "\t* I wiele więcej."
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Narzędzia programistyczne</b>"
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
-"To jest jedyny produkt Linuksa Mandrake zawierający rozwiązanie groupware."
+"Za pomocą zintegrowanego środowiska programistycznego <b>KDevelop</b> oraz "
+"wiodącego kompilatora Linuksowego <b>GCC</b>, będziesz mieć możliwość "
+"tworzenia aplikacji w <b>wielu językach programowania</b> (C, C++, Java™, "
+"Perl, Python, itd.)."
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/23.pl:13
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Wybierz swoje środowisko graficzne pulpitu!</b>"
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Serwer pracy grupowej</b>"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
-"Po zalogowaniu się do systemu po raz pierwszy, będzie można wybrać pomiędzy "
-"różnymi popularnymi środowiskami graficznymi, włączając KDE, GNOME, "
-"WindowMaker, IceWM i inne."
+"PowerPack+ daje ci dostęp do <b>Kolaba</b>, wielofunkcyjnego <b>serwera "
+"pracy grupowej</b>, który dzięki klientowi <b>Kontact</b> umożliwi ci:"
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Przesyłanie i odbieranie <b>poczty elektronicznej</b>."
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* Współdzielenie swoich <b>agend</b> oraz <b>książek adresowych</b>."
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* Zarządzanie swoimi <b>notatkami</b> oraz <b>listami zadań</b>."
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Serwery</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"W menu Linuksa Mandrake można znaleźć łatwe w użyciu aplikacje do wielu "
-"zadań:"
+"Wzmocnij swoją sieć biznesową przy użyciu <b>głównego rozwiązania "
+"serwerowego</b> zawierającego:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:16
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
-"\t- Tworzenie, edycja i współdzielenie dokumentów biurowych za pomocą "
-"<b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr "\t* <b>Samba</b>: Usługi plików i wydruku dla klientów MS Windows"
+
+#: share/advertising/24.pl:17
+#, c-format
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: najbardziej znany i używany serwer webowy"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"\t- Zarządzanie danymi osobistymi za pomocą zintegrowanej kolekcji "
-"aplikacji: <b>Kontact</b> i <b>Evolution</b>"
+"\t* <b>MySQL</b> i <b>PostgreSQL</b>: najpopularniejsze bazy danych Open "
+"Source."
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Przeglądanie sieci www za pomocą <b>Mozilli i Konquerora</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, dominujący system kontroli "
+"wersji przezroczysty dla sieci"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"\t- Korzystanie z sieciowych czatów przy użyciu aplikacji <b>Kopete</b>"
+"\t* <b>ProFTPD</b>: wysoce konfigurowalne oprogramowanie serwer FTP na "
+"licencji GPL"
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
-"\t- Słuchanie muzyki z płyt CD i plików przy użyciu <b>KsCD</b> i <b>Totema</"
-"b>"
+"\t* <b>Postfix</b> oraz <b>Sendmail</b>: najpopularniejsze i najbardziej "
+"wydajne serwery pocztowe."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Edycja obrazów i zdjęć przy użyciu aplikacji <b>Gimp</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Centrum Sterowania Mandrakelinux</b>"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
-"PowerPack+ zawiera wszystko co jest potrzebne do tworzenia i oprogramowania "
-"własnych aplikacji włączając:"
+"<b>Centrum Sterowania Mandrakelinux</b> jest zbiorem narzędzi specyficznych "
+"dla Mandrake upraszczających konfigurację komputera."
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- <b>Kdevelop</b>: środowisko programistyczne C++ z wieloma funkcjami"
+"Docenisz szybko ten zbiór <b>ponad 60-ciu</b> przydatnych narzędzi do "
+"<b>łatwej konfiguracji systemu</b>, sprzętu, punktów montowania, sieci i "
+"Internetu, dopasowywania poziomu bezpieczeństwa, itd."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: zbiór kompilatorów GNU"
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>Model Open Source</b>"
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/26.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t-t <b>GDB</b>: debuger projektu GNU"
+msgid ""
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
+msgstr ""
+"Tak jak każde oprogramowanie komputerowe, oprogramowanie Open Source "
+"<b>wymaga czasu i ludzi</b> do tworzenia. W celu uszanowania filozofii Open "
+"Source, Mandrakesoft sprzedaje produkty wartości dodanej oraz usługi aby "
+"<b>ulepszyć dystrybucję Mandrakelinux</b>. Jeśli chcesz <b>wesprzeć "
+"filozofię Open Source</b> oraz rozwój dystrybucji Mandrakelinux, <b>rozważ</"
+"b> zakup jednego z naszych produktów lub usług!"
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: dostosowywalny edytor czasu rzeczywistego"
+msgid "<b>Online Store</b>"
+msgstr "<b>Sklep internetowy Mandrake</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Xemacs</b>: edytor tekstowy OpenSource i system tworzenia aplikacji"
+"Aby dowiedzieć się więcej na temat produktów i usług Mandrakesoft, możesz "
+"odwiedzić naszą <b>internetową platformę e-commerce</b>."
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:17
+#, c-format
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
+"Tam można znaleźć wszystkie nasze produkty, usługi oraz produkty firm "
+"trzecich."
+
+#: share/advertising/27.pl:19
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
-"\t- <b>Vim</b>: zaawansowany edytor tekstowy z większą liczbą funkcji niż "
-"zwykły Vi"
+"Ta platforma została niedawno <b>przeprojektowana</b> aby ulepszyć wydajność "
+"oraz użyteczność."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:21
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>Odkryj rozwiązanie do pracy grupowej z wieloma funkcjami!</b>"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Zatrzymaj się pod adresem <b>store.mandrakesoft.com</b>"
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:13
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Zawiera funkcje serwera jak i klienta takie jak:"
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:15
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Przesyłanie i odbieranie poczty elektronicznej"
+msgid ""
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
+msgstr ""
+"<b>Mandrakeclub</b> jest <b>doskonałym dodatkiem</b> do twojego produktu "
+"Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- Kalendarz, lista zadań, notatki, zlecenia spotkań (przesyłanie i "
-"otrzymywanie), zlecenia zadań (przesyłanie i otrzymywanie)"
+"Skorzystaj z <b>wartościowych ofert</b> poprzez dołączenie do Mandrakeclub, "
+"są to m.in.:"
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:18
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Książka adresowa (serwer i klient)"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
+msgstr ""
+"\t* <b>Specjalne zniżki</b> na produkty i usługi w naszym sklepie "
+"internetowym <b>store.mandrakesoft.com</b>."
 
-#: 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 ""
-"Wzmocnij swoją sieć biznesową przy użyciu <b>głównego rozwiązania "
-"serwerowego</b> zawierającego:"
+"\t* Dostęp do <b>aplikacji komercyjnych</b> (na przykład do sterowników "
+"NVIDIA® lub ATI™)."
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
-msgstr "\t- <b>Samba</b>: Usługi plików i wydruku dla klientów MS Windows"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr ""
+"\t* Branie udziału w dyskusjach na <b>forach użytkowników</b> Mandrakelinux."
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: najbardziej znany i używany serwer webowy"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr ""
+"\t* <b>Wcześniejszy i uprzywilejowany dostęp</b>, przed wydaniem publicznym, "
+"do <b>obrazów ISO</b> dystrybucji Mandrakelinux."
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: najpopularniejsza baza danych Open Source"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
-"\t- <b>CVS</b>: Concurrent Versions System, dominujący system kontroli "
-"wersji przezroczysty dla sieci"
+"<b>Mandrakeonline</b> jest nową usługą, którą Mandrakesoft z dumą oferuje "
+"swoim klientom."
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>ProFTPD</b>: wysoce konfigurowalne oprogramowanie serwer FTP na "
-"licencji GPL"
+"Mandrakeonline dostarcza szeroką gamę wartościowych usług do <b>łatwiejszego "
+"uaktualniania</b> swoich systemów Mandrakelinux:"
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
-msgstr "\t- I inne programy"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+"\t* <b>Doskonałe</b> bezpieczeństwo systemu (zautomatyzowana aktualizacja "
+"programów)."
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
-"Twoja nowa dystrybucja Linuksa Mandrake jest wynikiem współpracy pomiędzy "
-"programistami MandrakeSoft a społecznością Linuksa Mandrake z całego świata."
+"\t* <b>Powiadamianie</b> o uaktualnieniach (poprzez e-mail lub za pomocą "
+"apletu na pulpicie)."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* Elastyczne <b>planowanie czasu</b> aktualizacji."
+
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
-"Chcemy podziękować wszystkim, którzy wzięli udział w tworzeniu najnowszego "
-"wydania."
+"\t* Zarządzanie <b>całym systemem Mandrakelinux</b> z użyciem jednego konta."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"PowerPack jest głównym produktem biurkowym Linuksa firmy MandrakeSoft. "
-"Dodatkowo jest on najłatwiejszy i najbardziej przyjazną dystrybucją Linuksa. "
-"PowerPack zawiera tysiące aplikacji - wszystko od najbardziej popularnych "
-"aplikacji do najbardziej technicznych."
+"Czy potrzebujesz <b>asysty?</b>. Spotkaj ekspertów technicznych Mandrakesoft "
+"na <b>naszej platformie wsparcia technicznego</b> www.mandrakeexpert.com."
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"W menu Linuksa Mandrake znajdziesz łatwe w użyciu aplikacje do wielu zadań:"
+"Dzięki pomocy <b>wykwalifikowanych ekspertów Mandrakelinux</b>, oszczędzisz "
+"wiele czasu."
 
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t- Skorzystaj z danych osoistych przy użyciu zbioru zintegrowanych "
-"rozwiązań PIM <b>Kontact</b> i <b>Evolution</b>"
+"W przypadku dowolnego pytania związanego z dystrybucją Mandrakelinux, masz "
+"możliwość zakupu zdarzeń wsparcia pod adresem <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:25
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Przeglądaj sieć przy użyciu <b>Mozilli</b> i <b>Konquerora</b>"
+msgid "Office Workstation"
+msgstr "Stacja biurowa"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:27
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- Słuchaj muzyki z plików i płyt CD przy użyciu KsCD i <b>Totema</b>"
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Programy biurowe: procesory tekstu (OpenOffice.org Writer, Kword), arkusze "
+"kalkulacyjne (OpenOffice.org, Kspread), przedlądarki pdf, itd."
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:28
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Narzędzia programistyczne</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programy biuroweL procesory tekstu (kword, abiword), arkusze kalkulacyjne "
+"(kspread, gnumeric), przedlądarki pdf, itd."
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Stacja rozrywkowa (gry)"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programy do zabawy: gry przygodowe, planszowe, strategie, itd."
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Stacja multimedialna"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Programy do odtwarzania/edycji dźwięku i obrazu"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Stacja internetowa"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
-"PowerPack zawiera wszystko co jest potrzebne do tworzenia i rozwijania "
-"własnego oprogramowania, włączając:"
+"Zestaw narzędzi do odczytu i przesyłania poczty i grup dyskusyjnych (mutt, "
+"tin...) oraz przeglądania sieci"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Komputer sieciowy (klient)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Programy klienckie dla różnych protokołów włączając ssh"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:54
 #, c-format
-msgid "And of course the editors!"
-msgstr "I oczywiście edytory!"
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Narzędzia do łatwego zarządzania komputerem"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Narzędzia konsolowe"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Książki i dokumenty HOWTO o Linuksie i Wolnym Oprogramowaniu"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "Groupware"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Serwer Kolab"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Zapora sieciowa/router"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Bramka internetowa"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Poczta/wiadomości"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Serwer pocztowy Postfix, serwer grup Inn"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Serwer katalogowy"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "Serwer FTP"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Serwer nazw domenowych i informacji sieciowych"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Serwer plików i współdzielenia drukarek"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "Serwer NFS, serwer Samby"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Baza danych"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Serwer bazodanowy PostgreSQL i 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, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Poczta"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Serwer pocztowy Postfix"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serwer bazodanowy PostgreSQL i MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Serwer sieciowy"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "Stacja 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>: kolejny edytor tekstowy Open Source oraz system tworzenia "
-"aplikacji"
+"Środowisko graficzne KDE, podstawowe środowisko graficzne ze zbiorem "
+"narzędzi towarzyszących"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Stacja GNOME"
+
+#: 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>: zaawansowany edytor tekstowy z większą liczbą funkcji niż "
-"standardowy Vi"
+"Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
+"narzędzi graficznych"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Inne środowiska graficzne"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Narzędzia"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "Serwer SSH"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Serwer konfiguracji zdalnej Webmin"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Narzędzia sieciowe/monitorowanie"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr "Narzędzia do monitorowania, księgowania procesów, tcpdump, nmap, ..."
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Druidy Mandrakesoft"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Druidy do konfiguracji serwera"
 
 #: standalone.pm:21
 #, c-format
@@ -15897,15 +16809,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 "[OPCJE] [NAZWA_PROGRAMU]\n"
 "\n"
 "OPCJE:\n"
 "  --help            - wyświetla ten komunikat pomocy.\n"
-"  --report          - program powinien być jednym z narzędzi Mandrake\n"
-"  --incident        - program powinien być jednym z narzędzi Mandrake"
+"  --report          - program powinien być jednym z narzędzi Mandrakelinux\n"
+"  --incident        - program powinien być jednym z narzędzi Mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -15933,7 +16845,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"
@@ -15959,7 +16871,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -15973,13 +16885,13 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPCJE]...\n"
-"Konfigurator Serwera Terminali Mandrake\n"
+"Konfigurator Serwera Terminali Mandrakelinux\n"
 "--enable         : włącza MTS\n"
 "--disable        : wyłącza MTS\n"
 "--start          : uruchamia MTS\n"
 "--stop           : zatrzymuje MTS\n"
 "--adduser        : dodaje  istniejącego użytkownika do MTS (wymaga nazwy)\n"
-"--deluser        : usuwa istniejącego użytkownika z MTS (wymaga nazwy)\n"
+"--deluser        : usuwa istniejącego użytkownika z MTS (wymaga jego nazwy)\n"
 "--addclient      : dodaje maszynę klienta do MTS (wymaga adresu MAC, IP, "
 "nazwy obrazu nbi)\n"
 "--delclient      : usuwa maszynę klienta z MTS (wymaga adresu MAC, IP, nazwy "
@@ -16062,7 +16974,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       XFdrake rozdzielczość"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16073,28 +16985,28 @@ msgstr ""
 "Użycie: %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 "Wyloguj się i użyj kombinacji klawiszy Ctrl-Alt-BackSpace "
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 "Należy wylogować się a następnie zalogować ponownie aby zmiany odniosły efekt"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Bezużyteczny bez serwera terminali"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s wymaga nazwy użytkownika...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16103,80 +17015,74 @@ msgstr ""
 "%s: %s wymaga nazwy komputera, adresu MAC, IP, nbi-image, 0/1 dla "
 "CIENKIEGO_KLIENTA, 0/1 dla konfiguracji lokalnej...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s wymaga nazwy komputera...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Konfiguracja serwera terminali"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Włącz serwer"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Wyłącz serwer"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Uruchom serwer"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Zatrzymaj serwer"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Uruchamianie sieciowe z dyskietki/obrazu ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Obrazy uruchamialne z sieci"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Dodaj/usuń użytkownika"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Dodaj/usuń programy klienckie"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Druid pierwszego uruchomienia"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 "%s zdefiniowany jako dm, dodanie użytkownika gdm do /etc/passwd$$CLIENT$$"
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -16195,7 +17101,7 @@ msgstr ""
 "\n"
 " To wywołanie druida:\n"
 "\t1) poprosi o wybranie cienkich albo grubych klientów.\n"
-"\t2) skonfiguruje dhcp.\n"
+"\t2) skonfiguruje DHCP.\n"
 "\t\n"
 "Po wykonaniu tych kroków, druid:\n"
 "\t\n"
@@ -16207,22 +17113,22 @@ msgstr ""
 "    e) Poprosi o utworzenie dyskietki rozruchowej.\n"
 "    f) Jeśli to jest cienki klient poprosi o ponowne uruchomienie KDM.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Anuluj druida"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Zapisz konfigurację dhcpd!"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Używanie cienkich klientów."
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16236,35 +17142,35 @@ msgstr ""
 "    Grube klienty używają własnych procesorów i pamięci lecz systemu\n"
 "      plików serwera."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "Synchronizacja ustawień klawiatury X klienta z serwerem"
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Tworzenie obrazów uruchamianych z sieci dla wszystkich jąder"
 
-#: 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 "To zabierze kilka minut."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Gotowe!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Synchronizowanie listy użytkowników serwera z listą klientów, włączając "
 "roota."
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16273,12 +17179,12 @@ msgstr ""
 "W celu zastosowania zmian dokonanych w cienkich klientach, menedżer "
 "wyświetlania musi zostać uruchomiony ponownie. Uruchomić ponownie teraz?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Przegląd serwera terminali"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16304,7 +17210,7 @@ msgstr ""
 "uruchamiane\n"
 "        \t\tz sieci dla co najmniej jednego pełnego jądra."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16337,7 +17243,7 @@ msgstr ""
 "        \t\tTypowy wpis w dhcpd.conf umożliwiający obsługę bezdyskowych\n"
 "        \t\tklientów wygląda podobnie jak:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16348,14 +17254,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"
@@ -16382,14 +17288,14 @@ msgstr ""
 "\t\t\tUwaga: Wpis \"#type\" jest używany jedynie przez drakTermServ.\n"
 "\t\t\tKlienty mogą być jedynie \"thin\" (cienkie) lub \"fat\" (grube).\n"
 "\t\t\tCienkie klienty uruchamiają większość oprogramowania na serwerze\n"
-"\t\t\tprzy użyciu xdmcp, podczas gdy grube klienty uruchamiają "
+"\t\t\tprzy użyciu XDMCP, podczas gdy grube klienty uruchamiają "
 "oprogramowanie\n"
 "\t\t\tna swoim komputerze.\n"
 "\t\t\tSpecjalny plik inittab %s jest\n"
 "\t\t\tzapisywany dla cienkich klientów. Systemowe pliki konfiguracyjne\n"
 "\t\t\txdm-config, kdmrc oraz gdm.conf zostają zmodyfikowane gdy użyty\n"
-"\t\t\tzostanie cienki klient w celu włączenia xdmcp. Ponieważ istnieje\n"
-"\t\t\tkilka kwestii bezpieczeństwa związanych z użyciem xdmcp, pliki\n"
+"\t\t\tzostanie cienki klient w celu włączenia XDMCP. Ponieważ istnieje\n"
+"\t\t\tkilka kwestii bezpieczeństwa związanych z użyciem XDMCP, pliki\n"
 "\t\t\thosts.allow i hosts.deny są modyfikowane tak aby ograniczały\n"
 "\t\t\tdostęp jedynie z lokalnej podsieci.\n"
 "\t\t\t\n"
@@ -16406,7 +17312,7 @@ msgstr ""
 "\t\t\tUwaga: należy zatrzymać/uruchomić serwer po dodaniu lub zmianie "
 "klientów."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16437,7 +17343,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tOpcje PODSIEĆ/MASKA definiują twoją sieć."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16454,7 +17360,7 @@ msgstr ""
 "        \t\tdrakTermServ pomaga w tym poprzez dodanie lub usunięcie\n"
 "        \t\tużytkowników systemowych z tego pliku."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16470,7 +17376,7 @@ msgstr ""
 "        \t\tplików serwera. Poprzez włączenie opcji konfiguracji sprzętu\n"
 "        \t\tna kliencie, drakTermServ utworzy te pliki."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16505,7 +17411,7 @@ msgstr ""
 "        może być przywrócona do stanu poprzedniego, od razu po\n"
 "        skonfigurowaniu maszyny klienckiej."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16515,7 +17421,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"
@@ -16540,7 +17446,7 @@ msgstr ""
 "        \t\twpisy w /etc/dhcpd.conf aby udostępnić obrazy startowe\n"
 "        \t\tkażdemu bezdyskowemu klientowi.\n"
 "\n"
-"        \t\tTypowa konfiguracja tftp wygląda podobnie jak:\n"
+"        \t\tTypowa konfiguracja TFTP wygląda podobnie jak:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16558,13 +17464,13 @@ msgstr ""
 "        \t\tdomyślnej ścieżki na /var/lib/tftpboot, gdzie mkinitrd-net\n"
 "        \t\tumieszcza swoje obrazy."
 
-#: 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"
@@ -16589,62 +17495,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Dyskietka startowa"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "Startowa płyta ISO"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Obraz PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Domyślna wersja jądra"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Zbuduj całe jądro -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Nie wybrano jądra!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Zbuduj pojedynczy NIC -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Nie wybrano wartości NIC!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Zbuduj wszystkie jądra -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Usuń"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Usuń wszystkie NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16655,27 +17561,27 @@ msgstr ""
 "hasła w bazie danych Serwera terminali.\n"
 "Usuń/dodaj ponownie użytkownika serwera terminali, aby włączyć login."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Dodaj użytkownika -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Usuń użytkownika"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "rodzaj: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "konfiguracja lokalna: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16684,67 +17590,67 @@ msgstr ""
 "Włączenie lokalnej\n"
 "konfiguracji sprzętu."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Brak utworzonych obrazów uruchamialnych z sieci"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Cienki klient"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Zezwolenie na cienkie klienty"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Dodaj klienta -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "rodzaj: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "rodzaj: cienki"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "konfiguracja lokalna: niepowodzenie"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "konfiguracja lokalna: prawda"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Edytuj klienta"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Wyłącz konfigurację lokalną"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Usuń klienta"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Konfiguracja dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16753,79 +17659,79 @@ msgstr ""
 "Potrzeba ponownie uruchomić menedżera wyświetlania aby wszystkie zmiany\n"
 "zostały zastosowane. (service dm restart - z konsoli)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 "Ten klient nie działa z usługą autologin. Wyłączyć funkcję automatycznego "
 "logowania?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Wszyscy klienci będą używali %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Podsieć:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Maska sieci:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Routery:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Maska podsieci:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Adres rozgłoszeniowy:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Nazwa domeny:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Serwery nazw:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Początek zakresu IP:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Koniec zakresu IP:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
-msgstr ""
+msgstr "Dodaj TS włączając do istniejącej konfiguracji"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Zapisz konfigurację"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Konfiguracja serwera dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16836,105 +17742,99 @@ msgstr ""
 "z działającego systemu.\n"
 "Można je modyfikować w razie potrzeby."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Pula dynamicznych adresów IP:"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Włóż dyskietkę do stacji:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Brak dostępu do dyskietki!"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Można teraz wyjąć dyskietkę"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Brak dostępnych stacji dyskietek"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "Obraz PXE to %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Błąd zapisu do pliku %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Obraz ISO uruchamialny z sieci to %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Coś poszło nie tak! - Czy zainstalowany jest program mkisofs?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Należy utworzyć najpierw /etc/dhcpd.conf !"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "niepoprawne hasło %s w serwerze terminali - przepisanie...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s nie jest użytkownikiem..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s jest już użytkownikiem serwera terminali\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "Dodanie %s do serwera terminali zakończone niepowodzeniem!\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "Dodano %s do serwera terminali\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Usunięto %s...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "Nie znaleziono %s...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s jest już w użyciu\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "Pliki /etc/hosts.allow i /etc/hosts.deny już skonfigurowano - nie zostały on "
 "zmienione"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Konfiguracja zmieniła się - uruchom ponownie clusternfs/dhcpd?"
@@ -17035,8 +17935,8 @@ msgstr ""
 "\n"
 "Parametry automatycznej instalacji dostępne po lewej stronie ekranu"
 
-#: 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 "Gratulacje!"
@@ -17075,26 +17975,21 @@ msgstr "hd"
 msgid "tape"
 msgstr "taśma"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Nie znaleziono urządzeń"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
-"Expect jest rozszerzeniem dla języka skryptowego Tcl umożliwiającym "
+"Expect jest rozszerzeniem dla języka skryptowego TCL umożliwiającym "
 "interaktywne sesje bez udziału użytkownika."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Przechowywanie haseł dla tego systemu w konfiguracji drakbackup."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -17103,7 +17998,7 @@ msgstr ""
 "W przypadku wielosesyjnych płyt CD, tylko pierwsza sesja wymaże cdrw. W "
 "pozostałych przypadkach cdrw jest wymazywane przed każdą archiwizacją."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17113,7 +18008,7 @@ msgstr ""
 "zachowanie zależy od tego, czy przy archiwizacji używany jest tryb "
 "przyrostowy czy różnicowy."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17122,7 +18017,7 @@ msgstr ""
 "Archiwa różnicowe zapiszą tylko pliki, które uległy zmianie lub zostały "
 "utworzone od czasu ostatniej archiwizacji."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17131,17 +18026,17 @@ msgstr ""
 "Archiwa różnicowe zapisują tylko pliki, które uległy zmianie lub pojawiły "
 "się od czasu oryginalnej archiwizacji \"podstawowej\"."
 
-#: 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 ""
 "To powinna być rozdzielona przecinkami lista lokalnych użytkowników lub "
 "adresów e-mail, do których ma być przesyłana lista wyników archiwizacji. Na "
 "tym systemie należy posiadać skonfigurowany serwer pocztowy."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17150,7 +18045,7 @@ msgstr ""
 "Pliki lub nazwy określane przez \"dzikie karty\" wypisane w pliku ."
 "backupignore na górze drzewa katalogów nie będą archiwizowane."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17161,7 +18056,7 @@ msgstr ""
 "a następnie przenoszone na inny nośnik.  Włączenie tej opcji spowoduje "
 "usuwanie plików tar zapisanych na dysku twardym po archiwizacji."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17172,7 +18067,7 @@ msgstr ""
 "serwera.  Zamiast używania ścieżki katalogów, lepiej skorzystać z nazwy "
 "modułu dla ścieżki usług."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17181,29 +18076,29 @@ msgstr ""
 "Dowolna umożliwia ci określenie własnej daty i czasu.  Inne opcje używają "
 "części run w /etc/crontab."
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Nie wybrano nośnika dla operacji cron."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Nie wybrano odstępu dla operacji cron."
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron nie jest dostępny dla zwykłego użytkownika"
 
-#: 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\" nie jest ani poprawnym adresem e-mail ani istniejącym użytkownikiem "
 "lokalnym!"
 
-#: 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 "
@@ -17212,24 +18107,24 @@ msgstr ""
 "\"%s\" jest użytkownikiem lokalnym, lecz nie wybrano lokalnego smtp, więc "
 "należy użyć pełnego adresu e-mail!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 "Lista poprawnych użytkowników uległa zmianie, przepisywanie pliku "
 "konfiguracyjnego."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Stara lista użytkowników:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Nowa lista użytkowników:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17238,7 +18133,7 @@ msgstr ""
 "\n"
 "                      Raport DrakBackup\n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17247,7 +18142,7 @@ msgstr ""
 "\n"
 "                      Raport Demona DrakBackup\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17260,13 +18155,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 "Postęp całkowity"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17279,42 +18174,42 @@ msgstr ""
 "Ostrzeżenie: jeśli już dokonano tego procesu, prawdopodobnie\n"
 "należy wyczyścić ten wpis z klucza authorized_keys z serwera."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Generacja kluczy może zająć chwilę."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Nie można zapoczątkować %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Brak pytania o hasło na %s na porcie %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Nieprawidłowe hasło dla %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Brak uprawnień dla przesyłania z %s do %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Nie można znaleźć %s na %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s nie odpowiada"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17331,47 +18226,47 @@ msgstr ""
 "\n"
 "Powyższe polecenie nie wyświetla prośby o hasło."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Strona zdalna WebDAV jest już zsynchronizowana!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "Błąd przesyłania WebDAV!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Brak płyty CDR/DVDR w napędzie!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "To nie wygląda na nośnik nagrywalny!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "To nie jest nośnik z którego można usuwać dane!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Może zająć chwilę czasu zanim nośnik zostanie wykasowany."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Problem z uprawnieniami dostępu do CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Brak taśmy w %s!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17380,37 +18275,37 @@ msgstr ""
 "Przekroczono limit na archiwa!\n"
 "Użyto %d Mb, zaś zaalokowano %d Mb."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Archiwizacja plików systemowych..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Pliki archiwum dysku..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Pliki archiwum użytkowników..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Archiwizuj inne pliki..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Postęp archiwizacji dysku..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "Brak zmian w archiwum!"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17421,7 +18316,7 @@ msgstr ""
 "Operacje drakbackup z użyciem nośnika %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17431,18 +18326,18 @@ msgstr ""
 "\n"
 " Problem połączenia FTP: Przesłanie archiwum przez FTP było niemożliwe.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "Błąd podczas przesyłania pliku przez FTP. Popraw konfigurację FTP."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "lista plików przesłanych przez FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17453,7 +18348,7 @@ msgstr ""
 "Operacje drakbackup z użyciem CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17464,24 +18359,24 @@ msgstr ""
 "Operacje drakbackup z użyciem taśmy:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 "Błąd w trakcie wysyłania poczty przez sendmaila. Wiadomość z raportem nie "
 "została przesłana."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Błąd w trakcie wysyłania wiadomości. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Nie można utworzyć katalogu!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17490,7 +18385,7 @@ msgstr ""
 "\n"
 "Zaznacz wszystkie opcje, których potrzebujesz.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17498,36 +18393,36 @@ msgstr ""
 "Za pomocą tych opcji można zarchiwizować i przywrócić wszystkie pliki\n"
 "z katalogu /etc.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Archiwizuj pliki systemowe. (katalog /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 ""
 "Używaj archiwów przyrostowych/różnicowych (bez usuwania starszych archiwów)"
 
-#: 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 "Używaj archiwów przyrostowych"
 
-#: 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 "Użycie archiwów różnicowych"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Nie dołączaj krytycznych plików (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17536,179 +18431,179 @@ msgstr ""
 "Za pomocą tej opcji można odtworzyć dowolną wersję\n"
 " twojego katalogu \"/etc\"."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 "Zaznacz wszystkich użytkowników, którzy mają zostać uwzględnieni w archiwum."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Nie dołączaj plików podręcznych przeglądarki"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Wybierz pliki lub katalogi i kliknij \"OK\""
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Użyj połączenia sieciowego do archiwizacji"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Przez sieć:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Użyj Expect dla SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Tworzenie/przesył kluczy archiwizacji dla SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Prześlij teraz"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Inne (nie drakbackup) klucze już są na miejscu"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Nazwa komputera lub IP."
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 "Katalog (lub moduł) na komputerze, do którego przeniesione zostanie archiwum."
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Nazwa użytkownika"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Zapamiętaj to hasło"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Potrzebna jest nazwa komputera, użytkownika i hasło!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Użyj napędu CD/DVD do archiwizacji"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Wybierz swoje urządzenie CD/DVD"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Wybierz rozmiar swojego nośnika CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Wielosesyjny CD"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "Nośnik CDRW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Czyszczenie nośnika RW (1-wsza sesja)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Wyczyść teraz "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "Nośnik DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "Nośnik DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "Urządzenie DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Nie zdefiniowano urządzenia CD! "
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Użycie taśmy do archiwizacji"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Nazwa urządzenia wykorzystywanego do archiwizacji"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Zarchiwizuj bezpośrednio na taśmie"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Bez przewijania taśmy po archiwizacji"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Czyszczenie taśmy przed archiwizacją"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Wysunięcie taśmy po archiwizacji"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Podaj katalog do zapisu:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Katalog do zapisu"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17717,310 +18612,310 @@ msgstr ""
 "Maksymalny rozmiar\n"
 " dostępny dla 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 "Twardy dysk / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "co godzinę"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "codziennie"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "co tydzień"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "co miesiąc"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "dowolne"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Stycze"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Luty"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Marzec"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Kwiecie"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Maj"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Czerwiec"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Lipiec"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Sierpie"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Wrzesień"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Październik"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Listopad"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Grudzie"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "roda"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Pitek"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Sobota"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Użyj demona"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Wybierz odstęp czasowy pomiędzy każdą archiwizacją"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Dowolny wpis setup/crontab:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Minuta"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Godzina"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Dzień"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Miesic"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Dzień tygodnia"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Wybierz nośnik dla archiwum."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Upewnij się że demon cron jest dołączony do zainstalowanych usług."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Zauważ, że aktualnie wszystkie nośniki \"sieciowe\" także używają\n"
 "twardego dysku."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Wybierz typ kompresji"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Używanie plików .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Wyślij raport pocztą po wykonaniu każdego archiwum do :"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Serwer SMTP dla poczty"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Usuń pliki tar z twardego dysku po archiwizacji na inny nośnik."
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Co"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Gdzie"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Kiedy"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Więcej opcji"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Cel tworzenia archiwum nie został skonfigurowany..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Konfiguracja Drakbackup"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Wybierz gdzie chcesz tworzyć archiwum"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 "Dysk twardy używany do przygotowywania archiwów dla wszystkich nośników"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "przez sieć"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "na płycie CD"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "na urządzeniu taśmowym"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Archiwizuj użytkowników"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (Domyślnie wszyscy użytkownicy)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Wybierz co chcesz archiwizować"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "Archiwizuj system"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Wybierz ręcznie użytkownika"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Wybierz dane do archiwizacji..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -18029,7 +18924,7 @@ msgstr ""
 "\n"
 "Źródła archiwum: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -18038,7 +18933,7 @@ msgstr ""
 "\n"
 "- Pliki systemowe:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18047,7 +18942,7 @@ msgstr ""
 "\n"
 "- Pliki użytkowników:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18056,7 +18951,7 @@ msgstr ""
 "\n"
 "- Inne pliki:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18065,12 +18960,12 @@ msgstr ""
 "\n"
 "- Zapis na twardym dysku w lokalizacji: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tOgraniczenie użycia dysku do %s Mb\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18079,17 +18974,7 @@ msgstr ""
 "\n"
 "- Usuwanie plików tar z twardego dysku po archiwizacji.\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NIE"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "TAK"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18098,22 +18983,22 @@ msgstr ""
 "\n"
 "- Wypalenie na 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 " na urządzeniu: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (wielosesyjny)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18122,12 +19007,17 @@ msgstr ""
 "\n"
 "- Zapis na taśmie na urządzeniu: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tCzyszczenie=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tZarchiwizuje bezpośrednio na taśmie\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18136,7 +19026,7 @@ msgstr ""
 "\n"
 "- Zapis przez %s na komputerze: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18145,7 +19035,7 @@ msgstr ""
 "\t\t użytkownik: %s\n"
 "\t\t ścieżka: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18154,42 +19044,42 @@ msgstr ""
 "\n"
 "- Opcje:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tNie dołączaj plików systemowych\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tArchiwa używają tara oraz bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tArchiwa używają tara oraz gzipa\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tArchiwa używają tylko tara\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tUżywanie plików .backupignore\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tPrześlij list do %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tUżycie serwera SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18198,47 +19088,47 @@ msgstr ""
 "\n"
 "- Demon (%s) przez:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Twardy dysk.\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-Taśma \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Sieć przez FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Sieć przez SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Sieć przez rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Sieć przez webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Brak konfiguracji, kliknij przycisk \"Druid\" lub \"Zaawansowane\".\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18247,27 +19137,27 @@ msgstr ""
 "Lista danych do odtworzenia:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Przywracanie plików systemowych.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - od daty: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Przywróć pliki użytkowników:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Przywracanie innych plików: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18276,130 +19166,130 @@ msgstr ""
 "Lista uszkodzonych danych:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Odznacz lub usuń to następnym razem"
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Pliki archiwum są uszkodzone"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Wszystkie wybrane dane zostały           "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          Pomyślnie przywrócono na %s      "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Konfiguracja odtwarzania    "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK aby odtworzyć inne pliki."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Lista użytkowników do odtworzenia (importowane są tylko najświeższe dane "
 "każdego użytkownika)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Wybierz datę do przywrócenia:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Odtwórz z twardego dysku."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Podaj katalog zawierający archiwa"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Katalog z archiwami"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Wybierz inny nośnik, z którego dane zostaną odtworzone"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Inne nośniki"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Odtwórz system"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Odtwórz użytkowników"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Odtwórz inne"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "wybierz ścieżkę do odtworzenia (zamiast /)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Ścieżka, do której należy odtworzyć"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Stwórz nowe archiwum przed odtworzeniem (tylko archiwa przyrostowe.)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Usuń katalogi użytkowników przed odtwarzaniem."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 "Tekst nazwy pliku do znalezienia (pusty napis pasuje do wszystkich plików):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Przeszukaj archiwa"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Nie znaleziono dopasowań..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Wybrano przywracanie"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18409,7 +19299,7 @@ msgstr ""
 "Przytrzymanie klawisza ctrl pozwala na zaznaczenie\n"
 "wielu plików."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18418,7 +19308,7 @@ msgstr ""
 "Przywróć zaznaczone\n"
 "pozycje katalogów"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18427,17 +19317,17 @@ msgstr ""
 "Przywróć zaznaczone\n"
 "pliki"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Pliki archiwum nie znalezione na %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Odtwórz z CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18446,17 +19336,17 @@ msgstr ""
 "Włóż CD o etykiecie %s\n"
 "do napędu CD zamontowanego w /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Nieprawidłowa etykieta CD. Dysk posiada etykietę %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Przywróć z taśmy"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18465,218 +19355,218 @@ msgstr ""
 "Włóż taśmę z etykietą woluminu %s\n"
 "do napędu %s."
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Nieprawidłowa etykieta taśmy. Taśma posiada etykietę %s."
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Odtwórz przez sieć"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Odtwórz korzystając z protokołu sieciowego: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Nazwa komputera"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Ścieżka do komputera lub modułu"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Wymagane hasło"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Wymagana nazwa użytkownika"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Wymagana nazwa komputera"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Wymagana ścieżka lub moduł"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Pliki odtworzono..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Odtwarzanie nie powiodło się..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "Nie pobrano %s..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Wyszukiwanie plików do odtworzenia"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Odtwórz wszystkie archiwa"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Odtwarzanie własne"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Odtwórz z katalogu"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Nie można znaleźć archiwów odtworzenia...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Sprawdź czy %s znajduje się na właściwej ścieżce"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " i płyta CD jest w napędzie"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "Archiwa na niemontowalnych nośnikach - użyj katalogu do przywrócenia"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD w napędzie - kontynuuj."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Przeglądaj dla nowego archiwum"
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Katalog, z którego należy odtworzyć"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Postęp odtwarzania"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Zapisz"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Zbuduj kopię zapasową"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Przywróć"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Następujące pakiety wymagają zainstalowania:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Wybierz dane do odtworzenia..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Archiwizuj pliki systemowe"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Archiwizuj pliki użytkowników"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Archiwizuj inne pliki"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Postęp całkowity"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Przesyłanie plików przez FTP..."
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Wysyłanie plików..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Archiwizuj teraz z pliku konfiguracyjnego"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Podgląd konfiguracji archiwum."
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Konfiguracja druida"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Konfiguracja zaawansowana"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Podgląd konfiguracji"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "Przejrzyj ostatnie wpisy"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Archiwizuj teraz"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18685,56 +19575,56 @@ msgstr ""
 "Nie znaleziono pliku konfiguracyjnego \n"
 "kliknij przycisk Druid lub Zaawansowane."
 
-#: 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 "Wybór motywu graficznego uruchamiania"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Tryb pracy systemu"
 
-#: 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 "/_Plik"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Plik/_Wyjście"
 
-#: 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 "Zainstaluj tematy"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Utwórz nowy temat"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Użycie graficznego uruchamiania"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18744,12 +19634,17 @@ msgstr ""
 "graficzne uruchamianie, zaznacz tryb graficzny wideo z narzędzia "
 "konfiguracyjnego programu rozruchowego."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Czy chcesz skonfigurować to teraz?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Motyw"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18758,157 +19653,134 @@ msgstr ""
 "Wyświetl temat\n"
 "spod konsoli"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Uruchamiaj środowisko graficzne po uruchomieniu systemu"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Nie, nie chcę automatycznego logowania"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Tak, chcę dla tego użytkownika korzystać z automatycznego logowania"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Domyślny użytkownik"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Domyślny pulpit"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Instalacja %s nie powiodła się. Wystąpił następujący błąd:"
-
-#: 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 ""
-"Aby zgłosić raport o błędach, należy kliknąć przycisk raportu.\n"
-"Otwarte zostanie okno przeglądarki na stronie %s\n"
-" gdzie można znaleźć formularz do wypełnienia. Informacje wyświetlone "
-"powyżej\n"
-"zostaną przesłane do tego serwera."
+"Wybierz tryb wideo, zostanie on zastosowany do każdego wpisu\n"
+"uruchamiania wybranego poniżej. Upewnij się, że twoja karta wideo,\n"
+"obsługuje wybrany tryb."
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Narzędzie raportowania błędów Mandrake"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Narzędzie raportowania błędów Mandrakelinux"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Centrum Sterowania Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Centrum Sterowania Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Narzędzie synchronizacji"
 
-#: 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 "Samodzielne urządzenia"
 
-#: 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 "Kontrola zdalna"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Menedżer oprogramowania"
 
-#: 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 "Narzędzie migracji z 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 "Druidy konfiguracji"
 
-#: 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 ""
-"Aby zgłosić raport o błędach, należy kliknąć przycisk raportu.\n"
-"Otwarte zostanie okno przeglądarki na stronie Anthill\n"
-" gdzie można znaleźć formularz do wypełnienia. Informacje wyświetlone "
-"powyżej\n"
-"zostaną przesłane do tego serwera."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Aplikacja:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Pakiet: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Jądro:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Wydanie: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -18917,117 +19789,132 @@ msgstr ""
 "Nazwa aplikacji\n"
 "lub pełna ścieżka:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Znajdź pakiet"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Zestawienie: "
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "TUTAJ TWÓJ TEKST"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Opis błędu/Informacje systemowe"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "TUTAJ TWÓJ TEKST"
+
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr "Zatwierdź wersję jądra"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Zgłoś cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Zgłoś lspci"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"Aby zgłosić raport o błędach, należy kliknąć przycisk raportu.\n"
+"Otwarte zostanie okno przeglądarki na stronie %s\n"
+" gdzie można znaleźć formularz do wypełnienia. Informacje wyświetlone "
+"powyżej\n"
+"zostaną przesłane do tego serwera."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Raport"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Nie zainstalowano"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Pakiet nie jest zainstalowany"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NIE ZNALEZIONO"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "nawiązywanie połączenia z %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Brak dostępnych przeglądarek! Proszę jakąś zainstalować"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Podaj nazwę pakietu."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Podaj tekst zestawienia."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "nie zdefiniowano"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Zmiana strefy czasowej"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Strefa czasowa - 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 "Czy zegar sprzętowy jest ustawiony na czas GMT"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Sieciowy protokół czasu"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19036,50 +19923,55 @@ msgstr ""
 "Twój komputer może zsynchronizować swój zegar\n"
 " ze zdalnym serwerem czasu przy użyciu NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Włącz sieciowy protokół czasu"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Serwer:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "Nie można wykonać synchronizacji z %s."
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Zresetowanie"
 
-#: 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 ""
 "Konieczna jest instalacja pakietu ntp\n"
 " aby włączyć sieciowy protokół czasu\n"
 "\n"
 "Czy chcesz zainstalować ntp?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Konfiguracja sieci (%d karty)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Router:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Czekaj"
@@ -19089,12 +19981,8 @@ msgstr "Czekaj"
 msgid "Interface"
 msgstr "Interfejs"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Sterownik"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Stan"
@@ -19109,7 +19997,7 @@ msgstr "Nazwa komputera:"
 msgid "Configure hostname..."
 msgstr "Konfiguracja nazwy komputera..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Konfiguracja sieci lokalnej"
@@ -19119,8 +20007,8 @@ msgstr "Konfiguracja sieci lokalnej"
 msgid "Configure Local Area Network..."
 msgstr "Konfiguracja sieci lokalnej..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Zastosuj"
@@ -19130,107 +20018,113 @@ msgstr "Zastosuj"
 msgid "Manage connections"
 msgstr "Zarządzanie połączeniami"
 
-#: standalone/drakconnect:218
-#, fuzzy, c-format
+#: standalone/drakconnect:224
+#, c-format
 msgid "Device selected"
-msgstr "Usuń zaznaczone"
+msgstr "Wybrano urządzenie"
 
-#: standalone/drakconnect:314
-#, fuzzy, c-format
+#: standalone/drakconnect:305
+#, c-format
 msgid "IP configuration"
-msgstr "Konfiguracja CUPS"
+msgstr "Konfiguracja IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Serwery DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Domena wyszukiwania"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "statyczny"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Metryczna"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Kontrola przepływu"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Zakończenie wiersza"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Opóźnienie modemu"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Użycie pliku blokady"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Oczekiwanie na ton wybierania przez dzwonieniem"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "Oczekiwanie zajętości"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Dźwięk modemu"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Włącz"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Klasa nośnika"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nazwa modułu"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Adres MAC"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "Szyna"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Położenie na szynie"
 
-#: 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 "
@@ -19238,20 +20132,20 @@ msgid ""
 msgstr ""
 "Nie wykryto w systemie karty sieciowej. Uruchom program konfiguracji sprzętu."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Usuń interfejs sieciowy"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Wybierz interfejs sieciowy do usunięcia:"
 
-#: 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 ""
@@ -19259,53 +20153,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 "Gratulacje, interfejs sieciowy \"%s\" został pomyślnie usunięty"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Brak IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Brak maski"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "w górę"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "w dół"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Połączony"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Nie połączony"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Rozłącz..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Połącz..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19314,17 +20208,17 @@ msgstr ""
 "Ostrzeżenie, wykryto inne połączenie Internetowe, być może używające twojej "
 "sieci"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Wyłącz teraz"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Aktywuj teraz"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19333,81 +20227,101 @@ msgstr ""
 "Nie skonfigurowano jeszcze żadnego interfejsu.\n"
 "Zacznij konfigurację przez kliknięcie na \"Konfiguruj\""
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Konfiguracja sieci lokalnej"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Karta %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protokół uruchamiania"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Uruchamiany przy starcie"
 
-#: 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 ""
 "Ten interfejs nie został jeszcze skonfigurowany.\n"
-"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania Mandrake"
+"Uruchom druida \"Dodaj interfejs\" z Centrum Sterowania 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 ""
-"Nie skonfigurowano jeszcze żadnego połączenia z Internetem.\n"
-"Uruchom \"Dostęp do Internetu\" w centrum sterowania."
+"Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom "
+"asystenta \"Dodaj połączenie\" z Centrum Sterowania Mandrakelinux"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Konfiguracja połączenia z Internetem"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Trzeci serwer DNS (opcjonalnie)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Konfiguracja połączenia z Internetem"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Dostęp do Internetu"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Rodzaj połączenia:"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Status:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (Menedżer wyświetlania GNOME)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (Menedżer wyświetlania KDE)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Menedżer wyświetlania Mandrakelinux)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (Menedżer wyświetlania X)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Wybieranie menedżera wyświetlania"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19418,92 +20332,101 @@ msgstr ""
 "do systemu z uruchomionym systemem X Window oraz obsługuje uruchamianie\n"
 "kilku różnych sesji X w tym samym czasie na lokalnym komputerze."
 
-#: 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 "Zmiana została wprowadzona, czy chcesz ponownie uruchomić usługę 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 ""
+"Zostaną zamknięte wszystkie uruchomione programy oraz zostanie utracona "
+"bieżąca sesja. Czy na pewno chcesz uruchomić ponownie usługę dm?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Tworzenie dysku startowego"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Ogólne"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Urządzenie"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Wersja jądra"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Zaawansowane preferencje"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Rozmiar"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Dodatkowe argumenty mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "wymuś"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "pomiń moduły RAID"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "jeśli potrzebny"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "pomiń moduły SCSI"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Dodaj moduł"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Usuń moduł"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Upewnij się że nośnik jest obecny dla urządzenia %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19512,22 +20435,23 @@ msgstr ""
 "Brak nośnika lub jest on tylko do odczytu dla urządzenia %s.\n"
 "Włóż go do napędu."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Nie można rozdzielić procesów: %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Zakończono tworzenie dyskietki"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Tworzenie dyskietki startowej zostało pomyślnie zakończone\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"
@@ -19670,7 +20594,7 @@ msgstr "Lista czcionek"
 msgid "About"
 msgstr "Informacje"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Odinstaluj"
@@ -19680,10 +20604,11 @@ msgstr "Odinstaluj"
 msgid "Import"
 msgstr "Import"
 
-#: 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"
@@ -19692,7 +20617,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (oryginalna wersja)\n"
@@ -19701,7 +20626,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"
@@ -19736,7 +20661,7 @@ msgstr ""
 "z programem. W przeciwnym razie napisz do Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19767,12 +20692,12 @@ msgstr ""
 "\t  autorstwa Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Konwersja plików czcionek ttf do czcionek afm i pfb\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Wybierz aplikacje obsługujące czcionki :"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19787,122 +20712,127 @@ msgstr ""
 "Można zainstalować czcionki w zwykły sposób. W rzadkich przypadkach, błędne "
 "czcionki mogą zawiesić serwer 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 "Typowe drukarki"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Wybierz plik czcionki lub katalog oraz kliknij \"Dodaj\""
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Wybór plików"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Nie wybrano żadnej czcionki"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Importowanie czcionek"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Instalacja czcionek"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "kliknij tutaj jeśli jesteś pewien/pewna."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "tutaj w przeciwnym przypadku."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Odznacz wszystko"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Zaznacz wszystko"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Usuń listę"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Importowanie czcionek"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Testy początkowe"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Skopiuj czcionki do systemu"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Zainstaluj i skonwertuj czcionki"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Konfiguracja poinstalacyjna"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Usuń czcionki z systemu"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Odinstalowywanie wykańczające"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Współdzielenie połączenia z Internetem"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Niestety obsługiwane są jedynie jądra serii 2.4 i wyższe."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Współdzielenie połączenia z Internetem jest wyłączone"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -19915,39 +20845,39 @@ msgstr ""
 "\n"
 "Co chcesz zrobić?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "włączyć"
 
-#: 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 "rekonfigurować"
 
-#: 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 "zwolnij"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Włączenie serwerów..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Współdzielenie połączenia z Internetem jest teraz włączone"
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Współdzielenie połączenia z Internetem jest włączone"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -19960,22 +20890,22 @@ msgstr ""
 "\n"
 "Co chcesz zrobić?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "wyłączyć"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Wyłączenie serwerów..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Współdzielenie połączenia z Internetem jest wyłączone."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19998,27 +20928,27 @@ msgstr ""
 "Uwaga:  wymagana jest dedykowana karta sieciowa włączająca komputer w sieć "
 "lokalną (LAN)"
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfejs %s (moduł %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interfejs %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Nie wykryto w systemie karty sieciowej!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Interfejs sieciowy"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20033,7 +20963,12 @@ msgstr ""
 "\n"
 "Można skonfigurować sieć lokalną (LAN) przy wykorzystaniu tej karty."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Wybierz interfejs sieciowy"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20042,12 +20977,12 @@ msgstr ""
 "Wskaż, która karta sieciowa będzie połączona\n"
 "z siecią lokalną (LAN)."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Interfejs sieciowy już został skonfigurowany"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20062,27 +20997,27 @@ msgstr ""
 "\n"
 "Można zrobić to ręcznie lecz trzeba znać odpowiednie ustawienia."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automatyczna rekonfiguracja"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Nie (tylko eksperci)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Wyświetl konfigurację bieżącego interfejsu"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Konfiguracja bieżącego interfejsu"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20099,7 +21034,7 @@ msgstr ""
 "Maska IP: %s\n"
 "Sterownik: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20126,12 +21061,12 @@ msgstr ""
 "DHCP.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Adres sieci lokalnej"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20144,74 +21079,74 @@ msgstr ""
 "W tym miejscu można określić różne opcje dla konfiguracji serwera DHCP.\n"
 "Jeśli nie rozumiesz znaczenia opcji, po prostu nie zmieniaj jej wartości."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Ten) Numer IP serwera DHCP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Numer IP serwera DNS"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "Wewnętrzna nazwa domeny"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "Zakres początkowy DHCP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "Zakres końcowy DHCP"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Domyślna dzierżawa (w sekundach)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Maksymalna dzierżawa (w sekundach)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Przekonfiguruj interfejs oraz serwer DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Sieć lokalna nie kończy się na \".0\", zwolniono."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "W bieżącej konfiguracji wykryto możliwy konflikt adresów sieciowych: %s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Konfiguracja..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Konfiguracja skryptów, instalowanie programów, uruchamianie serwerów..."
 
-#: 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 "Problemy z instalacją pakietu %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20228,14 +21163,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"
 "To jest wolnodostępne oprogramowanie i może być rozpowszechniane zgodnie\n"
 "z zasadami licencji GNU GPL.\n"
 "\n"
@@ -20263,7 +21198,12 @@ msgstr ""
 " --doc <odnośnik>      - odnośnik do innej strony web ( dla strony\n"
 "                         powitalnej WM)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Centrum Pomocy Mandrakelinux"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20272,7 +21212,7 @@ msgstr ""
 "%s nie może zostać wyświetlony\n"
 " Brak wpisu pomocy dla tego typu\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20281,42 +21221,42 @@ msgstr ""
 "W systemie nie zainstalowano przeglądarki. Zainstaluj jakąś, jeśli chcesz "
 "przeglądać system pomocy"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Ustawienia systemowe"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Dowolne ustawienia"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Dowolne i systemowe ustawienia"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Edytowalne"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Path"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Użytkownik"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Prawa dostępu"
@@ -20378,9 +21318,9 @@ msgid "Delete selected rule"
 msgstr "Usuń zaznaczoną regułę"
 
 #. -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 "Edycja"
@@ -20390,47 +21330,65 @@ msgstr "Edycja"
 msgid "Edit current rule"
 msgstr "Edytuj bieżącą regułę"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "przeglądaj"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "użytkownik"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "grupa"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "inne"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Odczyt"
 
-#: 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 "Włącz \"%s\" aby odczytać plik"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Zapis"
 
-#: 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 "Włącz \"%s\" aby zapisać plik"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Uruchom"
 
-#: 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 "Włącz \"%s\" aby uruchomić plik"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Bit lepkości"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -20439,52 +21397,52 @@ msgstr ""
 "Używany dla katalogu:\n"
 " tylko właściciel katalogu lub pliku w tym katalogu może go skasować"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Ustaw UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "użyj id właściciela dla wykonywania"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Ustaw GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "użyj id grupy dla wykonywania"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Użytkownik :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Grupa :"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Bieżący użytkownik"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Po zaznaczeniu, nie będzie możliwa zmiana właściciela oraz grupy"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Wybór ścieżki"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Właściwość"
@@ -20528,7 +21486,7 @@ msgstr ""
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
-msgstr "Wybierz kartę sieciową, którą ma być wykorzystywana na serwer dhcp."
+msgstr "Wybierz kartę sieciową, którą ma być wykorzystywana na serwer DHCP."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -20611,54 +21569,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Położenie pliku auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "WSZYSTKO"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOKALNE"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
+#: standalone/draksec:53
 #, c-format
-msgid "default"
-msgstr "domyślna"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorowanie"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "nie"
+msgid "Ignore"
+msgstr "Ignorowanie"
 
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "tak"
-
-#. -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 "
@@ -20696,12 +21642,14 @@ msgstr ""
 "komputera.\n"
 "\n"
 "\n"
-"Administrator bezpieczeństwa jest jedyną osobą, która będzie otrzymywała\n"
-"zawiadomienia dotyczące bezpieczeństwa jeśli ustawiono opcję \"Alarmy "
-"bezpieczeństwa\".\n"
+"<span weight=\"bold\">Administrator bezpieczeństwa</span> jest jedyną osobą, "
+"która będzie otrzymywała\n"
+"zawiadomienia dotyczące bezpieczeństwa jeśli ustawiono opcję <span weight="
+"\"bold\">Alarmy bezpieczeństw</span>.\n"
 "To może być nazwa użytkownika lub adres e-mail.\n"
 "\n"
-"Menu poziomu bezpieczeństwa umożliwia wybranie jednej z sześciu wstępnie\n"
+"Menu <span weight=\"bold\">poziomu bezpieczeństwa</span> umożliwia wybranie "
+"jednej z sześciu wstępnie\n"
 "skonfigurowanych poziomów bezpieczeństwa udostępnionych przez msec. Poziomy "
 "te\n"
 "są od słabego, łatwego w użyciu poziomu bezpieczeństwa aż do paranoidalnej\n"
@@ -20734,62 +21682,56 @@ msgstr ""
 "poprzedniego, lecz system jest całkowicie zamknięty i funkcje zabezpieczeń\n"
 "są na maksymalnym poziomie."
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Opis pól:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(domyślna wartość: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Poziom bezpieczeństwa:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Alarmy bezpieczeństwa:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Administrator zabezpieczeń:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Podstawowe opcje"
 
-#: 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 ""
-"Poniższe opcje mogą zostać ustawione w celu dostosowania\n"
-"poziomu bezpieczeństwa systemu. Jeśli potrzebne są wyjaśnienia,\n"
-"zajrzyj do podpowiedzi.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Opcje sieci"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Opcje systemowe"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Okresowe sprawdzanie"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Proszę czekać, ustawianie poziomu bezpieczeństwa..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Proszę czekać, ustawianie opcji zabezpieczeń..."
@@ -20799,7 +21741,8 @@ msgstr "Proszę czekać, ustawianie opcji zabezpieczeń..."
 msgid "No Sound Card detected!"
 msgstr "Nie wykryto karty dźwiękowej!"
 
-#: 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-"
@@ -20820,7 +21763,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -20961,15 +21904,15 @@ msgstr "Wyświetlanie logo na konsoli"
 msgid "Make kernel message quiet by default"
 msgstr "Wyłączone domyślnie komunikaty jądra"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Uwaga"
 
-#: 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 "Ten temat nie posiada jeszcze ekranu powitalnego w %s!"
 
 #: standalone/draksplash:167
@@ -20982,101 +21925,114 @@ msgstr "wybierz obraz"
 msgid "saving Bootsplash theme..."
 msgstr "zapisywanie ekranu powitalnego tematu..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Wybór koloru paska postępu"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "należy wybrać plik obrazu!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Tworzenie podglądu..."
 
 #. -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 "Podgląd tematu %s ekranu powitalnego (%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 ""
+"Obraz \"%s\" nie może zostać załadowany z poniższego powodu:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Połączono przez port szeregowy lub połączenie USB"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Dodaj urządzenie UPS"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 "Witaj w narzędziu konfiguracji UPS.\n"
 "\n"
 "W tym miejscu można ustawić nowy UPS w systemie.\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 ""
 "Zostanie dodane urządzenie UPS.\n"
 "\n"
 "Czy chcesz automatycznie wykryć urządzenia UPS połączone do komputera?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Automatyczne wykrywanie"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Wykrywanie w toku"
 
-#: 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 "Gratulacje"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr "Druid pomyślnie dodał poniższe urządzenia UPS:"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Nie znaleziono nowych urządzeń UPS"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Konfiguracja sterownika UPS"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Wybierz model urządzenia UPS."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Producent / Model:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21085,88 +22041,88 @@ msgstr ""
 "Konfigurowany jest UPS \"%s\" z \"%s\".\n"
 "Wypełnij pola nazwy, sterownika oraz portu."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "Nazwa UPS-a"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr "Sterownik zarządzający UPS-em"
 
-#: 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 "Port, do którego jest połączony UPS"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "Druid pomyślnie skonfigurował nowe urządzenie UPS \"%s\"."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Urządzenia UPS"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "Nazwa"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "Użytkownicy UPS"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Lista kontroli dostępu (ACL)"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr "Maska IP"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Reguły"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Czynność"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Poziom"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "Nazwa 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 "Witaj w narzędziach konfiguracyjnych UPS"
@@ -21188,7 +22144,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Konfiguracja połączenia VPN została już wykonana.\n"
 "\n"
@@ -21218,7 +22174,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Konfiguracja połączenia VPN została już wykonana.\n"
 "\n"
@@ -21303,7 +22259,7 @@ msgstr "Moduł jądra."
 #: 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"
@@ -21333,13 +22289,13 @@ msgstr "Plik konfiguracyjny"
 #: 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 ""
 "Krok konfiguracji!\n"
 "\n"
@@ -21373,12 +22329,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 ""
 "Zawartość pliku %s\n"
 "jest podzielona na sekcje.\n"
@@ -21435,7 +22391,7 @@ msgstr "wpisy ipsec.conf"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -21472,7 +22428,7 @@ msgstr "zwykłe połączenie"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Istnieje !"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21712,7 +22668,7 @@ msgstr "Nazwy sekcji"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Nie można zmodyfikować !"
 
 #: standalone/drakvpn:591
@@ -21720,14 +22676,14 @@ msgstr "Nie można zmodyfikować !"
 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 ""
 "Nie można modyfikować tej sekcji.\n"
 "\n"
-"Ta sekcja jest wymagana dla Freswan 2.X.\n"
+"Ta sekcja jest wymagana dla Freeswan 2.X.\n"
 "Należy określić wersję 2.0 na początku\n"
 "pliku %s oraz ewentualnie wyłączyć\n"
 "lub włączyć żądane szyfrowanie.\n"
@@ -21778,7 +22734,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 ""
@@ -21812,7 +22768,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"
@@ -21854,7 +22810,7 @@ msgstr "wpisy racoonf.conf"
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -21908,23 +22864,23 @@ msgstr "typ ścieżki"
 #: 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 ""
@@ -22071,7 +23027,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"
@@ -22099,7 +23055,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"
@@ -22124,7 +23080,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"
@@ -22152,7 +23108,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"
@@ -22172,7 +23128,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 ""
 "definiuje grupę wykładników Diffiego-Hellmana.\n"
@@ -22192,11 +23148,11 @@ msgstr "Liczba czasu życia"
 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"
@@ -22218,22 +23174,39 @@ msgstr "Jednostka czasu życia"
 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"
 msgstr ""
+"określa czas życia (lifetime) proponowany w fazie 1 negocjacj.\n"
+"Dowolna propozycja może być zaakceptowana, zaś\n"
+"atrybuty nie zostaną zaproponowane drugiej stronie\n"
+"jeśli nie zostaną one określone. Mogą one być\n"
+"indywidualnie określone dla każdej propozycji.\n"
+"\n"
+"Przykłady:\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"
+"\n"
+"Tak więc jednostkami czasu życia są 'min', 'min', 'sec' 'sec', 'sec' oraz "
+"'hour'.\n"
 
 #: standalone/drakvpn:1031 standalone/drakvpn:1116
 #, c-format
@@ -22253,7 +23226,7 @@ msgstr "Algorytm kompresji"
 #: standalone/drakvpn:1036
 #, c-format
 msgid "deflate"
-msgstr ""
+msgstr "kompresja (deflate)"
 
 #: standalone/drakvpn:1043
 #, c-format
@@ -22269,7 +23242,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]"
@@ -22431,7 +23404,7 @@ msgstr "Mój identyfikator"
 #, 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"
@@ -22440,7 +23413,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"
@@ -22449,12 +23422,12 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 "określa identyfikator przesyłany do zdalnego komputera oraz\n"
-"typ używany w negocjacji 1 fazy.  address, fqdn, user_fqdn,\n"
+"typ używany w negocjacji 1 fazy.  address, FQDN, user_fqdn,\n"
 "keyid oraz asn1dn mogą być używane jako idtype.\n"
 "Są one używane w następujący sposób:\n"
 "\tmy_identifier address [address];\n"
@@ -22462,7 +23435,7 @@ msgstr ""
 "\t\ttyp jeśli nie określono używanego identyfikatora.\n"
 "\tmy_identifier user_fqdn string;\n"
 "\t\ttypem jest USER_FQDN (pełna nazwa domeny użytkownika).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\ttypem jest FQDN (pełna nazwa domeny).\n"
 "\tmy_identifier keyid file;\n"
 "\t\ttypem jest  KEY_ID.\n"
@@ -22490,9 +23463,9 @@ msgstr "Propozycja"
 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 ""
@@ -22500,7 +23473,7 @@ msgstr ""
 "Ta dyrektywa musi być zdefiniowana.\n"
 "Dostępne są poniższe algorytmy:\n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "To wyrażenie nie powinno być używane dla innych przekształceń."
 
@@ -22596,6 +23569,11 @@ msgstr "wymaga"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "domyślna"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "używa"
 
@@ -22604,67 +23582,67 @@ msgstr "używa"
 msgid "unique"
 msgstr "unikat"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "USA (broadcast)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "Usa (kablówka)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "USA (kabel-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Kanada (kablówka)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Japonia (broadcast)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japonia (kablówka)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Chiny (broadcast)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Europa Zachodnia"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Europa Wschodnia"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Francja [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Nowa Zelandia"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Telewizja kablowa Australian Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -22673,47 +23651,48 @@ msgstr ""
 "Wprowadź standard sygnału,\n"
 "oraz kraj"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Standard TV :"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Obszar :"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Trwa przeszukiwanie kanałów TV ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Przeszukiwanie kanałów TV"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Wystąpił błąd podczas przeszukiwania kanałów TV"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Miłego dnia!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Teraz można uruchomić xawtv (pod X Window!) !\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Nie wykryto karty telewizyjnej!"
 
-#: 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-"
@@ -22734,17 +23713,17 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Alternatywne sterowniki"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "lista alternatywnych sterowników dla tej karty dźwiękowej"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
@@ -22752,33 +23731,7 @@ msgstr ""
 "to jest fizyczna szyna, do której podłączone jest urządzenie (np: PCI, "
 "USB, ...)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Kanał"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "Kanał EIDE/SCSI"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomipsy"
-
-#: 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 ""
-"jądro GNU/Linux musi uruchomić pętlę obliczeniową podczas uruchamiania\n"
-"do inicjalizacji licznika czasu. Jej wyniki są przechowywane jako bogomipsy "
-"jako sposób na \"sprawdzenie możliwości\" procesora."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Identyfikacja szyny"
@@ -22805,63 +23758,261 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Rozmiar cache"
+msgid "Drive capacity"
+msgstr "Funkcje sterownika"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "Rozmiar pamięci podręcznej procesora (drugiego poziomu)"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "specjalne funkcje sterownika (możliwość wypalania i/lub obsługa DVD)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Funkcje sterownika"
+msgid "this field describes the device"
+msgstr "to pole opisuje urządzenie"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "specjalne funkcje sterownika (możliwość wypalania i/lub obsługa DVD)"
+msgid "Old device file"
+msgstr "Stary plik urządzenia"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
+msgstr "stara statyczna nazwa urządzenia używana w pakiecie dev"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
+msgid "New devfs device"
+msgstr "Nowe urządzenie devfs"
+
+#: standalone/harddrake2:38
+#, c-format
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "nowa dynamiczna nazwa urządzenia wygenerowana przez devfs jądra"
+
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
+#, c-format
+msgid "Module"
+msgstr "Moduł"
+
+#: standalone/harddrake2:41
+#, c-format
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "moduł jądra GNU/Linux obsługujący to urządzenie"
+
+#: standalone/harddrake2:42
+#, c-format
+msgid "Extended partitions"
+msgstr "Partycje rozszerzone"
+
+#: standalone/harddrake2:42
+#, c-format
+msgid "the number of extended partitions"
+msgstr "liczba partycji rozszerzonych"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Geometry"
+msgstr "Rozmiar"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "Rozmiar cylindry/głowice/sektory dysku"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "Disk controller"
+msgstr "Kontrolery dysku"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
+msgstr "kontroler dysku po stronie hosta"
+
+#: standalone/harddrake2:45
+#, c-format
+msgid "class of hardware device"
+msgstr "klasa urządzenia"
+
+#: 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 twardego dysku"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "port drukarki sieciowej"
+
+#: standalone/harddrake2:48
+#, c-format
+msgid "Primary partitions"
+msgstr "Partycje podstawowe"
+
+#: standalone/harddrake2:48
+#, c-format
+msgid "the number of the primary partitions"
+msgstr "liczba partycji podstawowych"
+
+#: standalone/harddrake2:49
+#, c-format
+msgid "the vendor name of the device"
+msgstr "nazwa producenta urządzenia"
+
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr "Szyna PCI #"
+
+#: standalone/harddrake2:50
+#, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "szyna PCI, do której włączone jest urządzenie"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "Urządzenie PCI #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "Numer urządzenia PCI"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "Funkcja PCI #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "numer funkcji PCI"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "ID producenta"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "to jest standardowy numer identyfikacyjny producenta"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "ID urządzenia"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "to jest liczbowy identyfikator urządzenia"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "ID poddostawcy"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "to jest podrzędny numeryczny identyfikator poddostawcy"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "ID urządzenia podrzędnego"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "to jest podrzędny numeryczny identyfikator urządzenia"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "ID urządzenia USB"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ".."
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomipsy"
+
+#: 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 ""
+"jądro GNU/Linux musi uruchomić pętlę obliczeniową podczas uruchamiania\n"
+"do inicjalizacji licznika czasu. Jej wyniki są przechowywane jako bogomipsy "
+"jako sposób na \"sprawdzenie możliwości\" procesora."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Rozmiar cache"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "Rozmiar pamięci podręcznej procesora (drugiego poziomu)"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
 msgid "Coma bug"
 msgstr "Błąd przecinka"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:65
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr "czy ten procesor posiada błąd przecinka Cyrix 6x86"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "Cpuid family"
 msgstr "Rodzina procesora"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "rodzina procesora (np. 6 dla klasy i686)"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "Cpuid level"
 msgstr "Poziom procesora"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr ""
 "Poziom informacyjny, do którego można mieć dostęp za pośrednictwem "
 "instrukcji procesora"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Częstotliwość (MHz)"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -22872,68 +24023,22 @@ msgstr ""
 "przybliżeniu być związane z liczbą instrukcji procesora, które mogą być "
 "wykonane w czasie jednej sekundy)"
 
-#: standalone/harddrake2:41
-#, c-format
-msgid "this field describes the device"
-msgstr "to pole opisuje urządzenie"
-
-#: standalone/harddrake2:42
-#, c-format
-msgid "Old device file"
-msgstr "Stary plik urządzenia"
-
-#: standalone/harddrake2:43
-#, c-format
-msgid "old static device name used in dev package"
-msgstr "stara statyczna nazwa urządzenia używana w pakiecie dev"
-
-#: standalone/harddrake2:44
-#, c-format
-msgid "New devfs device"
-msgstr "Nowe urządzenie devfs"
-
-#: standalone/harddrake2:45
-#, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "nowa dynamiczna nazwa urządzenia wygenerowana przez devfs jądra"
-
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
-#, c-format
-msgid "Module"
-msgstr "Moduł"
-
-#: standalone/harddrake2:48
-#, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "moduł jądra GNU/Linux obsługujący to urządzenie"
-
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "Utwórz nową partycję"
-
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "numer procesora"
-
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "Flags"
 msgstr "Flagi"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Flagi procesora wykryte przez jądro"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Błąd Fdiv"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -22945,55 +24050,45 @@ msgstr ""
 "zamierzonej precyzji podczas przeprowadzania operacji dzielenia z użyciem "
 "liczb zmiennoprzecinkowych"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "Obecność koprocesora"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "tak - oznacza, że procesor posiada koprocesor arytmetyczny"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Czy koprocesor posiada wektor przerwań"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 "tak - oznacza, że kooprocesor arytmetyczny posiada dołączony wektor  przerwań"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "Błąd F00F"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "wczesne wersje pentium posiadały błędy i zawieszały system podczas "
 "wykonywania kodu bajtowego F00F"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "Ponów"
-
-#: 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 "Błąd instrukcji halt"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23002,126 +24097,65 @@ msgstr ""
 "Niektóre wczesne czipy i486DX-100 nie potrafiły poprawnie powrócić do trybu "
 "operacyjnego po wykonaniu instrukcji \"halt\""
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Format dyskietek"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "format dyskietek akceptowanych przez urządzenie"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "podgeneracja procesora"
 
-#: standalone/harddrake2:62
-#, c-format
-msgid "class of hardware device"
-msgstr "klasa urządzenia"
-
-#: 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 twardego dysku"
-
-#: 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 "generacja procesora (np. 8 dla Pentium III, ...)"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Nazwa modelu"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "oficjalna nazwa producenta procesora"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Liczba przycisków"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "liczba przycisków myszy"
-
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "nazwa procesora"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "port drukarki sieciowej"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "ID procesora"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "numer procesora"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "Formatowanie"
-
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "numer procesora"
-
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Numeracja modelu"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "numeracja procesora (numer modelu podrzędnego (generacji))"
 
-#: standalone/harddrake2:72
-#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "typ szyny, do której podłączona jest mysz"
-
-#: standalone/harddrake2:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "nazwa producenta urządzenia"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "nazwa producenta procesora"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Ochrona przed zapisem"
 
-#: 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 ""
@@ -23130,60 +24164,193 @@ msgstr ""
 "niesprawdzonego dostępu jądra do pamięci użytkownika (coś jak strażnik "
 "chroniący przed błędami)"
 
-#. -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 dyskietek"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "format dyskietek akceptowanych przez urządzenie"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Kanał"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "Kanał EIDE/SCSI"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Identyfikator dysku"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "zazwyczaj numer seryjny dysku"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Logiczny numer jednostki"
+
+#: 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 ""
+"numer docelowy SCSI (LUN), urządzania SCSI podłączone do hosta są unikalnie\n"
+"identyfikowane za pomocą numeru kanału, docelowego id oraz logicznego numeru "
+"jednostki"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Plik urządzenia"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+"plik urządzenia wykorzystywany do skomunikowania się ze sterownikiem jądra "
+"dla myszythe device file used to communicate with the kernel driver for the "
+"mouse"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr "Emulowane kółko"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "określenie czy kółko jest emulowane czy nie"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "typ myszy"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "nazwa myszy"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Liczba przycisków"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "liczba przycisków myszy"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "typ szyny, do której podłączona jest mysz"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr "Protokół myszy używany przez X11"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "protokół używany przez środowisko graficzne związany z myszą"
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identyfikacja"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Połączenie"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Możliwości"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Błędy"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partycje"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Funkcje"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Opcje"
 
-#: 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 "/Pomo_c"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Automatycznie wykryj _drukarki"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Automatycznie wykryj _modemy"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Automatycznie wykryj urządzenia _jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Zakończ"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Opis pól"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Pomoc Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Opis pól:\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 "
@@ -23192,68 +24359,75 @@ msgstr ""
 "Po wybraniu urządzenia, można odczytać informacje o urządzeniu wyświetlone w "
 "prawej ramce (\"Informacje\")"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Zgłoś błąd"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/O _programie..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Informacje o 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 ""
-"To jest Harddrake, narzędzie konfiguracji sprzętu Mandrake.\n"
+"To jest Harddrake, narzędzie konfiguracji sprzętu Mandrakelinux.\n"
 "<span foreground=\"royalblue3\">Wersja:</span> %s\n"
 "<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 wersja %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Wykryty sprzęt"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Konfiguracja modułu"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Uruchom narzędzie konfiguracyjne"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "nieznany"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Różne"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -23261,107 +24435,112 @@ msgstr ""
 "Kliknij urządzenie w lewym drzewie w celu pobrania informacji, które zostaną "
 "tutaj wyświetlone."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "drugorzędny"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "główny"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "nagrywarka"
 
-#: 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 "Wybierz układ klawiatury."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Czy chcesz używać BackSpace zamiast Delete dla konsoli?"
 
-#: 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 "Zostały dokonane zmiany, wyloguj się by je zastosować"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Dzienniki narzędzi Mandrake"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Dzienniki narzędzi Mandrakelinux"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Tylko dla wybranego dnia"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Plik/_Nowy"
 
-#: 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 "/Plik/_Otwórz"
 
-#: 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 "/Plik/Zapi_sz"
 
-#: 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 "/Plik/Z_apisz jako"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Plik/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Opcje/Test"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Pomoc/O _programie"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
@@ -23370,7 +24549,7 @@ msgstr ""
 "_:to jest plik dziennika auth.log\n"
 "Uwierzytelnianie"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
@@ -23379,7 +24558,7 @@ msgstr ""
 "_:to jest plik dziennika user.log\n"
 "Użytkownik"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
@@ -23388,7 +24567,7 @@ msgstr ""
 "_:to jest plik dziennika /var/log/messages\n"
 "Komunikaty"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
@@ -23397,117 +24576,112 @@ msgstr ""
 "_:to jest plik dziennika /var/log/syslog\n"
 "Dziennik systemowy"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "wyszukiwanie"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Narzędzie od monitorowania logów"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Pasuje"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "lecz nie zawiera"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Wybierz plik"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Zawartość pliku"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Alarm Mail"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
-msgstr "Druid raportowania nieoczekiwania napotkał błąd:"
+msgid "The alert wizard has failed unexpectedly:"
+msgstr "Druid raportowania nieoczekiwanie napotkał błąd:"
 
 #: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "proszę czekać, przetwarzanie pliku: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Serwer WWW Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Resolver nazwy domenowej"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "Serwer FTP"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Serwer pocztowy Postfix"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Serwer Samba"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "Serwer SSH"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Usługa webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Usługa Xinetd"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Konfiguracja systemu powiadamiania pocztą"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Zatrzymaj system raportowania pocztą"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Konfiguracja powiadamiania Mail"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23518,17 +24692,17 @@ msgstr ""
 "\n"
 "W tym miejscu można ustawić system powiadamiania.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Co chcesz zrobić?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Ustawienia usług"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
@@ -23536,17 +24710,17 @@ msgid ""
 msgstr ""
 "Otrzymasz ostrzeżenie jeśli jedna lub więcej zaznaczonych usług nie zadziała"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Wczytaj ustawienia"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Otrzymasz ostrzeżenie jeśli obciążenie będzie większe niż ta wartość"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
@@ -23555,32 +24729,32 @@ msgstr ""
 "_: load oznacza tutaj rzeczownik, obciążenie systemu\n"
 "Obciążenie"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Konfiguracja alarmu"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Wprowadź poniżej swój adres email "
 
-#: 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 podaj nazwę (lub IP) serwera SMTP, którego chcesz używać"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Druid pomyślnie skonfigurował zawiadomienie o poczcie."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Druid pomyślnie wyłączył powiadamianie o poczcie."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Zapisz jako.."
@@ -23605,27 +24779,75 @@ msgstr "Test myszy"
 msgid "Please test your mouse:"
 msgstr "Przetestuj swoją mysz:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "Interfejs sieciowy %s jest włączony"
+
+#. -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 ""
+"Interfejs sieciowy %s jest wyłączony. Kliknij opcję \"Skonfiguruj sieć\""
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Połącz %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Rozłącz %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Monitorowanie sieci"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Konfiguracja sieci"
+
+#. -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 "Odśwież"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Pomoc przez Internet"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Uruchamiaj przy starcie"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Monitorowanie sieci"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Statystyki globalne"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Chwilowa"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Średnio"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23634,7 +24856,7 @@ msgstr ""
 "Szybkość\n"
 "wysyłania:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23643,7 +24865,7 @@ msgstr ""
 "Szybkość\n"
 "odbierania:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23652,81 +24874,76 @@ msgstr ""
 "Czas\n"
 "połączenia: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Używanie tej samej skali dla odebranych i przesłanych"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Proszę czekać, testowanie połączenia..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Rozłączanie od Internetu "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Połączenie z Internetem "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Rozłączanie od Internetu zakończone niepowodzeniem."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Rozłączanie od Internetu zakończone powodzeniem."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Próba połączenia zakończona powodzeniem."
 
-#: 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 ""
 "Próba połączenia zakończona niepowodzeniem.\n"
-"Sprawdź konfigurację w Centrum Sterowania Mandrake."
+"Sprawdź konfigurację w Centrum Sterowania Mandrakelinux."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Konfiguracja kolorów"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "wysłano: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "odebrano: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "średnio"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Pomiar lokalny"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "przesłano"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "odebrano"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23735,173 +24952,168 @@ msgstr ""
 "Ostrzeżenie, wykryto inne połączenie Internetowe, być może używające twojej "
 "sieci"
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Rozłącz %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Połącz %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Nie skonfigurowano połączenia z Internetem"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Wczytywanie konfiguracji drukarki... proszę czekać"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Odczytywanie danych zainstalowanych drukarek..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "Narzędzie do zarządzania drukarkami %s"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Czynności"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Dodaj drukarkę"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Ustaw jako _domyślne"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Tryb zaawansowany"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/O_dśwież"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Dodaj drukarkę"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Skonfiguruj CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Wyszukaj:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Nazwa drukarki"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Rodzaj połączenia"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Nazwa serwera"
 
 #. -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 "Dodaj drukarkę"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Dodaje nową drukarkę do systemu"
 
 #. -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 "Ustaw jako domyślną"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Ustaw wybraną drukarkę jako domyślną"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Edycja wybranej drukarki"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Usuń zaznaczoną drukarkę"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Odświeża listę"
 
 #. -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 "Konfiguracja CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Konfiguracja systemu wydruku CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Włączone"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Autorzy: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Zarządzanie drukarkami \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -23912,12 +25124,12 @@ msgstr ""
 "\n"
 "Czy chcesz zainstalować pakiety SANE?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Przerywanie Scannerdrake."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -23925,78 +25137,67 @@ msgstr ""
 "Nie można zainstalować pakietów wymaganych do skonfigurowania skanera przy "
 "użyciu narzędzia scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Zostanie teraz uruchomione narzędzie scannerdrake."
 
-#: 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 "Wyszukiwanie skonfigurowanych skanerów..."
 
-#: 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 "Wyszukiwanie nowych skanerów..."
 
-#: 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 "Odświeżanie listy skonfigurowanych skanerów ..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s nie jest obsługiwany przez tą wersję %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "Znaleziono %s na %s, skonfigurować automatycznie?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s nie ma w bazie skanerów, skonfigurować ręcznie?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Wybierz model skanera"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Wykryty model: %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 "Skaner %s nie jest znany tej wersji Scannerdrake."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Nie instaluj pliku 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 "
@@ -24005,12 +25206,12 @@ msgstr ""
 "Możliwe, że twój %s wymaga załadowania swojego firmware podczas "
 "każdorazowego włączenia."
 
-#: 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 "W tym przypadku, można zezwolić abybyło to wykonywane automatycznie."
 
-#: 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 "
@@ -24019,7 +25220,7 @@ msgstr ""
 "Aby to uczynić, należy dostarczyć plik firmware dla twojego skanera, tak aby "
 "można go było zainstalować."
 
-#: 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 "
@@ -24028,22 +25229,22 @@ msgstr ""
 "Znajdziesz ten plik na płycie CD lub dyskietce dostarczonej ze skanerem, na "
 "stronie domowej producenta lub na swojej partycji Windows."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Zainstaluj plik firmware z"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Wybierz plik 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 "Plik firmware %s nie istnieje lub nie można go odczytać!"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24052,7 +25253,7 @@ msgstr ""
 "Możliwe, że twoje skanery wymagają załadowania swojego firmware podczas "
 "każdorazowego włączenia."
 
-#: 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 "
@@ -24061,7 +25262,7 @@ msgstr ""
 "Aby to uczynić, należy dostarczyć plik firmware dla twojego skanera, tak aby "
 "można go było zainstalować."
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -24070,32 +25271,32 @@ msgstr ""
 "Jeśli zainstalowano już plik firmware dla skanera można uaktualnić go tutaj "
 "poprzez dostarczenie nowego pliku firmware."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Zainstaluj plik firmware dla"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Wybierz plik firmware dla %s"
 
-#: standalone/scannerdrake:274
-#, fuzzy, c-format
+#: standalone/scannerdrake:270
+#, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "Nie instaluj pliku firmware"
+msgstr "Nie można zainstalować pliku firmware dla %s!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Plik firmware dla %s został pomyślnie zainstalowany."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Skaner %s nie jest obsługiwany"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24104,33 +25305,33 @@ msgstr ""
 "Ten skaner %s musi być skonfigurowany przez program printerdrake.\n"
 "Można uruchomić go z Centrum Sterowania %s w dziale Sprzęt."
 
-#: 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 "Automatycznie wykryj dostępne porty"
 
-#: 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 "Wybierz urządzenie, do którego jest podłączony skaner %s."
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Uwaga: porty równoległe nie mogą być automatycznie wykrywane)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "wybierz urządzenie"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Wyszukiwanie skanerów ..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24141,7 +25342,7 @@ msgstr ""
 "Można skanować dokumenty przy użyciu programu \"XSane\" lub \"Kooka\"' z "
 "menu Multimedia/Grafika menu programów."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24154,7 +25355,7 @@ msgstr ""
 "%s\n"
 "są bezpośrednio dostępne w systemie.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24167,42 +25368,42 @@ msgstr ""
 "%s\n"
 "jest dostępny w systemie.\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 "Nie znaleziono skanerów, które są dostępne dla twojego systemu.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Wyszukiwanie nowych skanerów"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Ręczne dodawanie skanera"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Zainstaluj/uaktualnij pliki firmware"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Współdzielenie skanerów"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Wszystkie zdalne komputery"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Ta maszyna"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24212,7 +25413,7 @@ msgstr ""
 "powinny być dostępne za pośrednictwem zdalnych komputerów i poprzez zdalne "
 "komputery."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24221,33 +25422,33 @@ msgstr ""
 "Można także zdecydować czy skanery na komputerach zdalnych powinny być "
 "automatycznie dostępne dla tego komputera."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Skanery na tej maszynie są dostępne dla innych komputerów"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Współdzielenie skanerów dla komputerów: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Korzystanie ze skanerów na komputerach zdalnych"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Skanery na komputerach: "
 
-#: 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 "Współdzielenie skanerów lokalnych"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24255,55 +25456,55 @@ msgid ""
 msgstr ""
 "To są maszyny, na których powinny być dostępne lokalnie podłączone skanery:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Dodawanie komputera"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Edycja wybranego komputera"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Usuwanie wybranego komputera"
 
-#: 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 "Nazwa/adres IP komputera:"
 
-#: 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 "Wybierz komputer, dla którego powinny być dostępne drukarki lokalne:"
 
-#: 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 "Należy podać nazwę komputera lub adres 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 "Ten komputer już jest na liście, nie można go ponownie dodać.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Korzystanie ze skanerów zdalnych"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "To są maszyny, z których powinny być używane skanery:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24314,32 +25515,32 @@ msgstr ""
 "\n"
 "Czy chcesz zainstalować pakiet 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 "Twój skaner nie będzie dostępny w sieci."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Niektóre urządzenia w klasie sprzętowej \"%s\" zostały usunięte:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- usunięto %s\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Niektóre urządzenia zostały dodane: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- dodano %s\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Wykrywanie sprzętu w toku"
@@ -24351,7 +25552,7 @@ msgstr "Zmiany sprzętowe w klasie \"%s\" (%s sek. do odpowiedzi)"
 
 #: 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 "Czy chcesz uruchomić odpowiednie narzędzie konfiguracyjne?"
 
 #: steps.pm:14
@@ -24444,22 +25645,22 @@ msgstr "Aktualizacja systemu"
 msgid "Exit install"
 msgstr "Wyjście z instalacji"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Działa prawidłowo?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Rozwiń drzewo"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Zwiń drzewo"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Przełącz między płaskim i grupowym sortowaniem"
@@ -24477,235 +25678,3 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacja zakończyła się niepowodzeniem"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Stacja biurowa"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programy biuroweL procesory tekstu (kword, abiword), arkusze kalkulacyjne "
-"(kspread, gnumeric), przedlądarki pdf, itd."
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Stacja rozrywkowa (gry)"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programy do zabawy: gry przygodowe, planszowe, strategie, itd."
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Stacja multimedialna"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programy do odtwarzania/edycji dźwięku i obrazu"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Stacja internetowa"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Zestaw narzędzi do odczytu i przesyłania poczty i grup dyskusyjnych (mutt, "
-"tin...) oraz przeglądania sieci"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Komputer sieciowy (klient)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Programy klienckie dla różnych protokołów włączając ssh"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Narzędzia do łatwego zarządzania komputerem"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Narzędzia konsolowe"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Stacja KDE"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Środowisko graficzne KDE, podstawowe środowisko graficzne ze zbiorem "
-"narzędzi towarzyszących"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Stacja GNOME"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
-"narzędzi graficznych"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Inne środowiska graficzne"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd."
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentacja"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Książki i dokumenty HOWTO o Linuksie i Wolnym Oprogramowaniu"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Poczta"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Serwer pocztowy Postfix"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Baza danych"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serwer bazodanowy PostgreSQL i MySQL"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Zapora sieciowa/router"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Bramka internetowa"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serwer sieciowy"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Zbiór narzędzi do odczytu i wysyłania poczty i grup dyskusyjnych oraz do "
-"przeglądania sieci"
-
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Można eksportować używając NFP lub Samby. Którego protokołu chcesz użyć?"
-
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr ""
-#~ "Można eksportować używając NFP lub Samby. Którego protokołu chcesz użyć?"
-
-#~ msgid "The package %s is going to be removed."
-#~ msgstr "Zostanie usunięty pakiet %s"
-
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr "Aby przeczytać plik konfiguracyjny należy być administratorem.\n"
-
-#~ msgid "Can't open %s!"
-#~ msgstr "Nie można otworzyć %s!"
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Dla Twojej karty akceleracja 3D jest obsługiwana tylko przez XFree %s.\n"
-#~ "Twoja karta jest obsługiwana przez XFree %s, gdzie może być wydajniejsza "
-#~ "obsługa 2D."
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "Dla Twojej karty akceleracja 3D jest obsługiwana tylko przez XFree %s.\n"
-#~ "JEST TO ROZWIĄZANIE EKSPERYMENTALNE, MOŻE ZAWIESIĆ KOMPUTER.\n"
-#~ "Twoja karta jest obsługiwana przez XFree %s, gdzie może być wydajniejsza "
-#~ "obsługa 2D."
-
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac (sterownik ekranu instalatora)"
-
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "4 mld. kolorów (32 bity)"
-
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "Serwer XFree86: %s\n"
-
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "Oto lista dostępnych układów klawiatury"
-
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "Włóż dyskietkę startową do stacji %s"
-
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr ""
-#~ "Skorzystaj z wartości dodatkowych, produktów oraz usług przystępując do "
-#~ "Klubu Mandrake. Do nich należą:"
-
-#~ msgid "TCP/IP"
-#~ msgstr "TCP/IP"
-
-#~ msgid "Account"
-#~ msgstr "Konto"
-
-#~ msgid "Wireless"
-#~ msgstr "Bezprzewodowo"
diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po
index 2af968738..32bfb9a27 100644
--- a/perl-install/share/po/pt.po
+++ b/perl-install/share/po/pt.po
@@ -1,24 +1,108 @@
-# translation of DrakX-pt.po to Português
-# Copyright (C) 1999,2002,2003,2004 Free Software Foundation, Inc.
-# Fernando Ribeiro <fa.ribeiro(at)gmx.net>, 2003.
+# translation of menu-messages-pt_ultimo.po to Potuguês
+# translation of menu-messages-pt_ultimo.po to Português
+# translation of pt.po to Português
+# translation of pt.po to português
+#
+# Latest versions of po files are at http://www.mandrakelinux.com/l10n/pt.php3
+#
+# translation of menu-messages-pt.po to português
+# translation of menu-messages-pt.po to Português
+# Collection of titles/sections of Linux-Mandrake menu's.
+# The msgid are generated from the /usr/lib/menu/* files.
+#
+# Copyright (C) 2000 MandrakeSoft
+# Fernando Moreira <fmoreira@netc.pt>, 1999.
 # Jorge Costa <Jorgercosta@netc.pt>, 2001.
-# José JORGE <jose.jorge@oreka.com>, 2002.
+# José JORGE <jose.jorge@oreka.com>, 2002,2003.
 # Jose Jorge <jose.jorge@oreka.com>, 2003.
-# José Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>, 2003, 2004.
+# Jose Jorge <jjorge@free.fr>, 2003, 2004.
+# Jose Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>, 2004.
+# Zé <mmodem00@netvisao.pt>, 2004.
+# Américo José Melo <mmodem00@netvisao.pt>, 2004.
+# Ze <mmodem00@netvisao.pt>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-pt\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-07-05 23:41+0100\n"
-"Last-Translator: José Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>\n"
+"Project-Id-Version: pt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-09 01:10+0100\n"
+"Last-Translator: Américo José Melo <mmodem00@netvisao.pt>\n"
 "Language-Team: Português <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.9\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Que chave USB quer formatar?"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+"Está prestes a formatar um dispositivo USB \"%s\". Isto irá apagar todos os "
+"dados nele contidos.\n"
+"Certifique-se que o dispositivo seleccionado é a chave USB que quer "
+"formatar.\n"
+"É aconselhável desligar todos os outros dispositivos de armazenamento USB "
+"enquanto executa esta operação."
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Chave USB não gravável"
+
+#: ../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 ""
+"A chave USB parece estar protegida contra escrita. Por favor\n"
+"desligue-a, retire a protecção, e volte-a a conectar."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Tentar de novo"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "Continuar sem chave USB"
 
-#: ../move/move.pm:402
+#: ../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 ""
+"A chave USB parece ter a protecção contra escrita activada, mas não\n"
+"podemos desconecta-la com segurança.\n"
+"\n"
+"\n"
+"Clique no botão para reiniciar o computador, remova-a, desactive a\n"
+"protecção de escrita, volte-a a conectar e, execute o Mandrake Move."
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Reiniciar"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -32,16 +116,17 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
-"A sua chave USB não contém nenhuma partição de Windows (FAT) válida.\n"
-"É necessária uma para prosseguir (acima de tudo, é mais standard pois possibilita\n"
-"a transferência e o acesso aos seus ficheiros em máquinas a correr Windows).\n"
-"Por favor conecte uma chave USB que contenha uma partição de Windows.\n"
+"A sua chave USB não contém nenhuma partição Windows (FAT) válida.\n"
+"É preciso uma para prosseguir (além de que, é mais standard pois fica\n"
+"possibilitado a mover e a ter acesso aos seus ficheiros nas máquinas que\n"
+"correem Windows). Por favor conecte uma chave USB que contenha uma\n"
+"partição Windows.\n"
 "\n"
 "\n"
-"Pode continuar sem uma chave USB - ficará apto a utilizar o Mandrake \n"
-"Move como um Sistema Operativo Mandrake Live normal."
+"Poderá também proceder sem uma chave USB - continuará na mesma a\n"
+"poder usar o Mandrake Move como um sistema operativo Mandrake vivo."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -57,172 +142,127 @@ msgid ""
 "Operating System."
 msgstr ""
 "Não foi detectada nenhuma chave USB no seu sistema.\n"
-"Se conectar uma chave USB neste momento o Mandrake Move \n"
-"terá a capacidade para guardar, transparentemente, os dados na \n"
-"sua directoria pessoal e a configuração global do sistema, para o \n"
-"próximo boot deste ou de outro computador.Nota: se conectar agora\n"
-"uma chave espere vários segundos para que seja detectada.\n"
+"Se conectar uma chave USB neste momento, o Mandrake Move \n"
+"terá a capacidade de guardar  transparentemente os dados na \n"
+"sua directoria pessoal e, a configuração global do sistema, para\n"
+"o próximo arranque neste computador ou num outro. Nota: se\n"
+"conectar agora uma chave, espere alguns segundos antes que\n"
+"seja detectada outra vez.\n"
 "\n"
 "\n"
-"Pode continuar sem uma chave USB - ficará apto a utilizar o Mandrake \n"
-"Move como um Sistema Operativo Mandrake Live normal."
+"Poderá também proceder sem uma chave USB - continuará na\n"
+"mesma a poder usar o Mandrake Move como um sistema ope-\n"
+"rativo Mandrake vivo."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
-msgstr "É necessária uma chave para guardar os seus dados"
+msgstr "Precisa de uma chave para guardar os seus dados"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Detectar chave USB novamente"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Continuar sem chave USB"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "Chave USB não gravável"
-
-#: ../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 ""
-"A chave USB parece ter protecção contra a escrita, porém não é possível\n"
-"remover a chave neste momento.\n"
-"\n"
-"\n"
-"Clique no botão para reiniciar o computador, remova a chave, e retire a "
-"protecção,\n"
-"volte a conectar a chave e reinicie o Mandrake Move."
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"A chave USB parece ter protecção contra a escrita. Por favor\n"
-"remova a chave, retire a protecção, e volte a conectá-la."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Tentar de novo"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
-msgstr "Configurando chave USB"
+msgstr "Configurar chave USB"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "Por favor aguarde, configurando o sistema de ficheiros da chave USB..."
+msgstr "Por favor aguarde, a configurar o sistema de ficheiros na chave USB..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
-"Introduza a sua informação de utilizador, a senha será usada para o "
-"screensaver"
+"Introduza a sua informação de utilizador, a senha será usada para protecção "
+"de ecrâ"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
-msgstr "Configuração automática"
+msgstr "Auto configuração"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
-msgstr "Por favor aguarde, detectando e configurando dispositivos..."
-
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+msgstr "Por favor aguarde, a detectar e configurar dispositivos..."
+
+#: ../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 "Erro"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Ocorreu um erro, mas eu não sei como lidar com ele.\n"
+"Ocorreu um erro, mas eu não sei bem como o resolver.\n"
 "Continue a seu próprio risco."
 
-#: ../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 "Ocorreu um erro"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -246,56 +286,63 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"O que pode resultar da corrupção dos ficheiros de configuração do sistema\n"
-"na chave USB, nesse caso a remoção dos mesmos e o\n"
-"reiniciar do Mandrake Move resolverá o problema. Para o fazer\n"
-"clique no botão correspondente.\n"
+"Isto pode vir de uma configuração de sistema de ficheiros\n"
+"corrompida na chave USB, neste caso remova-a e reiniciar\n"
+"o Mandrake Move resolve o problema. Para o fazer, clique no\n"
+"botão correspondente.\n"
 "\n"
 "\n"
-"Se desejar reinicie e remova a chave USB, ou\n"
-"examine o seu conteúdo utilizando outro SO, pode ainda\n"
-"verificar os ficheiros de registo nas consolas #3 e #4\n"
-"de modo a tentar descobrir o problema."
+"Pode também querer reiniciar e remover a chave USB, ou\n"
+"examinar o seu conteúdo noutro OS, ou até dar uma\n"
+"olhada nos ficheiros de registo na consola #3 e #4\n"
+"para tentar adivinhar o que se passa."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
-msgstr "Apagar os ficheiros de configuração do sistema"
+msgstr "Remover os ficheiros de configuração do sistema"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
-msgstr "Apenas reiniciar"
+msgstr "Simplesmente reiniciar"
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
-msgstr "Apenas pode correr sem suporte de CDROM"
+msgstr "Pode apenas correr sem suporte CDROM"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
-msgstr "Terminar esses programas"
+msgstr "Terminar (kill) esses programas"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
-msgstr "Sem suporte de CDROM"
+msgstr "Sem suporte CDROM"
+
+#: ../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 "Leia com atenção!"
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
-"Não é possível utilizar outro CDROM enquanto os seguintes programas estão a "
+"Não é possível usar outro CDROM quando os seguintes programas estão a "
 "correr: \n"
 "%s"
 
 #: ../move/tree/mdk_totem:101
 #, c-format
 msgid "Copying to memory to allow removing the CDROM"
-msgstr "Copiando para a memória de modo a permitir a remoção do CDROM"
+msgstr "A copiar para a memória para permitir remover o CDROM"
 
 #: Xconfig/card.pm:13
 #, c-format
@@ -342,104 +389,104 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ou mais"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
-msgstr "servidor  X"
+msgstr "Servidor X"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Escolha um servidor X"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
-msgstr "Configuração Multi-Cabeça"
+msgstr "Configuração Multi-cabeças"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"O seu sistema suporta configuração multi-cabeça.\n"
+"O seu sistema suporta configuração multi-cabeças.\n"
 "O que deseja fazer?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Não é possível instalar o pacote XFree: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Não é possível instalar o pacote Xorg: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccione o tamanho da memória da sua placa gráfica"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Configuração do XFree"
+msgid "Xorg configuration"
+msgstr "Configuração Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Qual a configuração do Servidor X que deseja ter?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Que configuração do Servidor X deseja ter?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar todas as cabeças independentemente"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar extensão Xinerama"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "Configurar somente placa \"%s\"%s"
+msgstr "Configurar apenas a placa \"%s\"%s"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s com aceleração 3D por hardware"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s com aceleração 3D hardware"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "A sua placa pode ter suporte para aceleração 3D por hardware com o XFree%s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "A sua placa pode ter suporte para aceleração 3D hardware com o Xorg%s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s com aceleração 3D por hardware EXPERIMENTAL"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s com aceleração 3D hardware 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 ""
-"A sua placa pode ter suporte para aceleração 3D por hardware com o XFree%s,\n"
-"ATENÇÃO ESTE SUPORTE É EXPERIMENTAL E PODE CONGELAR O SEU COMPUTADOR."
+"A sua placa pode ter suporte para aceleração 3D hardware com o Xorg%s,\n"
+"ATENÇÃO ESTE SUPORTE É EXPERIMENTAL E PODE BLOQUEAR O SEU COMPUTADOR."
 
-#: 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 "Personalizado"
 
-#: 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 "Sair"
@@ -449,12 +496,12 @@ msgstr "Sair"
 msgid "Graphic Card"
 msgstr "Placa 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 "Resolução"
@@ -464,14 +511,19 @@ msgstr "Resolução"
 msgid "Test"
 msgstr "Testar"
 
-#: 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 "Opções"
 
-#: 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"
@@ -479,43 +531,43 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Manter alterações?\n"
+"Manter as alterações?\n"
 "A configuração actual é:\n"
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "Escolha um monitor para head #%d"
+msgstr "Escolha um monitor para a cabeça #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolha um monitor"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, c-format
 msgid "Vendor"
 msgstr "Marca"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
-msgstr "A procura automática não resultou. Por favor escolha o ecrã"
+msgstr "Sondagem de Plug'n Play falhada. Por favor escolha o monitor"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -529,21 +581,22 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"Dois parâmetros críticos são a taxa de refrescamento vertical, que é a taxa\n"
+"Os dois parâmetros críticos são a taxa de refrescamento vertical, que é a "
+"taxa\n"
 "em que todo o ecrã é refrescado, e principalmente a taxa de sincronização\n"
-"horizontal, que é a taxa em que 'scanlines' são mostradas.\n"
+"horizontal, que é a taxa em que linhas são mostradas.\n"
 "\n"
 "É MUITO IMPORTANTE que não especifique um tipo de monitor com taxa de "
 "actualização\n"
 "para além das capacidades do seu monitor: pode danificar seu monitor.\n"
 " Se tiver dúvidas, escolha definições conservadoras."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Taxa de refrescamento horizontal"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Taxa de refrescamento vertical"
@@ -568,58 +621,60 @@ msgstr "65 mil cores (16 bits)"
 msgid "16 million colors (24 bits)"
 msgstr "16 milhões de cores (24 bits)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluções"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
-msgstr "Escolha a resolução e a profundidade de cor"
+msgstr "Escolha a resolução e a profundidade da cor"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Placa 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 "OK"
-
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+msgstr "Ok"
+
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
+#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
+#: standalone/drakbackup:3884 standalone/drakbug:128
+#: standalone/drakconnect:160 standalone/drakconnect:245
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
+#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
+#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
@@ -658,12 +713,12 @@ msgstr "A sair em %d segundos"
 #: Xconfig/test.pm:133
 #, c-format
 msgid "Is this the correct setting?"
-msgstr "Este é a configuração correcta?"
+msgstr "É esta a configuração correcta?"
 
 #: Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
-msgstr "Tipo de teclado: %s\n"
+msgstr "Disposição de teclado: %s\n"
 
 #: Xconfig/various.pm:30
 #, c-format
@@ -683,12 +738,12 @@ msgstr "Monitor: %s\n"
 #: Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "Sincronização Horizontal do Monitor: %s\n"
+msgstr "Monitor HorizSync: %s\n"
 
 #: Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "Refrescamento Vertical do Monitor: %s\n"
+msgstr "Monitor Refrescamento Vertical: %s\n"
 
 #: Xconfig/various.pm:37
 #, c-format
@@ -712,20 +767,20 @@ msgstr "Resolução: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Driver XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Driver Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
 msgid "Graphical interface at startup"
-msgstr "X ao iniciar"
+msgstr "Interface gráfico ao iniciar"
 
 #: Xconfig/various.pm:74
 #, 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 ""
 "Eu posso configurar o computador para iniciar automaticamente o X após o "
 "arranque.\n"
@@ -743,34 +798,77 @@ msgid ""
 "\n"
 "Do you have this feature?"
 msgstr ""
-"A sua placa gráfica parece ter uma saída TV.\n"
+"A sua placa gráfica parece ter uma saída TV-OUT.\n"
 "Pode ser configurada para funcionar através do ecrã.\n"
 "\n"
 "Para isso tem que ligar a sua placa à TV antes de arrancar o seu "
 "computador.\n"
-"Escolha então \"TVout\" no carregador de arranque\n"
+"Então escolha \"TVout\" no carregador de arranque\n"
 "\n"
-"Tem mesmo este dispositivo?"
+"Tem esta característica?"
 
 #: Xconfig/various.pm:99
 #, c-format
 msgid "What norm is your TV using?"
-msgstr "Qual sistema de TV quer utilizar?"
+msgstr "Que norma usa a sua TV?"
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
+#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "A instalar o carregador de arranque"
+msgstr "Instalação do carregador de arranque em progresso"
+
+#: 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 ""
+"O LILO quer atribuir um novo ID de Volume ao drive %s.  No entanto, ao\n"
+"mudar o ID de Volume de um Windows NT, 2000, ou disco de arranque\n"
+"XP é um erro fatal para o Windows.\n"
+"Esta precaução não se aplica ao Windows 95 ou 98. ou aos discos de\n"
+"dados NT.\n"
+"\n"
+"Atribuir um novo ID de Volume?"
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr ""
+"Instalação do carregador de arranque falhada. Ocorreram os seguintes erros:"
+
+#: 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 ""
+"Talvez precise mudar o seu dispositivo de arranque Open\n"
+" Firmware para activar o carregador de arranque. Se não vê\n"
+" o carregador de arranque ao reiniciar, mantenha carregado\n"
+" o Comando-Opção-O-F ao reiniciar e digite:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Depois escreva : shut-down\n"
+" No seu próximo arranque deve ver a linha de comandos do\n"
+" seu carregador de arranque."
 
-#: any.pm:142
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -779,353 +877,341 @@ msgid ""
 "\n"
 "On which drive are you booting?"
 msgstr ""
-"Você decidiu instalar o carregador de sistema numa partição.\n"
-"Isto implica que já tem um carregador de sistema no disco rígido de arranque "
-"(ex: System Commander).\n"
+"Decidiu instalar o carregador de arranque numa partição.\n"
+"Isto implica que já tem um carregador de arranque no disco que funciona,\n"
+"arranca (ex: System Commander).\n"
 "\n"
-"Qual é o disco de arranque ?"
+"Em que drive está a arrancar?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Primeiro sector do disco (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Primeiro sector da partição de raíz"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Na Disquete"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "Saltar"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Instalação do SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Instalação do LILO/grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Onde quer instalar o carregador de arranque?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Primeiro sector da partição de arranque"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Configuração do Estilo de Arranque"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Principais opções do carregador de arranque"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
-msgstr "Indicar o tamanho da RAM em Mb"
+msgstr "Indicar o tamanho da RAM em MB"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
-msgid "Option ``Restrict command line options'' is of no use without a password"
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
 msgstr "Opção ``Restringir opções da linha de comando'' não tem uso sem senha"
 
-#: 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 "As senhas não coincidem"
+msgstr "As senhas não combinam"
 
-#: 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 "Por favor tente novamente"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
-msgstr "Carregador de arranque a utilizar"
+msgstr "Carregador de arranque a usar"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Instalação do carregador de arranque"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Dispositivo de arranque"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
-msgstr "Prazo antes de arrancar a imagem padrão"
+msgstr "Intervalo de tempo antes de arrancar a imagem padrão"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Activar ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Forçar Sem APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Forçar Sem 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 "Senha"
 
-#: 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 "Senha (de novo)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Restringir opções da linha de comando"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "restringir"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Limpar /tmp a cada arranque"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "Tamanho da RAM preciso se necessário (%d MB encontrados)"
+msgstr "Tamanho da RAM exacto se necessário (%d MB encontrados)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Activar multi-perfis"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Mensagem Init"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
-msgstr "Abrir tempo de espera de Firmware"
+msgstr "Abrir intervalo de tempo do Firmware"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
-msgstr "Tempo limite de Arranque do Núcleo"
+msgstr "Intervalo de tempo de Arranque do Kernel"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Activar Arranque de CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
-msgstr "Activar de Arranque?"
+msgstr "Activar no Arranque?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
-msgstr "SO por omissão?"
+msgstr "OS padrão?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Imagem"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Adicionar"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
-msgstr "Modo de Vídeo"
+msgstr "Modo 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 da rede"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Rótulo"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
-msgstr "Por omissão"
+msgstr "Padrão"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
-msgstr "Tamanho-Initrd"
+msgstr "Tamanho Initrd"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
-msgstr "Semvídeo"
+msgstr "Sem Video"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Não é permitido um rótulo vazio"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
-msgstr "Você deve escolher uma imagem de núcleo"
+msgstr "Deve especificar uma imagem Kernel"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
-msgstr "Tem que ter uma partição raíz"
+msgstr "Deve especificar uma partição raiz"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
-msgstr "Este rótulo já está a ser utilizado"
+msgstr "Este rótulo já está a ser usado"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
-msgstr "Qual tipo de entrada que quer adicionar?"
+msgstr "Que tipo de entrada quer adicionar?"
 
-#: 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 "Outros SO (SunOS...)"
+msgstr "Outro OS (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
-msgstr "Outros SO (MacOS...)"
+msgstr "Outro OS (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
-msgstr "Outros SO (Windows...)"
+msgstr "Outro OS (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can create additional entries or change the existing ones."
 msgstr ""
-"Aqui estão a diferentes entradas.\n"
-"Pode adicionar mais ou alterar as existentes"
+"Aqui estão as entradas do menu de arranque.\n"
+"Pode criar entradas adicionais ou mudar as existentes."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
-msgstr "aceder aos programas X"
+msgstr "acesso aos programas X"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
-msgstr "aceder às ferramentas rpm"
+msgstr "acesso às ferramentas rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "permitir \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
-msgstr "aceder aos ficheiros de administração"
+msgstr "acesso aos ficheiros de administração"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
-msgstr "aceder às ferramentas rede"
+msgstr "acesso às ferramentas da rede"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
-msgstr "aceder às ferramentas de construção"
+msgstr "acesso às ferramentas de compilação"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(já adicionado %s)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Essa senha é demasiado simples"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Por favor indique um nome de utilizador"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+"O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
-msgstr "O nome de utilizador é demasiado comprido"
+msgstr "O nome de utilizador é demasiado longo"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Este nome de utilizador já foi adicionado"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Adicionar utilizador"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1134,127 +1220,139 @@ msgstr ""
 "Introduza um utilizador\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 "Feito"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Aceitar utilizador"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Nome 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 "Nome de utilizador"
+msgid "Login name"
+msgstr "Nome de identificação/login"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Linha de Comandos (shell)"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Ícone"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
-msgstr "Autoligação"
+msgstr "Autologin"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
-"Eu posso configurar o computador para ligar automaticamente com um "
-"utilizador."
+"Posso configurar o computador para ligar automaticamente um utilizador."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
-msgstr "Quer usar esta função ?"
+msgstr "Quer usar esta característica?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
-msgstr "Escolha o utilizador por omissão :"
+msgstr "Escolha o utilizador padrão :"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Escolha o gestor de janelas a executar:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
-msgstr "Por favor escolha o idioma a utilizar."
+msgstr "Por favor escolha a linguagem a usar."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Escolha da língua"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"O Linux Mandrake suporta várias línguas. Seleccione as\n"
-"línguas que deseja instalar. Estas estarão disponíveis quando\n"
+"O Mandrakelinux suporta várias línguas. Seleccione as\n"
+"que deseja instalar. Estas estarão disponíveis quando\n"
 "terminar a instalação e reinicar o seu sistema."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Usar Unicode por omissão"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Todas as línguas"
 
-#: 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ão"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Por favor escolha o seu país."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Aqui está a lista completa dos países disponíveis"
 
-#: 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 "Mais"
+msgid "Other Countries"
+msgstr "Outros Países"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Método input:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Nenhum"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Não partilhar"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Permitir todos os utilizadores"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1263,131 +1361,256 @@ msgid ""
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
-"Deseja permitir aos utilizadores de partilhar pastas?\n"
-"Isto vai permitir aos utilizadores de somente carregar em \"Partilhar\" com "
+"Deseja permitir aos utilizadores partilhar algumas das suas pastas?\n"
+"Ao permitir isto, os utilizadores só têm que clicar em \"Partilhar\" no "
 "konqueror e nautilus.\n"
 "\n"
-"\"Personalizado\" permite de escolher para cada utilizador.\n"
+"\"Personalizado\" permite escolher a cada utilizador.\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: o sistema de partilha de ficheiros tradicional do Unix, com menos suporte em Mac e Windows."
+msgstr ""
+"NFS: o sistema de partilha de ficheiros tradicional do Unix, com menos "
+"suporte em Mac e 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: um sistema de partilha de ficheiros utilizado pelo Windows, Mac OS X e muitos sistemas modernos Linux."
+msgstr ""
+"SMB: um sistema de partilha de ficheiros usado pelo Windows, Mac OS X e "
+"muitos sistemas Linux modernos."
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
-msgid "You can export using NFS or SMB. Please select which you would like to use."
-msgstr "Pode partilhar com NFS ou SMB. Escolha por favor qual deseja utilizar."
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
+msgstr "Pode exportar com NFS ou SMB. Por favor escolha qual deseja usar."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
-msgstr "Lançar userdrake"
+msgstr "Executar userdrake"
+
+#: 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 "Fechar"
 
-#: any.pm:885
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
-"A partilha por utilizador utiliza o grupo \"fileshare\". \n"
-"Pode utilizar userdrake para inscrever um utilizador a este grupo."
+"A partilha do utilizador normal usa o grupo \"fileshare\". \n"
+"Pode usar o userdrake para adicionar um utilizador a este grupo."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Ficheiros locais"
+msgid "Local file"
+msgstr "Ficheiro 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 "Domínio Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr "Directório Activo com SFU"
+
+#: authentication.pm:21
 #, c-format
-msgid "Active Directory"
-msgstr "Directório Activo"
+msgid "Active Directory with Winbind"
+msgstr "Directório Activo com Winbind"
 
-#: authentication.pm:38
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Ficheiro local:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+"Usar local para todas as autenticações e informações dadas pelo utilizador "
+"no ficheiro local"
+
+#: 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 ""
+"Indica ao seu computador para usar LDAP para algumas ou todas as "
+"autenticações. O LDAP consolida certos tipos de informação na sua "
+"organização."
+
+#: 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 ""
+"Permite-lhe correr um grupo de computadores no mesmo domínio de Serviços de "
+"Informação de Rede com uma senha comum e um ficheiro de grupo."
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Domínio Windows:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+"O Winbind permite ao sistema recuperar informações e autenticar utilizadores "
+"num domínio Windows."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Directório Activo com SFU:"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+"Kerberos é um sistema seguro que providencia serviços de autenticação na "
+"rede."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Directório Activo com Winbind:"
+
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Autenticação LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "dn de base LDAP"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "simples"
+
+#: 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 "disposição de segurança (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Autenticação do Directório Activo"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domínio"
 
-#: 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 Dados dos utilizadores LDAP"
 
-#: authentication.pm:54
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Usar BIND Anónimo"
+
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "Utilizador LDAP autorizado a navegar no Directório Activo"
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
-msgstr "Senha para o utilizador"
+msgstr "Senha para utilizador"
+
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Encriptação"
 
-#: authentication.pm:62
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Autenticação NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Domínio 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 "
@@ -1403,35 +1626,45 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 msgstr ""
-"Para que isto funcione para um PDC W2K, vai provavelmente ser preciso que o "
-"administrador faça : C:\\>net localgroup \"Pre-Windows 2000 Compatible Access"
-"\" everyone /add e reinicie o servidor.\n"
+"Para que isto funcione para um W2K PDC, provavelmente irá precisar que o "
+"administrador execute : C:\\>net localgroup \"Pre-Windows 2000 Compatible "
+"Access\" everyone /add e reinicie o servidor.\n"
 "Também vai precisar do nome/senha de um Administrador de Dominio para "
 "adicionar a máquina ao domínio Windows(TM).\n"
-"Se a rede ainda não está activada, DrakX vai tentar juntar-se ao domínio "
+"Se a rede ainda não está activada, DrakX irá tentar juntar-se ao domínio "
 "depois da configuração da rede.\n"
 "Se esta configuração falhar por alguma razão e que a autenticação no domínio "
-"não funciona, lance 'smbpasswd -j DOMINIO -U NOME%%SENHA' usando o seu "
+"não funciona, execute 'smbpasswd -j DOMINIO -U NOME%%SENHA' usando o seu "
 "Dominio Windows (TM), e o Nome/Senha do Administrador, depois do arranque do "
 "sistema.\n"
-"O commando 'wbinfo -t' vai testar se a sua senha de autenticação está boa."
+"O comando 'wbinfo -t' vai testar se a sua senha de autenticação está boa."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Autenticação num Domínio Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Nome do Administrador do Domínio"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Senha do Administrador de Domínio"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Usar Idmap para guardar UID/SID "
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Idmap padrão"
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Não é possível usar 'broadcast' sem algum domínio NIS"
@@ -1440,9 +1673,8 @@ msgstr "Não é possível usar 'broadcast' sem algum domínio NIS"
 # only the ascii charset will be available on most machines
 # 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)
 #. -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"
@@ -1451,66 +1683,61 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Bem-vindo ao menu de escolha do SO!\n"
+"Bem-vindo ao menu de escolha do sistema operativo!\n"
 "\n"
 "Escolha um sistema operativo da lista acima ou\n"
-"espere pelo arranque predefinido.\n"
+"espere pelo arranque padrao.\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 com lista gráfica"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
-msgstr "LILO com lista textual"
+msgstr "LILO com menu texto"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "não há espaço suficiente em /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Não pode instalar o carregador de arranque numa partição %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
-"A configuração do seu bootloader deve ser actualizada pois a partição foi "
-"renumerada"
+"A configuração do seu carregador de arranque bootloader deve ser actualizada "
+"pois a partição foi renumerada"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
-"O bootloader não pode ser instalado correctamente. Terá de utilizar o "
-"arranque de emergência (boot rescue) e escolher \"%s\""
+"O carregador de arranque não pode ser instalado correctamente. Tem de usar o "
+"arranque de emergência e escolher \"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Reinstalar o carregador de arranque"
@@ -1553,7 +1780,7 @@ msgstr "%d segundos"
 #: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
-msgstr "Não posso fazer cópias de ecrã antes de particionar"
+msgstr "Não posso fazer cópias do ecrã antes de particionar"
 
 #: common.pm:204
 #, c-format
@@ -1568,78 +1795,81 @@ msgstr "kdesu em falta"
 #: common.pm:272
 #, c-format
 msgid "consolehelper missing"
-msgstr "falta o ajudante da linha de commando"
+msgstr "falta a ajuda da linha de comando"
 
-#: 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 "Republica Checa"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, c-format
 msgid "Germany"
-msgstr "Alemanhã"
+msgstr "Alemanha"
 
-#: 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 "Holanda"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
+#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
+#: network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
 msgid "Italy"
 msgstr "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 "Estados Unidos"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1648,70 +1878,64 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 "WebDAV é um protocolo que lhe permite de montar a pasta de um servidor\n"
-"web localmente, e de tratar-la como um sistema de ficheiros local (desde\n"
+"web localmente, e trata-lo como um sistema de ficheiros local (desde\n"
 "que o servidor web esteja configurado como servidor WebDAV). Se deseja\n"
 "adicionar pontos de montagem WebDAV, seleccione \"Novo\"."
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Novo"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Desmontar"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Montar"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Ponto de Montagem"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Por favor escolha a URL do servidor WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "O Url deve começar com http:// ou 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 "Ponto de montagem: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Opções: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Leia com atenção!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Por favor faça primeiro uma cópia de segurança dos seus dados"
 
-#: 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 "
@@ -1722,17 +1946,17 @@ msgstr ""
 "suficiente)\n"
 "no início do disco"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Assistente"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Escolher acção"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1743,181 +1967,187 @@ msgstr ""
 "Sugiro que redimensione primeiro esta partição\n"
 "(clique nela, depois clique em \"Redimensionar\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Por favor clique numa partição"
 
-#: 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 "Detalhes"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Nenhum disco rígido encontrado"
 
-#: 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 "SF com jornal"
+msgstr "Journalised FS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
-msgstr "Memória virtual"
+msgstr "Swap"
 
-#: 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"
+msgstr "Janelas"
 
-#: 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 "Outro"
+msgstr "Outros"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Vazio"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Tipos de sistema de ficheiros:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Use ``%s'' ao invés"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "Tipo"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Criar"
 
 #. -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 "Eliminar"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Use ``Desmontar'' primeiro"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Escolha outra partição"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Escolha uma partição"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Sair"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Anular"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Alternar para modo normal"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Alternar para modo perito"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Continuar mesmo assim?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Sair sem guardar"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
-msgstr "Sair sem gravar na tabela de partição?"
+msgstr "Sair sem gravar a tabela de partições?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Quer gravar as modificações de /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 ""
-"Precisa reiniciar para que as modificações na tabela de partição tenham "
+"Precisa reiniciar para que as modificações na tabela de partições tenham "
 "efeito"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Limpar tudo"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Auto alocar"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Mais"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Informações dos discos rígidos"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Todas as partições primárias estão usadas"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
-msgstr "Eu não posso adicionar mais nenhuma partição"
+msgstr "Não posso adicionar mais partições"
 
-#: 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,62 +2156,62 @@ msgstr ""
 "Para ter mais partições, por favor elimine uma para poder criar uma partição "
 "extendida"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
-msgstr "Gravar a tabela das partições"
+msgstr "Gravar a tabela de partições"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Restaurar a tabela de partições"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Reparar a tabela de partições"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Recarregar a tabela de partições"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
-msgstr "Automontagem dos médias amovíveis"
+msgstr "Automontagem das medias amovíveis"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Seleccione ficheiro"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
-"A tabela de partições de segurança não tem o \n"
-"mesmo tamanho. Continuar mesmo assim?"
-
-#: 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
+"O backup da tabela de partições não tem o mesmo tamanho.\n"
+"Continuar mesmo assim?"
+
+#: 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 "Aviso"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1990,92 +2220,92 @@ msgstr ""
 "Insira uma disquete no drive\n"
 "Todos os dados na disquete serão perdidos"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
-msgstr "Tentando resgatar tabela de partições"
+msgstr "A tentar resgatar tabela de partições"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Informação detalhada"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Mover"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Formatar"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Adicionar ao RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Adicionar ao LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Remover do RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Remover do LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Modificar RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Usar para loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Criar uma nova partição"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Sector inicial: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Tamanho em MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Tipo do Sistema de Ficheiros: "
 
-#: 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 "Nome do Volume Lógico "
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2084,246 +2314,244 @@ msgid ""
 msgstr ""
 "Você não pode criar uma nova partição\n"
 "(porque atingiu o numero máximo de partições primárias).\n"
-"Apague primeiro uma partição primária e crie uma partição extensa."
+"Primeiro apague uma partição primária e crie uma partição extendida."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
-msgstr "Apagar o ficheiro loopback?"
+msgstr "Remover o ficheiro 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"
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Após alterar o tipo de partição %s, todos os dados desta partição serão "
 "perdidos"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Alterar tipo de partição"
 
-#: 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 "Que sistema de ficheiros deseja?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
-msgstr "Mudando de ext2 para ext3"
+msgstr "Mudar de ext2 para ext3"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Onde deseja montar o ficheiro loopback %s?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Onde deseja montar o dispositivo %s?"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Não posso remover a definição do ponto de montagem enquanto \n"
-"a partição for usada para loopback. Remova o loopback primeiro"
+"Não posso desconfigurar o ponto de montagem enquanto a\n"
+"partição for usada para loopback. Remova o loopback primeiro"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Onde deseja montar %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 "A redimensionar"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "A computar limites do sistema de ficheiros FAT"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Esta partição não é redimensionável"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
-msgstr "Deveria fazer uma cópia de segurança de todos os dados nesta partição"
+msgstr "Deve fazer um backup de todos os dados desta partição"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "Após redimensionar a partição %s, todos os dados da partição serão perdidos"
+msgstr ""
+"Após redimensionar a partição %s, todos os dados da partição serão perdidos"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Escolha o novo tamanho"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Novo tamanho em 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"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
-"Para assegurar a integridade dos dados depois de mudar\n"
-"o tamanho da(s) partiçõe(s), a verificação do sistema de ficheiros\n"
-"vai ser lançada no próximo arranque do Windows(MR)"
+"Para assegurar a integridade dos dados depois de redimensionar\n"
+"a(s) partiçõe(s), a verificação do sistema de ficheiros vai ser\n"
+"executada no próximo arranque do Windows(TM)"
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
-msgstr "Para qual disco quer mover?"
+msgstr "Para que disco o quer mover?"
 
-#: 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 "Para qual sector quer mover?"
+msgstr "Para que sector o quer mover?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
-msgstr "A mover"
+msgstr "Mover"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "A mover partição..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
-msgstr "Escolha um RAID existente para adicionar a"
+msgstr "Escolha um RAID existente para adicionar"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "novo"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
-msgstr "Escolha um LVM existente para adicionar a"
+msgstr "Escolha um LVM existente para adicionar"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "Nome do LVM?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
-msgstr "Essa partição não pode ser usada para loopback"
+msgstr "Esta partição não pode ser usada para 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 "Nome do ficheiro loopback: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Escreva um nome de ficheiro"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "O ficheiro já está utilizado por outro loopback, escolha outro"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
-msgstr "O ficheiro já existe. Utilizá-lo?"
+msgstr "O ficheiro já existe. Usá-lo?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
-msgstr "Opções do montagem:"
+msgstr "Opções de montagem"
 
-#: 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 "dispositivo"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "nível"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "tamanho do bloco"
+msgid "chunk size in KiB"
+msgstr "tamanho do bloco em KiB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Tenha cuidado: essa operação é perigosa."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Que tipo de particionamento?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "O pacote %s é necessário. Instalo-o?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Precisará re-arrancar antes que as modificações tenham efeito"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "A tabela de partições do disco %s vai ser escrita no disco!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "Após formatar a partição %s, todos os dados desta partição serão perdidos"
+msgstr ""
+"Após formatar a partição %s, todos os dados nesta partição serão perdidos"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Mover os ficheiros para a nova partição"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
-msgstr "Esconder os ficheiros"
+msgstr "Esconder ficheiros"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2332,53 +2560,53 @@ msgstr ""
 "A pasta %s já contém dados\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
-msgstr "Movendo os ficheiros para a nova partição"
+msgstr "Amover os ficheiros para a nova partição"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
-msgstr "Copiando %s"
+msgstr "A copiar %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
-msgstr "A apagar %s"
+msgstr "A remover %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "a partição %s é agora conhecida como %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Nome do devfs: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
-msgstr "Etiqueta do Volume"
+msgstr "Etiqueta do Volume:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Letra do drive no DOS: %s (apenas um palpite)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "Tipo: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nome: "
@@ -2386,7 +2614,7 @@ msgstr "Nome: "
 #: diskdrake/interactive.pm:1174
 #, c-format
 msgid "Start: sector %s\n"
-msgstr "Inicial: sector: %s\n"
+msgstr "Inicio: sector: %s\n"
 
 #: diskdrake/interactive.pm:1175
 #, c-format
@@ -2401,7 +2629,7 @@ msgstr ", %s sectores"
 #: diskdrake/interactive.pm:1179
 #, c-format
 msgid "Cylinder %d to %d\n"
-msgstr "Cilindro %d ao %d\n"
+msgstr "Cilindro %d para %d\n"
 
 #: diskdrake/interactive.pm:1180
 #, c-format
@@ -2425,8 +2653,8 @@ msgstr "Montado\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2453,8 +2681,8 @@ msgstr "Nível %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Tamanho do bloco %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Tamanho do bloco %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2475,9 +2703,9 @@ msgid ""
 "probably leave it alone.\n"
 msgstr ""
 "\n"
-"É provável que esta partição seja\n"
-"uma partição Piloto, não lhe\n"
-"deveria provavelmente mexer.\n"
+"As possibilidades são: esta partição\n"
+"é uma partição Driver. Provavelmente\n"
+"não lhe deve mexer.\n"
 
 #: diskdrake/interactive.pm:1199
 #, c-format
@@ -2488,14 +2716,14 @@ msgid ""
 "dual-booting your system.\n"
 msgstr ""
 "\n"
-"Esta é uma partição especial\n"
-" Bootstrap serve para o \n"
-"duplo arranque do seu sistema.\n"
+"Esta partição especial\n"
+"Bootstrap é para\n"
+"duplo arranque do sistema.\n"
 
 #: diskdrake/interactive.pm:1218
 #, c-format
 msgid "Read-only"
-msgstr "Leitura só"
+msgstr "Apenas Leitura"
 
 #: diskdrake/interactive.pm:1219
 #, c-format
@@ -2510,7 +2738,7 @@ msgstr "Geometria: %s cilindros, %s cabeças, %s sectores\n"
 #: diskdrake/interactive.pm:1221
 #, c-format
 msgid "Info: "
-msgstr "Informação: "
+msgstr "Info: "
 
 #: diskdrake/interactive.pm:1222
 #, c-format
@@ -2525,40 +2753,42 @@ msgstr "Tipo da tabela de partições: %s\n"
 #: diskdrake/interactive.pm:1224
 #, c-format
 msgid "on channel %d id %d\n"
-msgstr "na cadeia %d id %d\n"
+msgstr "no canal %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
-msgstr "Senha de codificação do sistema de ficheiros"
+msgstr "Senha de encriptação do sistema de ficheiros"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
-msgstr "Escolha a sua senha de codificação do sistema de ficheiros"
+msgstr "Escolha a sua senha de encriptação do sistema de ficheiros"
 
-#: 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 "Essa senha de codificação  é muito simples (deve ter ao menos %d caracteres)"
+msgstr ""
+"Essa senha de encriptação é muito simples (tem que ter pelo menos %d "
+"caracteres de comprimento)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
-msgstr "As senhas de codificação  não coincidem"
+msgstr "As senhas de encriptação não coincidem"
 
-#: 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 "Senha de codificação"
+msgstr "Senha de encriptação"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
-msgstr "Senha de codificação (outra vez)"
+msgstr "Senha de encriptação (outra vez)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Alterar tipo"
@@ -2566,31 +2796,32 @@ msgstr "Alterar tipo"
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
 msgid "Can't login using username %s (bad password?)"
-msgstr "Não consigo ligar-me com o nome %s (senha errada?)"
+msgstr "Não consigo entrar/login com o nome %s (senha errada?)"
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
 #, c-format
 msgid "Domain Authentication Required"
-msgstr "Autenticação no Domínio Exigida"
+msgstr "Autenticação do Domínio Requerida"
 
 #: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Which username"
-msgstr "Qual nome de utilizador"
+msgstr "Que nome de utilizador"
 
 #: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Another one"
-msgstr "Mais outra"
+msgstr "Mais outro"
 
 #: diskdrake/smbnfs_gtk.pm:177
 #, c-format
-msgid "Please enter your username, password and domain name to access this host."
+msgid ""
+"Please enter your username, password and domain name to access this host."
 msgstr ""
-"Por favor escreva a seu nome de utilizador, senha e nome de domínio para "
-"aceder a esta máquina."
+"Por favor digite o seu nome de utilizador, senha e nome de domínio para "
+"aceder a este host."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Nome de utilizador"
@@ -2598,34 +2829,79 @@ msgstr "Nome de utilizador"
 #: diskdrake/smbnfs_gtk.pm:205
 #, c-format
 msgid "Search servers"
-msgstr "Procurar Servidores"
+msgstr "Procurar servidores"
 
 #: diskdrake/smbnfs_gtk.pm:210
 #, c-format
 msgid "Search new servers"
 msgstr "Procurar novos servidores"
 
-#: 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 "O pacote %s tem que ser instalado. Tem certeza que não o quer seleccionar?"
+msgstr "O pacote %s precisa ser instalado. Quere-o instalar?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
-msgstr "O pacote imperativo %s falta"
+msgstr "O pacote imperativo %s está em falta"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
-msgstr "A instalar os pacotes..."
+msgstr "A instalar pacotes..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
-msgstr "Removendo pacotes..."
+msgstr "A remover pacotes..."
+
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "A montar partição %s"
 
-#: fs.pm:416
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "montagem da partição %s na pasta %s falhada"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "A verificar %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "erro a desmontar %s: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "A activar partição swap %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "A formatar a partição %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "A criar e formatar ficheiro %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Não sei como formatar %s no tipo %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s formatação de %s falhada"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2635,21 +2911,23 @@ msgstr ""
 "(ex. para um acesso mais rápido à fila de forums para acelerar os servidores "
 "de forums)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
-"Só pode ser montado de maneira explicita (ou seja,\n"
-"a opção -a não vai montar o sistema de ficheiros)."
+"Só pode ser montado explicitamente (ou seja, a opção -a\n"
+"não faz com que o sistema de ficheiros seja montado)."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
-msgstr "Não interpretar os dispositivos especiais no sistema de ficheiros."
+msgstr ""
+"Não interprete os caracteres ou blocos dos dispositivos especiais no sistema "
+"de ficheiros."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2657,10 +2935,10 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 "Não permite a execução de binários no sistema de ficheiros montado.\n"
-"Esta opção pode ser útil para um servidor que tem sistemas de ficheiros\n"
-"com binários para outras arquitecturas do que a sua própria."
+"Esta opção pode ser útil para um servidor que tem um sistema de ficheiros\n"
+"que contém binários para outras arquitecturas que não a própria."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2668,20 +2946,21 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 "Não permite aos bits set-user-identifier ou set-group-identifier\n"
-"de tomarem efeito. (Isto parece seguro, mas é pouco seguro de facto\n"
-"set tem suidperl(1) instalado.)"
+"terem efeito. (Isto parece seguro, mas de facto é pouco seguro\n"
+"se tem suidperl(1) instalado.)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
-msgstr "Montar o sistema de ficheiros em leitura-só."
+msgstr "Montar o sistema de ficheiros apenas para leitura."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
-msgstr "Todas as operações no sistema de ficheiros deveriam ser sincronizadas."
+msgstr ""
+"Todos os I/O para o sistema de ficheiros devem ser feitos sincronizadamente."
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2691,71 +2970,31 @@ msgid ""
 "(unless overridden by subsequent options, as in the option line\n"
 "user,exec,dev,suid )."
 msgstr ""
-"Permite a um utilizador ordinário de montar o sistema de ficheiros.\n"
-"O nome do utilizador que monta é gravado no mtab para que ele o\n"
-"possa desmontar. Esta opção implica as opções noexec, nosuid e\n"
-"nodev (a menos que sejam sobrecarregadas nas opções seguintes,\n"
-"como na linha das opções user,exec,dev,suid)."
+"Permite a um utilizador normal montar o sistema de ficheiros.\n"
+"O nome do utilizador que monta é gravado no mtab para que ele o \n"
+"possa desmontar outra vez. Esta opção implica as opções noexec,\n"
+"nosuid e nodev (a menos que sejam sobrecarregadas nas opções\n"
+"seguintes, como na linha das opções user,exec,dev,suid)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
-msgstr "Dar acesso em escritura aos utilizadores normais"
+msgstr "Dar acesso de escrita a utilizadores normais"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
-msgstr "Dar acesso de leitura-apenas aos utilizadores normais"
-
-#: 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 formatação de %s falhou"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Não sei como formatar %s no tipo %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "A formatar a partição %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "A criar e formatar ficheiro %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "A montar a partição %s"
+msgstr "Dar acesso de leitura-apenas a utilizadores normais"
 
-#: fs.pm:727 fs.pm:776
+#: fs/type.pm:364
 #, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "a montagem da partição %s na pasta %s falhou"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "A verificar %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "erro a desmontar %s: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "A activar a partição de memória virtual%s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Não pode usar JFS em partições menores que 16MB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "simples"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Não pode usar ReiserFS em partições menores que 32MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2767,7 +3006,7 @@ msgstr "com /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"
@@ -2777,79 +3016,70 @@ msgid ""
 "\n"
 "Do you agree to lose all the partitions?\n"
 msgstr ""
-"Não consigo ler a tabela de partição de %s, é demasiado defeituosa para mim :"
-"(\n"
-"Eu posso tentar continuar limpando as partições defeituosas (TODOS OS DADOS\n"
+"Não consigo ler a tabela de partição de %s, está muito corrompida para "
+"mim (:\n"
+"Eu posso tentar continuar a limpar as partições corrompidas (TODOS OS DADOS\n"
 "serão perdidos!). A outra solução é não deixar o DrakX modificar a tabela\n"
 "de partições. (o erro é %s)\n"
 "\n"
 "Aceita perder todas as partições?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Não pode usar JFS em partições menores que 16MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Não pode usar ReiserFS em partições menores que 32MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Pontos de montagem devem começar com uma /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
-msgstr "Os pontos de montagem devem apenas conter letras alfa-numéricas"
+msgstr "Pontos de montagem devem apenas conter caracteres alfanuméricos"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Já existe uma partição no ponto de montagem %s\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"Seleccionou uma partição RAID não material como root (/).\n"
-"Nenhum gestor de arranque consegue acedê-la sem uma\n"
-"partição /boot. Faça cuidado em adicionar uma partição /boot"
+"Seleccionou uma partição RAID como root (/).\n"
+"Nenhum carregador de arranque a consegue aceder sem uma\n"
+"partição /boot. Certifique-se em adicionar uma partição /boot"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr "Não pode usar LVM Volume Lógico para o ponto de montagem %s"
+msgstr "Não pode usar um Volume Lógico LVM para ponto de montagem %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
 "The bootloader is not able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"Seleccionou um volume lógico (LVM) como root (/).\n"
-"O gestor de arranque não lhe consegue aceder sem uma partição /boot\n"
-"Certifique-se de que adiciona uma partição /boot"
+"Seleccionou um Volume Lógico LVM como root (/).\n"
+"O carregador de arranque não o consegue aceder sem uma partição /boot\n"
+"Certifique-se em adicionar uma partição /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 "Pode não poder instalar o lilo (pois o lilo não gere um LV em vários PVs)"
+msgstr ""
+"Pode não poder instalar o lilo (já que o lilo não gere um LV em vários PVs)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
-msgstr "Esta directoria deveria permanecer dentro do sistema de ficheiros root"
+msgstr "Esta directoria deve permanecer dentro do sistema de ficheiros root"
 
-#: 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 "
@@ -2858,137 +3088,132 @@ msgstr ""
 "Precisa de um verdadeiro sistema de ficheiros (ext2/ext3, ReiserFS, xfs ou "
 "JFS) para este ponto de montagem\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
-msgstr "Não pode usar um sistema de ficheiros codificado para o ponto de montagem %s"
+msgstr ""
+"Não pode usar um sistema de ficheiros encriptado para o ponto de montagem %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
-msgstr "Falta de espaço livre suficiente para auto-alocação"
+msgstr "Falta de espaço suficiente para auto-alocação"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Nada a fazer"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Erro ao abrir %s para escrita: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Disquete"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Disco"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
-msgstr "Gravadores de CD/DVD"
+msgstr "Gravadores  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 "Cassete"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Placa de Vídeo"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
-msgstr "Placa TV"
+msgstr "Placa de TV"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Outros dispositivos Multimédia"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Placa de Som"
 
-#: 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 "Processadores"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Adaptadores ISDN"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Placa Ethernet"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "Adaptadores ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Controladores AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Pontes e controladores do 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 "Rato"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
-msgstr "Maneta de Jogo"
+msgstr "Joystick"
 
 #: harddrake/data.pm:281
 #, c-format
@@ -3007,73 +3232,95 @@ msgstr "Controladores Firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Controladores PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Controladores SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Controladores USB"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "Portas USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Controladores SMBus"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Rato"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Digitalizador"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
-msgstr "Desconhecido|Outros"
+msgstr "Desconhecido/Outros"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "processador # "
 
-#: 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 "Por favor aguarde... A aplicar a configuração"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
-msgstr "Nenhum piloto alternativo"
+msgstr "Nenhum drive alternativo"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr ""
-"Não há nenhum piloto alternativo OSS/ALSA conhecido para a sua placa de som "
-"(%s) que utiliza actualmente \"%s\""
+"Não há nenhum drive alternativo OSS/ALSA conhecido para a sua placa de som (%"
+"s) que actualmente use \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Configuração do Som"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
-"Aqui você pode escolher um piloto alternativo (seja OSS ou ALSA) para a sua "
+"Aqui pode seleccionar um drive alternativo (seja OSS ou ALSA) para a sua "
 "placa de som (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3083,10 +3330,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"A sua placa utiliza agora o piloto %s\"%s\" (o piloto por omissão para a sua "
+"A sua placa actualmente usa o drive %s\"%s\" (o drive padrão para a sua "
 "placa é \"%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 "
@@ -3105,86 +3352,88 @@ msgid ""
 "- the new ALSA api that provides many enhanced features but requires using "
 "the ALSA library.\n"
 msgstr ""
-"OSS (Sistema de Som Aberto) era o primeiro API. É um API de som independente "
-"do OS (funciona na maioria dos sistemas Unix) mas é um API muito básico e "
-"limitado.\n"
-"Ainda por cima, todos os pilotos OSS  reinventam a roda.\n"
+"OSS (Open Sound System) era o primeiro som API. É um som API de um OS "
+"independente (está disponivel na maior parte dos sistemas Unix) mas é um API "
+"muito básico\n"
+"e limitado. Ainda mais, todos os drives OSS reinventam a roda.\n"
 "\n"
-"ALSA (Arquitectura Avançada de Som Linux) é uma arquitectura modular que "
-"suporta um grande numero de placas ISA, USB e PCI.\n"
+"ALSA (Advanced Linux Sound Architecture) é uma arquitectura modularizada que "
+"suporta\n"
+"um grande numero de placas ISA, USB e PCI.\n"
 "\n"
-"Também fornece um API de muito mais alto nível que OSS.\n"
+"Também fornece um API mais elevado que um OSS.\n"
 "\n"
-"Para utilizar alsa, pode escolher :\n"
-"- ou o antigo API de compatibilidade OSS\n"
-"- ou o novo API ALSA que fornece muitas funções mas exige a utilização da "
+"Para usar alsa, um pode também usar:\n"
+"- o antigo API de compatibilidade OSS\n"
+"- o novo API ALSA que fornece muitas funções melhoradas mas exige o uso da "
 "livraria 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 "Piloto :"
+msgstr "Driver:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Correcção de problemas"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
-"O antigo piloto \"%s\" está na lista preta.\n"
+"O antigo driver \"%s\" está na lista preta.\n"
 "\n"
-"Foi indicado que ele provoca erros no núcleo ao descarregar.\n"
+"Foi indicado que ele provoca erros no kernel ao descarregar.\n"
 "\n"
-"O novo piloto \"%s\" só vai ser utilizado no próximo arranque."
+"O novo driver \"%s\" irá apenas ser usado no próximo arranque."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
-msgstr "Nenhum piloto livre"
+msgstr "Nenhum drive open source"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
 msgstr ""
-"Não há nenhum piloto livre para a sua placa de som (%s), mas existe um "
-"piloto proprietário em \"%s\"."
+"Não há nenhum drive livre para a sua placa de som (%s), mas existe um drive "
+"apropriado em \"%s\"."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
-msgstr "Nenhum piloto conhecido"
+msgstr "Nenhum drive conhecido"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr "Não há nenhum piloto conhecido para a sua placa de som (%s)"
+msgstr "Não há nenhum drive conhecido para a sua placa de som (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
-msgstr "Modelo desconhecido"
+msgstr "Driver desconhecido"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
-msgstr "Erro : o piloto \"%s\" para a sua placa de som não está na lista"
+msgstr "Erro: o drive \"%s\" para a sua placa de som não está listado"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Correcção de problemas de som"
 
-#: 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"
@@ -3210,37 +3459,36 @@ msgstr ""
 "O teste clássico a fazer em caso de problemas de som são os comandos :\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep AUDIO\" vai dizer-lhe qual piloto a sua placa\n"
-"utiliza por omissão\n"
+"- \"lspcidrake -v | fgrep AUDIO\" diz-lhe que drive a sua placa usa\n"
+"por defeito\n"
 "\n"
-"- \"grep sound-slot /etc/modules.conf\" vai dizer-lhe qual piloto ela\n"
-"utiliza agora\n"
+"- \"grep sound-slot /etc/modules.conf\" diz-lhe que drive actualmente\n"
+"usa\n"
 "\n"
-"- \"/sbin/lsmod\" vai permitir-lhe de verificar se o seu módulo está\n"
+"- \"/sbin/lsmod\" permite-lhe verificar se o seu módulo driver) está\n"
 "carregado ou não\n"
 "\n"
-"- \"/sbin/chkconfig --list sound\" e \"/sbin/chkconfig --list alsa\" vai\n"
-"dizer-lhe se os serviços sound e alsa estão configurados para serem "
-"lançados\n"
-"no nível de inicialização 3\n"
+"- \"/sbin/chkconfig --list sound\" e \"/sbin/chkconfig --list alsa\" diz-"
+"lhe\n"
+"se os serviços sound e alsa estão configurados para ser lançados no\n"
+"initlevel 3\n"
 "\n"
-"- \"aumix -q\" vai dizer-lhe se o som está baixado ou não\n"
+"- \"aumix -q\" diz-lhe se o volume de som está 'mudo' ou não\n"
 "\n"
-"- \"/sbin/fuser -v /dev/dsp\" vai dizer-lhe qual programa utiliza a placa "
-"de\n"
-"som.\n"
+"- \"/sbin/fuser -v /dev/dsp\" diz-lhe que programa a placa de som usa.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
-msgstr "Deixe-me escolher qualquer piloto"
+msgstr "Deixe-me escolher qualquer driver"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
-msgstr "A escolher arbitrariamente um piloto"
+msgstr "A escolher arbitrariamente um driver"
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3249,10 +3497,10 @@ msgid ""
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Se você pensa que sabe qual é o bom piloto para a sua placa de som\n"
-"pode escolher-lo na lista abaixo.\n"
+"Se realmente pensa que sabe qual é driver é o apropriado para a sua placa\n"
+"pode escolher um da lista seguinte.\n"
 "\n"
-"O piloto actual para a sua placa de som \"%s\" é \"%s\" "
+"O driver actual para a sua placa de som \"%s\" é \"%s\" "
 
 #: harddrake/v4l.pm:14
 #, c-format
@@ -3282,31 +3530,30 @@ msgid ""
 "If your card is misdetected, you can force the right tuner and card types "
 "here. Just select your tv card parameters if needed."
 msgstr ""
-"Para a maioria das placas TV modernas, o modulo bttv do núcleo GNU/Linux "
-"detecta automaticamente os bons parâmetros.\n"
-"Se a sua placa for mal detectada, pode forçar os tipos correctos de "
-"sintonizadore de placa aqui. Escolha os seus parâmetros somente se "
-"necessário."
+"Para a maioria das placas TV modernas, o modulo bttv do kernel GNU/Linux "
+"auto detecta os parametros certos.\n"
+"Se a sua placa não é detectada, aqui pode forçar os correctos sintonizadores "
+"e tipos de de placa. Escolha os seus parâmetros de placa de tv se necessário."
 
 #: harddrake/v4l.pm:312
 #, c-format
 msgid "Card model:"
-msgstr "Modelo da Placa :"
+msgstr "Modelo da Placa:"
 
 #: harddrake/v4l.pm:313
 #, c-format
 msgid "Tuner type:"
-msgstr "Tipo de Sintonisador :"
+msgstr "Tipo de Sintonisador:"
 
 #: harddrake/v4l.pm:314
 #, c-format
 msgid "Number of capture buffers:"
-msgstr "Numero de tampos de captura :"
+msgstr "Número de buffers de captura :"
 
 #: harddrake/v4l.pm:314
 #, c-format
 msgid "number of capture buffers for mmap'ed capture"
-msgstr "Numero de tampos de captura de tipo mmap :"
+msgstr "Número de buffers de captura para captura mmap"
 
 #: harddrake/v4l.pm:316
 #, c-format
@@ -3316,125 +3563,135 @@ msgstr "Configuração PLL :"
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "Radio support:"
-msgstr "Suporte de radio :"
+msgstr "Suporte de rádio :"
 
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "enable radio support"
-msgstr "Activar o suporte de radio"
+msgstr "Activar o suporte de rádio"
 
 #: help.pm:11
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 msgstr ""
 "Antes de continuar, deve ler atentamente os termos da licença. Ela\n"
 "cobre toda a distribuição Mandrakelinux. Se concorda com todos os termos\n"
-"presentes, verifique a caixa \"%s\". Caso contrário, carregue no botão \"%s\" \n"
-"de modo a reiniciar o seu computador."
+"presentes, active a caixa \"%s\". Se não, pode clicar no botão \"%s\" para\n"
+"reiniciar o seu computador."
 
-#: 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 "Aceitar"
 
 #: help.pm:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
-"GNU/Linux é um sistema multi-utilizador, e isto significa que cada "
+"GNU/Linux é um sistema multi-utilizador, o que significa que cada "
 "utilizador\n"
-"pode ter a suas próprias preferências, os seus próprios ficheiros e etc.\n"
-"Pode ler o \"Guia do Utilizador\" para saber mais. Mas ao invés do \"root"
+"tem as suas próprias preferências, ficheiros e por aí a fora. Mas ao invés\n"
+"do root, que é o admnistrador do sistema, os utilizadores que adiciona "
+"neste\n"
+"ponto não serão autorizador a fazer qualquer mudança, excepto os seus\n"
+"próprios ficheiros e configurações, protegendo o sistema de mudanças\n"
+"inintencionas ou malíciosas que poderiam ter impacto. Vai ter que criar\n"
+"pelo menos um utilizador regular para si próprio -- esta é a conta que pode\n"
+"usar por rotina, no dia-à-dia. Contudo é muito fázil fazer login como root, "
+"para fazer o que quer que seja, pode também ser muito perigoso! Um simples\n"
+"erro pode significar que o seu sistema não volte a trabalhar. Se fizer um "
+"erro\n"
+"sério como utilizador regular, o pior que pode acontece, é que possa perder\n"
+"alguma informação, mas não afectará todo osistema.\n"
+"\n"
+"O primeiro campo pergunta por um nome real. Claro que náo é imperativo\n"
+"-- realmente até pode digitar o que quiser. O DrakX irá usar a primeira "
+"palavra\n"
+"que digitar neste campo e copiá-la para este campo \"%s\", que é o nome\n"
+"que este utilizador irá digitar para fazer o login no sistema. O próximo "
+"passo\n"
+"é para digitar uma senha. DE um posto de vista seguro, uma senha de um\n"
+"utilizador não privilegiado (regular) não é crucial cpmo uma senha \"root"
 "\",\n"
-"que é o administrador, os utilizadores que vai adicionar aqui não vão poder\n"
-"mudar nada de outro que os seus próprios ficheiros e a sua própria\n"
-"configuração. Vai precisar de criar pelo menos um utilizador normal\n"
-"para si. Vai ser a conta que deveria utilizar habitualmente. Mesmo se é\n"
-"muito pratico de se ligar sempre como \"root\", também pode ser muito\n"
-"perigoso! O mínimo erro de utilização pode deixar o seu sistema estragado.\n"
-"Se fizer um erro importante como utilizador normal, pode perder alguns "
-"dados\n"
-"seus, mas não todo o sistema.\n"
-"\n"
-"Primeiro, é preciso escrever o seu nome. Isto não é obrigatório, está claro\n"
-"- pode de facto escrever o que quiser. DrakX vai então propor a primeira\n"
-"palavra que escreveu como \"%s\". Isto é o nome que o\n"
-"utilizador vai utilizar para se ligar ao sistema. Pode mudar-lo. Depois\n"
-"tem de escrever uma senha. Uma senha de utilizador normal não é\n"
-"tão importante como a do \"root\" para a segurança, mas não há razão\n"
-"de a ignorar : são os seus ficheiros que correm perigo.\n"
-"\n"
-"Se carrega em \"%s\", poderá adicionar quantos quiser.\n"
-"adicione um utilizador para cada um dos seus amigos : o seu pai ou irmã por\n"
-"exemplo. Quando adicionou todos os utilizadores que deseja, escolha \"%s\".\n"
-"\n"
-"Se carregar no botão \"%s\" vai poder mudar o programa de linha de\n"
-"commando por omissão para este utilizador (bash por omissão).\n"
-"\n"
-"Quando acabar de adicionar todos os utilizadores, vai-lhe ser pedido de\n"
-"escolher um utilizador que pode ligar-se ao sistema quando o sistema\n"
-"arranca. Se isto o interessar (e não se preocupar muito com a segurança\n"
-"local), escolha o utilizador desejado e o gestor de janelas, pode então\n"
-"carregar em \"%s\". Se não quiser isto, desligue a caixa \"%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
+"mas não há razão para negligenciar a senha fazendo-a demasiado simples,\n"
+"ou simplsemente deixando em branco: claro que seriam os seus ficheiros que\n"
+"ficariam em risco.\n"
+"\n"
+"Assim que clicar em \"%s\",pode adicionar outros utilizadores. Adicionar um\n"
+"utilizador para cada um dos seus amigos, o seu pai, a sua irmã, etc. Clique\n"
+"em \"%s\" sempre que acabar de adicionar um utilizador.\n"
+"Ao clicar em \"%s\" permite-lhe mudar a \"shell\" pré-definida para esse\n"
+"utilizador (bash por omissão).\n"
+"\n"
+"Quando terminar de adicionar utilizadores, será-lhe dado a escolher um "
+"utilizador\n"
+"que automáticamente logado no sistema quando o computador arranca.\n"
+"Se está interessado nessa opção (e não se preocupa com a segurança local),\n"
+"escolha o utilizador desejado e gestor de janelas, depois clique em \"%s\".\n"
+"Se não está interessado nesta opção, simplesmente desactive a caixa \"%s\"."
+
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "Nome de utilizador"
+
+#: 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 "Próximo"
 
-#: 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çado"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3467,70 +3724,74 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"Aqui abaixo está a lista das partições Linux detectadas no seu disco "
-"rígido.\n"
-"Você pode aceitar as escolhas feitas pelo assistente, são boas para a "
-"maioria\n"
-"das instalações. Se faz modificações, tem pelo menos que definir uma "
-"partição\n"
-"raíz (\"/\"). Não escolha uma partição demasiado pequena ou não vai poder\n"
-"instalar suficientes programas. Se deseja gravar os seus dados noutra\n"
-"partição, vai precisar de criar uma partição para \"/home\"\n"
-"(só é possível se tem mais do que uma partição Linux disponível).\n"
-"\n"
-"Cada partição é listada como segue : \"Nome\", \"Tamanho\".\n"
-"\n"
-"\"Nome\" segue a estrutura : \"tipo de disco rígido\", \"número de disco "
-"rígido\",\n"
+"Aqui listadas estão as existentes partições Linux detectadas no seu disco.\n"
+"Pode mantes as escolhas feitas pelo assitente, desde que sejam boas para\n"
+"a maioria das instalações comuns. Se quer fazer alguma alteração, tem\n"
+"que pelo menos defnir uma partição root (\"/\"). Não escolha uma partição\n"
+"demsiado pequena ou não será capaz de instalar o software suficiente.\n"
+"\n"
+"Cada partiçãoe listada como se segue: \"Nome\", \"Capacidade\".\n"
+"\n"
+"\"Nome\" é estruturado: \"tipo de disco rígido\", \"número de disco rígido"
+"\",\n"
 "\"número de partição\" (por exemplo, \"hda1\").\n"
 "\n"
-"O \"tipo de disco rígido\" é \"hd\" se o seu disco rígido é IDE e\n"
+"O \"tipo de disco rígido\" é \"hd\" se o seu disco rígido é um disco IDE e\n"
 "\"sd\" se é um disco rígido SCSI.\n"
 "\n"
-"O \"número de disco rígido\" é sempre uma letra depois de \"hd\" \n"
-"ou \"sd\". Para os discos IDE :\n"
+"O \"número de disco rígido\" é sempre uma letra a seguir a \"hd\" \n"
+"ou \"sd\". Para os discos IDE:\n"
 "\n"
-" * \"a\" significa \"disco rígido mestre no primeiro controlador IDE\";\n"
+" * \"a\" significa \"disco rígido master no primeiro controlador IDE\";\n"
 "\n"
-" * \"b\" significa \"disco rígido escravo no primeiro controlador IDE\";\n"
+" * \"b\" significa \"disco rígido slave no primeiro controlador IDE\";\n"
 "\n"
-" * \"c\" significa \"disco rígido mestre no segundo controlador IDE\";\n"
+" * \"c\" significa \"disco rígido master no segundo controlador IDE\";\n"
 "\n"
-" * \"d\" significa \"disco rígido escravo no segundo controlador IDE\".\n"
+" * \"d\" significa \"disco rígido slave no segundo controlador IDE\".\n"
 "\n"
-"Com os discos SCSI, um \"a\" significa \"mais baixo ID SCSI\", um \"b\"\n"
-"significa \"segundo mais baixo ID SCSI\", etc."
+"Com os discos rígidos SCSI, um \"a\" significa \"ID SCSI mais baixo\", um\n"
+"\"b\" significa \"segundo ID SCSI mais baixo\", 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 ""
-"A instalação do Mandrakelinux encontra-se distribuida por vários CD-ROMs. Se\n"
-"um pacote seleccionado se encontrar noutro CD-ROM, o DrakX irá ejectar o CD\n"
-"actual e pedir pela inserção do CD correcto."
+"A instalação do Mandrakelinux é distribuída em vários CD-ROMs. Se um\n"
+"pacote seleccionado está localizado num outro CD-ROM, o DrakX irá ejectar\n"
+"o actual CD e pedir para inserir o CD pedido. Se não tem o CD em questão à\n"
+"mão, clique apenas em \"%s\", o pacote correspondente não será instalado."
 
-#: help.pm:91
-#, fuzzy, c-format
+#: 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"
@@ -3540,9 +3801,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"
@@ -3552,398 +3823,353 @@ 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"
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
+msgstr ""
+"É agora tempo de especificar quais programas deseja instalar no seu "
+"sistema.\n"
+"Há centenas de pacotes disponíveis para o Mandrakelinux, e para simplificar "
+"a\n"
+"gestão, eles foram colocados em grupos de aplicações similares.\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"
+"O Mandrakelinux classifica os grupos de pacotes em quatro categorias. Pode\n"
+"misturar e combinaraplicações de várias categorias, para que a instalação\n"
+"de uma ``Estação de trabalho'' possa ainda ter aplicações da categoria de\n"
+"``Servidor'' instaladas.\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 ""
-"É agora o momento de indicar os programas que deseja instalar no\n"
-"seu sistema. Há centenas de pacotes disponíveis para Mandrake\n"
-"Linux, e para simplificar eles foram metidos em grupos de programas\n"
-"semelhantes.\n"
+" * \"%s\": se planeia usar a sua máquina comouma estação de trabalho,\n"
+"escolha um ou mais dos grupos dessa mesma categoria.\n"
 "\n"
-"Os pacotes estão arrumados por grupos que correspondem a um uso\n"
-"particular da sua máquina. Mandrakelinux contêm quatro instalações\n"
-"pré-definidas. Pode compreender estes tipos de instalação como\n"
-"grupos de pacotes. Pode misturar programas de pacotes diferentes, portanto "
-"uma instalação ``Estação de trabalho'' pode conter programas\n"
-"da instalação ``Desenvolvimento'' :\n"
+" * \"%s\": se planeia em usar a sua máquina para programar, seleccione os\n"
+"grupos apropriados dentro dessa categoria. O grupo especial \"LSB\" irá\n"
+"configurar o seu sistema para que cumpra o quanto possível dentro das \n"
+"especificações padrão base do Linux.\n"
 "\n"
-" * \"%s\": se planeia utilizar a sua máquina como\n"
-"uma estação de trabalho, escolha um ou mais destes grupos;\n"
+"   Seleccionar o grupo \"LSB\" irá também instalar as séries kernel \"2.4"
+"\",\n"
+"em vez do padrão \"2.6\". Isto é para garantir 100%%-LSB concordância do\n"
+"sistema. No entanto, se não seleccionar o grupo \"LSB\", terá na mesma um\n"
+"sistema que é 100%% LSB-concordante.\n"
 "\n"
-" * \"%s\": se a sua máquina vai ser utilizada para\n"
-"programar, escolha os pacotes desejados; \n"
+" * \"%s\": se pretende que a sua máquina seja um servidor, seleccione\n"
+"qual dos serviços comuns deseja instalar na sua máquina.\n"
 "\n"
-" * \"%s\": se esta máquina vai ser um servidor, vai poder\n"
-"escolher quais serviços dos mais comuns deseja instalar;\n"
+" * \"%s\": aqui é onde irá escolher o seu ambiente gráfico preferido. Ao "
+"menos\n"
+"deve ser seleccionado se deseja ter ter um interface gráfico disponível.\n"
 "\n"
-" * \"%s\": aqui pode escolher o seu ambiente gráfico\n"
-"preferido. Deve escolher pelo menos um se quer ter uma estação\n"
-"de trabalho gráfica!\n"
+"Movendo o cursor do rato sobre o nome de um grupo, irá mostrar um breve\n"
+"texto ex planatório acerca desse grupo.\n"
 "\n"
-"Se posiciona o rato sobre um nome de grupo vai obter uma texto\n"
-"curto de explicação. Se de-seleccionar todos os grupos ao fazer uma\n"
-"instalação normal (e não uma actualização), um dialogo vai-lhe\n"
-"propor as opções de uma instalação mínima :\n"
+"Pode seleccionar a caixa \"%s\", que é útil se estiver familiarizado com os\n"
+"pacotes oferecidos ou se quer ter controle total sobre o que irá ser "
+"instalado.\n"
 "\n"
-" * \"%s\": instala o mínimo de pacotes para ter um ambiente\n"
-"gráfico;\n"
+"Se começa a instalação em modo \"%s\", pode desseleccionar todos os\n"
+"grupos e prevenira instalação de novos pacotes. Isto é útil para reparar ou\n"
+"actualizar um sistema existente.\n"
 "\n"
-" * \"%s\": instala o sistema mínimo com\n"
-"os utilitários de base e a documentação deles. É uma boa\n"
-"instalação para um servidor;\n"
+"Se desseleccionar todos os grupos quando executa uma instalação regular\n"
+"(em oposição a uma actualização), um diálogo aparecerá a sugestionar\n"
+"opções diferentes para uma instalação mínima:\n"
 "\n"
-" * \"%s\": vai instalar o mínimo para\n"
-"obter um sistema Linux funcional, só com linha de commando. Esta\n"
-"instalação faz aproximadamente 65MB.\n"
+" * \"%s\": instala o número mínimo de pacotes possíveis para ter um\n"
+"ambiente gráfico instalado.\n"
 "\n"
-"Pode marcar a caixa \"%s\", que é útil\n"
-"si conhece os pacotes propostos ou se deseja ter um controlo total\n"
-"sobre o que vai ser instalado.\n"
+" * \"%s\": instala o sistema base mais utilidades básicas e a sua\n"
+"documentação. Esta instalação é apropriada para configurar um servidor.\n"
 "\n"
-"Se começou a instalação em modo \"%s\", pode\n"
-"de-seleccionar todos os grupos para evitar de instalar qualquer\n"
-"novo pacote. Isto é útil para arranjar ou actualizar um sistema já\n"
-"instalado."
+" * \"%s\": irá instalar o número mínimo absoluto de pacotes necessários\n"
+"para ter um sistema Linux. Com esta instalação irá apenas ter um interface\n"
+"de linha de comandos. O tamanho total desta instalação é cerca de 65\n"
+"megabytes."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
-msgstr "Desenvolvimento"
+msgstr "Programação"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Selecção individual de pacotes"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Actualizar"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Com X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
-msgstr "Com a documentação de base"
+msgstr "Com documentação de base"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Verdadeira instalação mínima"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Selecção individual de pacotes"
-
-#: help.pm:137 help.pm:602
+#: help.pm:149
 #, c-format
-msgid "Upgrade"
-msgstr "Actualizar"
-
-#: help.pm:140
-#, 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 ""
-"Se escolheu de poder seleccionar individualmente os pacotes,\n"
-"vai-lhe ser proposta uma arvore com todos os pacotes classificados por\n"
-"grupos e subgrupos. Quando vai navegar na árvore, vai poder seleccionar\n"
-"grupos inteiros, subgrupos, ou pacotes individuais.\n"
+"Se escolheu instalar pacotes individualmente, o instalador ira apresentar\n"
+"uma árvore contendo todos os pacotes classificados por grupos e \n"
+"subgrupos. Enquanto navega na árvore, pode seleccionar grupos \n"
+"inteiros, subgrupos, ou Quando vai navegar na árvore, vai poder seleccionar\n"
+"grupos inteiros de pacotes, subgrupos, ou individualmente.\n"
 "\n"
-"Cada vez que escolhe um pacote na arvore, uma descrição aparece na\n"
-"direita.\n"
+"Sempre que seleccionar um pacote na árvore, uma descrição irá\n"
+"aparecer à direita para que saiba o propósito desse pacote.\n"
 "\n"
-"!! Se um pacote de servidor foi seleccionado, de propósito ou porque fazia\n"
+"!! Se um pacote servidor foi seleccionado, de propósito ou porque fazia\n"
 "parte dum grupo, vai-lhe ser pedido de confirmar que deseja mesmo\n"
 "instalar esse servidor. Sob Mandrakelinux, todos os servidores\n"
 "instalados são iniciados ao arranque. Mesmo se eles são seguros e não\n"
 "têm problemas conhecidos na saída da distribuição, podem ter sido\n"
-"descobridos buracos de segurança depois desta versão de Mandrake\n"
-"Linux ter sido acabada. Se você não souber para que serve um serviço\n"
+"descobridos buracos de segurança depois desta versão de Mandrakelinux\n"
+"ter sido acabada. Se você não souber para que serve um serviço\n"
 "particular ou porque o instalar, carregue em \"%s\". Carregar em \"%s\" \n"
 "vai instalar os serviços iniciar-los automaticamente por omissão. !!\n"
 "\n"
-"A opção \"%s\" só desactiva o dialogo de aviso\n"
-"que aparece quando o instalador escolheu automaticamente um pacote.\n"
+"A opção \"%s\" é usada para desactivar o dialogo de aviso que\n"
+"aparece quando o instalador escolheu automaticamente um pacote.\n"
 "Isto acontece quando foi determinado que é preciso satisfazer uma\n"
 "dependência com outro pacote para conseguir a instalação.\n"
 "\n"
-"O pequeno ícone de disquete abaixo da lista permite de carregar uma\n"
-"lista de pacotes escolhida durante uma instalação anterior. Carregando\n"
-"neste ícone vai pedir-lhe de inserir uma disquete criada ao fim duma\n"
-"instalação anterior. Veja o segundo conselho do passo anterior sobre\n"
-"como criar uma disquete deste tipo."
+"O pequeno ícone de disquete abaixo da lista permite carregar uma\n"
+"lista de pacotes escolhida durante uma instalação anterior. Se carregar\n"
+"neste ícone vai lhe pedir que insira uma disquete que tenha sido criada \n"
+"no fim de uma instalação anterior. Veja o segundo conselho do passo \n"
+"anterior sobre como criar uma disquete deste tipo."
 
-#: 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 "Não"
 
-#: 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 "Sim"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
-msgstr "Dependencias automaticas"
+msgstr "Dependências automáticas"
 
-#: help.pm:175
-#, fuzzy, 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 ""
-"Você pode agora configurar a sua ligação Internet/rede. Se deseja ligar o\n"
-"seu computador ao Internet ou a uma rede local, carregue em \"%s\".\n"
-"Mandrakelinux vai tentar uma detecção automática de dispositivos de\n"
-"rede e modem. Se esta detecção falhar, desligue a caixa \"%s\". Também\n"
-"pode escolher de não configurar a rede, ou de o\n"
-"fazer mais tarde; neste caso, basta carregar no botão \"%s\" que o vai\n"
-"levar ao passo seguinte.\n"
-"\n"
-"Quando configura a rede, as ligações disponíveis são : modem tradicional,\n"
-"modem ISDN, ligação ADSL, modem de cabo, e enfim uma simples\n"
-"ligação à rede local (Ethernet).\n"
-"\n"
-"Aqui, não vai detalhar cada configuração - basta ter todos os parametros\n"
-"como o endereço IP, ponte por omissão, servidores DNS, etc.\n"
-"dados pelo seu Fornecedor de Acesso Internet ou administrador sistema.\n"
-"\n"
-"Pode ver no ''Guia do Utilizador'' o capitulo sobre as ligações Internet\n"
-"para mais detalhes sobre a configuração, ou esperar o fim de instalação\n"
-"do sistema e utilizar o programa indicado aqui para configurar a sua\n"
-"ligação."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Usar auto-detecção"
-
-#: 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\": Carregando no botão \"%s\" vai abrir o assistente\n"
-"de configuração. Veja o capitulo que corresponde no ''Guia do Utilizador''\n"
-"para saber como configurar uma nova impressora. O interface apresentado\n"
-"aqui é o mesmo que o utilizado durante a instalação."
+"\"%s\": Ao clicar no botão \"%s\"será iniciado o assistente de configuração\n"
+"de impressoras. Consulte o capítulo correspondente no ''Guia do "
+"Utilizador''\n"
+"para obter mais informações em como configurar uma nova impressora. O\n"
+"interface apresentado no nosso manual é semelhante ao utilizado durante\n"
+"a instalação."
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
+#: standalone/drakbackup:2329 standalone/drakbackup:2333
+#: standalone/drakbackup:2337 standalone/drakbackup:2341
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
-"Pode agora escolher quais serviços deseja lançar ao arranque.\n"
+"Este diálogo é usado para escolher que serviços deseja iniciar no arranque.\n"
 "\n"
-"DrakX apresenta todos os serviços disponíveis com a\n"
-"instalação que fez. Controle-os atentamente e desligue os que não\n"
-"são sempre necessários ao arranque.\n"
+"O DrakX irá listar todos os serviços disponíveis na actual instalação\n"
+"Revê cada um deles cuidadosamente e desactiva aqueles que não são\n"
+"precisos no arranque.\n"
 "\n"
-"Pode obter um curto texto de descrição do serviço ao escolher\n"
-"um serviço. No entanto, se não tem a certeza de saber se um\n"
-"serviço é útil ou não, mais vale deixar-lo na posição por omissão.\n"
+"Um breve texto de introdução será mostrado acerca do serviço quando\n"
+"este for seleccionado. No entanto, se não tem a certeza se o serviço é\n"
+"útil ou não, é mais seguro deixa-lo como estava.\n"
 "\n"
-"!! Aqui, seja muito atento se pretende utilizar a sua máquina como\n"
-"um servidor : não vai provavelmente querer lançar os serviços de\n"
-"que não precisa. Lembre-se por favor que vários serviços podem ser\n"
-"perigosos se são activados num servidor. De maneira geral, escolha\n"
-"só os serviços de que precisa mesmo.\n"
-"!!"
+"!! Nesta altura, tenha cuidado se tenciona usar a sua máquina como\n"
+"um servidor: provavelmente não quererá iniciar qualquer serviço que\n"
+"não conheça. Por favor lembre-se que alguns serviços podem ser\n"
+"perigosos se forem activados num servidor. Em geral, seleccione\n"
+"apenas aqueles serviços querealmente precisa. !!"
 
-#: help.pm:224
-#, fuzzy, c-format
+#: help.pm:206
+#, c-format
 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 trabalha com a hora GMT (Greenwich Mean Time) e traduz-la em\n"
-"hora local conforme a zona que escolheu. Pode no entanto desactivar isto\n"
-"ao de-seleccionar \"%s\" para que o relógio\n"
-"material seja o mesmo que o relógio sistema. Isto é útil quando a máquina\n"
-"tem outro sistema operativo como o Windows.\n"
-"\n"
-"A opção \"%s\" vai regular automaticamente\n"
-"o relógio ligando-se a um servidor remoto no Internet. Na lista que lhe é\n"
-"apresentada, escolha um servidor perto de si. É evidente que vai precisar\n"
-"de uma ligação ao Internet activa para que isto funcione. De facto, esta\n"
-"opção vai instalar na sua máquina um servidor de tempo que poderá\n"
-"ser utilizado por outras máquinas na sua rede local."
-
-#: help.pm:235 install_steps_interactive.pm:822
+"also hosts another operating system.\n"
+"\n"
+"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 ""
+"O GNU/Linux gere o tempo em GMT (Greenwich Mean Time) e traduze-o em\n"
+"hora local conforme a zona que escolheu. Se o relógio da sua motherboard\n"
+"estiver definido para hora local, pode desactivar isto ao desseleccionar \n"
+"\"%s\", que dará indicação ao GNU/Linux que o relógio do sistema e o de\n"
+"hardware estão no mesmo fuso horário. Isto revela-se útil quando a máquina\n"
+"'opera' outro sistema operativo.\n"
+"\n"
+"A opção \"%s\" irá regular automaticamente o relógio ligando-se a um "
+"servidor\n"
+"horário remoto na Internet. Para que esta função funcione, é necessária uma\n"
+"ligação à internet. Recomendamos que escolha um servidor horário localizado\n"
+"perto de si. Na realidade, esta instala um servidor horário que poderá ser "
+"usado\n"
+"por outras máquinas na sua rede local."
+
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr "O relógio material está na hora GMT"
+msgstr "Relógio do hardware definido na hora GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Sincronização automática da 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 ""
 "Placa Gráfica\n"
 "\n"
-"   Normalmente este instalador detecta e configura automaticamente \n"
-"a placa gráfica instalada na sua máquina. Se não for o caso, pode\n"
-"seleccionar na lista a sua placa.\n"
+"   Normalmente o instalador detecta e configura automáticamente \n"
+"a placa gráfica instalada na sua máquina. Se isto não é correcto,\n"
+"pode escolher da lista a placa que tem instalada.\n"
 "\n"
-"   No caso de existirem vários servidores disponíveis para a sua placa,\n"
-"com ou sem aceleração 3D, ser-lhe-á requisitada a escolha do servidor\n"
-"que melhor se adapta às suas necessidades."
+"   Na caso caso de existirem vários servidores disponíveis para a sua "
+"placa,\n"
+"com ou sem aceleração 3D, ser-lhe-á pedido que escolha o servidor\n"
+"que melhor sirva as suas necessidades."
 
-#: help.pm:249
-#, fuzzy, c-format
+#: help.pm:231
+#, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3952,304 +4178,323 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "X (para Sistema X Window) é o coração do interface gráfico do GNU/Linux\n"
 "no qual todos os ambientes gráficos (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) fornecidos com o Mandrakelinux funcionam.\n"
 "\n"
-"Vai-lhe ser apresentada uma lista de parâmetros a mudar para obter um\n"
-"ecrã óptimo : Placa Gráfica\n"
+"Irá ver uma lista de parâmetros diferentes para mudar, para poder \n"
+"obter uma boa apresentação gráfica\n"
+"\n"
+"Placa Gráfica\n"
 "\n"
-"   O instalador pode normalmente detectar e configurar automaticamente \n"
-"a placa gráfica da sua máquina. Se não for o caso, pode escolher na\n"
-"lista a placa que tem.\n"
+"   O instalador irá normalmente detectar e configurar automaticamente \n"
+"a placa gráfica da sua máquina. Se isto não estiver correcto, pode "
+"escolher \n"
+"da lista a placa gráfica que tem instalada.\n"
 "\n"
-"   Se houver diferentes servidores possíveis para a sua placa, com ou sem\n"
-"aceleração 3D, vi-lhe ser proposto de escolher o servidor mais adaptado\n"
-"ao que precisa.\n"
+"   Se na situação de haver diferentes servidores disponiveis para a sua "
+"placa, \n"
+"com ou sem aceleração 3D, será-lhe dado a escolher o servidor que melhor \n"
+"sirva as suas necessidades\n"
 "\n"
 "\n"
 "\n"
-"Ecrã\n"
+"Monitor\n"
 "\n"
-"   O instalador vai normalmente detectar e configurar automaticamente \n"
-"o ecrã da sua máquina. Se não for correcto, pode escolher na lista o\n"
-"ecrã que tem.\n"
+"   Normalmente o instalador irá automáticamente detectar e configurar \n"
+"o ecrã/monitor ligado á sua máquina. Se não estiver correcto, pode "
+"escolher \n"
+"da lista o monitor que está ligado ao seu computador.\n"
 "\n"
 "\n"
 "\n"
-"Definição\n"
+"Resolução\n"
 "\n"
-"   Aqui pode escolher a definição e a qualidade das cores que pode\n"
-"mostrar o seu material. Escolha a que precisa (vai poder mudar isto\n"
-"depois da instalação no entanto). Um exemplo da configuração\n"
-"escolhida é mostrado no ecrã.\n"
+"   Aqui pode escolher as resoluções e cores disponiveis para o seu\n"
+"hardware gráfico. Escolha o que melhor sirva as suas necessidades\n"
+"(poderá fazer alteações a seguir àinstalação)\n"
+"Um exemplo da configuração escolhida é mostrada no ecrã.\n"
 "\n"
 "\n"
 "\n"
 "Teste\n"
 "\n"
-"   o sistema vai tentar lançar um ecrã gráfico na definição escolhida.\n"
-"Se puder ver a mensagem durante o teste e responder \"%s\", DrakX\n"
-"vai continuar para a etapa seguinte. Se não puder ver a mensagem,\n"
-"significa que algo na configuração está errado, e o teste vai acabar\n"
-"automáticamente no fim de 12 segundos, voltando ao menu. Mude\n"
-"a configuração até obter uma boa imagem.\n"
+"   Dependendo do seu hardware, esta entrada poderá não apareder.\n"
+"\n"
+"   S sistema irá tentar abrir um ecrã gráfico na resolução escolhida.\n"
+"Se conseguir ver a mensagem teste durante o teste e responder \"%s\",\n"
+"então o DrakX irá proceder á etapa seguinte. Se não o vir, então\n"
+"significa que alguma parte da configuração auto detectada está\n"
+"incorrecta e o teste irá acabar automáticamente ao fim de 12 segundos,\n"
+"e returnrá ao menu. Mude as configurações até obtenha a correcta\n"
+"disposição gráfica.\n"
 "\n"
 "\n"
 "\n"
 "Opções\n"
 "\n"
 "   Aqui pode escolher se deseja que o computador arranque\n"
-"automáticamente em modo gráfico. De facto, vai querer carregar em\n"
+"automáticamente em modo gráfico. De facto, pode querer verificar\n"
 "\"%s\" se a sua máquina é um servidor, ou se não consegui obter\n"
 "uma boa configuração do ecrã."
 
-#: 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"
-"   O instalador pode normalmente detectar e configurar automaticamente\n"
-"o monitor ligado à sua máquina. Se não for o caso, pode seleccionar nesta\n"
+"   Normalmente o instalador detectar e configurar automaticamente o\n"
+"monitor ligado à sua máquina. Se não estiver correcto, pode escolher desta\n"
 "lista o monitor que está ligado ao computador."
 
-#: 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 ""
 "Resolução\n"
 "\n"
-"   Pode aqui escolher uma resolução e uma profundidade de cor entre as\n"
+"   Aqui pode escolher uma resolução e uma profundidade de cor entre as\n"
 "disponíveis para o seu hardware. Escolha a que melhor se adapta às\n"
 "suas necessidades (poderá, no entanto, alterar após a instalação). Uma\n"
 "amostra da configuração escolhida será apresentada no monitor."
 
-#: 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 ""
-"No caso de existirem vários servidores disponíveis para a sua placa,\n"
+"Na situação, onde há diferentes servidores disponiveis para a sua placa,\n"
 "com ou sem aceleração 3D, é-lhe pedido que escolha o servidor que\n"
-"melhor se adapta às suas necessidades."
+"melhor sirva as suas necessidades."
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Opções\n"
 "\n"
-"  Aqui vai-lhe ser perguntado se deseja ver o interface gráfico ao\n"
-"arranque. Note que esta questão vai lhe ser proposta mesmo se escolhe\n"
-"de não testar a configuração. É obvio que deveria responder \"%s\" se a\n"
-"sua máquina vai ser um servidor, ou se não conseguiu obter uma\n"
-"configuração correcta do ecrã."
+"   Este passo permite-lhe escolher se quer que a sua máquina "
+"automáticamente\n"
+"mude para um interface gráfico ao arrancar. Obviamente, pode querer "
+"seleccionar\n"
+"\"%s\" se a sua máquina está para agir como um servidor, ou se não foi bem\n"
+"sucedido a configurar o monitor."
 
-#: help.pm:332
-#, fuzzy, c-format
+#: help.pm:316
+#, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Você precisa agora escolher onde deseja instalar o sistema operativo\n"
+"Agora precisa decidir onde deseja instalar o sistema operativo\n"
 "Mandrakelinux no seu disco rígido. Se o seu disco rígido estiver vazio\n"
-"ou se um sistema operativo utiliza todo o espaço disponível, vai ser\n"
-"preciso particionar o disco. De maneira básica, particionar um disco\n"
-"rígido consiste em dividir-lo de maneira lógica para criar o espaço de\n"
-"instalação do seu novo sistema Mandrakelinux.\n"
+"ou, se um sistema operativo existente usa todo o espaço disponível,\n"
+"irá ser preciso particionar o disco. Básicamente, particionar um disco\n"
+"rígido significa dividi-lo de maneira lógica para criar o espaço\n"
+"necessário para instalar o seu novo sistema Mandrakelinux.\n"
 "\n"
 "Como os efeitos da operação de particionamento são geralmente\n"
-"irreversíveis, ela pode ser preocupadora se você é um utilizador sem\n"
-"experiência. Por sorte, existe um assistente que simplifica a operação.\n"
-"Antes de começar, leia atentamente por favor o manual.\n"
+"irreversíveis, e pode levar a perda de dados, particionar pode ser\n"
+"intimidante para um utilizador inexperiente. Felizmente, o DrakX\n"
+"inclui um assitente que simplifica o processo.Antes de avançar\n"
+"para o proximo passo lê pelo resto da secção e todo o resto,\n"
+"leva o tempo que necessitas.\n"
 "\n"
-"Segundo a configuração do seu disco rígido, varias opções\n"
+"Dependendo da configuração do disco rígido, várias opções\n"
 "estão disponíveis.\n"
 "\n"
-" * \"%s\": isto vai automaticamente particionar os\n"
-"disco vazios. Nenhuma outra pergunta lhe vai ser feita;\n"
-"\n"
-" * \"%s\": o assistente detectou uma ou\n"
-"varias partições Linux no disco rígido. Se deseja utilizar-las, escolha\n"
-"esta opção. vai-lhe ser pedido de escolher os pontos de montagem\n"
-"associados a cada partição. Os pontos habituais são escolhidos por\n"
-"omissão, porém deveria guardar-los normalmente .\n"
-"\n"
-" * \"%s\": se Microsoft Windows\n"
-"foi instalado no seu disco rígido e utiliza todo o espaço disponível, vai "
-"ser\n"
-"preciso criar espaço livre para os dados Linux. Para isso, pode apagar a\n"
-"sua partição Microsoft Windows e os dados (ver as soluções ``Apagar todo\n"
-"o disco'' ou ``Modo perito'') ou redimensionar a partição Microsoft "
-"Windows.\n"
-"Esta operação pode ser feita sem perder nenhum dado, se desfragmentou a\n"
-"partição Windows. Mesmo assim não faz mal de arquivar os seus dados..\n"
-"esta solução é aconselhada se deseja utilizar Mandrakelinux e Microsoft\n"
+" * \"%s\". Esta opção irá automaticamente particionar o(s)\n"
+"disco(s) vazio(s). Se usares esta opção, não serão feitas mais\n"
+"nenhumas perguntas.\n"
+"\n"
+" * \"%s\". O assistente detectou uma ou mais partições Linux no\n"
+"disco rígido. Se deseja as utilizar, escolha esta opção. Será-lhe\n"
+"então pedido para escolher o ponto de monstagem associado\n"
+"a cada partiçãogem. Os pontos habituais de monstagem são\n"
+"selecionados por omissão, e para a maior parte é uma boa ideia\n"
+"mantê-los assim.\n"
+"\n"
+" * \"%s\". Se a Microsoft Windows é instalada no seu disco rígido e \n"
+"utiliza todo o espaço disponível, irá ter que criar espaço livre para o\n"
+"GNU/Linux. Para o fazer, pode apagar a sua partição Microsoft Windows\n"
+"e dados (ver a solução ``Apagar o disco todo'') ou redimensionar a partição\n"
+"FAT ou NTFS do Microsoft Windows.\n"
+"Redimensionar pode ser feito sem a perda de qualquer dado, desde que\n"
+"você préviamente tenha desfragmentado a partição Windows.\n"
+"É recomendado que faça cópias de segurança. É recomendado que use\n"
+"opção, se quer usar os dois sistemas operativos, Mandrakelinus e Microsoft\n"
 "Windows no mesmo computador.\n"
 "\n"
-"   Antes de escolher esta opção, seria bom de compreender que no fim da\n"
-"operação , o tamanho da sua partição Microsoft Windows será inferior ao\n"
-"actual. Vai ter menos espaço livre sob Microsoft Windows para guardar\n"
-"dados ou instalar novos programas;\n"
+"   Antes de escolher esta opção, por favor compreenda que a seguir a este\n"
+"procedimento, o tamanho da partição do seu Microsoft Windows será mais\n"
+"pequeno.\n"
+"Terá menos espaço livre no Microsoft windows para guardar os seus dados\n"
+"ou instalar novo software.\n"
 "\n"
-" * \"%s\": se deseja apagar todos os dados e partições\n"
-"presentes no disco rígido para os sobrepor com o sistema Mandrakelinux,\n"
-"escolha esta opções. Seja atento com esta solução pois não vai poder\n"
-"anular a escolha de pois de ter confirmado;\n"
+" * \"%s\". Se deseja apagar todos os dados e todas as partições presentes "
+"no\n"
+"disco rígido e substituí-los pelo seu novo sistema Mandrakelinux, escolha\n"
+"esta opção. Seja cuidadoso, porque não será mais capaz de desfazer esta\n"
+"operação após ter confirmado.\n"
 "\n"
-"   !! Se escolhe esta opção, todos os dados no disco vai ser perdidos. !!\n"
+"   !! Se escolher esta opção, todos os dados no disco serão apagados. !!\n"
 "\n"
-" * \"%s\": isto vai somente apagar tudo no disco e começar\n"
-"com uma nova tabela de particionamento. Todos os dados no disco vão\n"
-"ser perdidos;\n"
+" * \"%s\": Esta opção aparece quando o disco rígido é inteiramente do "
+"sistema\n"
+"Microsoft Windows. Escolher esta opção irá simplesmente apagar tudo no\n"
+"disco e começar de novo a particionar tudo do princípio.\n"
 "\n"
-"   !! Se escolhe esta opção, todos os dados no disco vai ser perdidos. !!\n"
+"   !! Se escolher esta opção, todos os dados no disco vai ser perdidos. !!\n"
 "\n"
-" * \"%s\": escolha esta opção se deseja particionar manualmente\n"
-"o seu disco rígido. Seja atento -- é uma opção potente mas perigosa. Pode\n"
-"perder muito facilmente todos os dados. Portanto, não a escolha sem saber\n"
-"bem o que faz. Para saber como utilizar o utilitário DiskDrake, veja a "
-"secção\n"
-"``Gerir as partições'' no ``Guia de Instalação''."
+" * \"%s\". Escolha esta opção se deseja particionar manualmente o seu\n"
+"disco rígido. Tenha cuidado -- é uma opção potente mas perigosa e pode\n"
+"muito facilmente perder todos os seus dados. É por isso que esta opção\n"
+"é apenas recomendada a alguém que já tenha feito alguma coisa parecida\n"
+"anteriormente e tenha alguma experiência. Para mais instruções em como\n"
+"usar a utilidade DiskDrake, refira-se à secção ``Gerir as suas partições'' "
+"no\n"
+" ``Guia de Instalação''."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Usar espaço livre"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
-msgstr "Utilizar a partição existente"
+msgstr "Usar partição existente"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "Usar o espaço livre na partição Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
-msgstr "Apagar o disco inteiro"
+msgstr "Apagar disco inteiro"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Remover Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Particionamento de disco personalizado"
 
-#: help.pm:392
-#, fuzzy, c-format
+#: help.pm:377
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4257,192 +4502,201 @@ 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 ""
-"Aqui chegou. A instalação está agora completa e o seu sistema GNU/Linux\n"
-"está pronto a ser utilizado. Basta carregar em \"%s\" para reiniciar o\n"
-"sistema. Desde o fim dos testes materiais, vai ver o carregador\n"
-"de arranque, que lhe permite de escolher qual sistema operativo deseja\n"
-"lançar.\n"
+"Parabéns, a instalação está agora completa e o seu sistema GNU/Linux\n"
+"está pronto a ser usado. Clique em \"%s\" para reiniciar o sistema.\n"
+"Não se esqueça de remover a media de instalação (CD-ROM ou disquete).\n"
+"A primeira coisa que deve ver a seguir ao computador acabar os testes\n"
+"de hardware, é o menu do carregador de arranque, dando-lhe a opção\n"
+"de escolher qual o sistema operativo a iniciar.\n"
+"\n"
+"O botão \"%s\" mostra mais dois botões para:\n"
 "\n"
-"O botão \"%s\" propõe mais dois botões para :\n"
+" * \"%s\": permite-lhe criar uma disquete de instalação que irá\n"
+"automáticamente executar uma instalação completa sem a ajuda de\n"
+"um operador similar ao da instalação que ainda agora configurou.\n"
 "\n"
-" * \"%s\": para criar uma disquete de\n"
-"instalação que vai fazer toda a instalação se a ajuda de um operador,\n"
-"similar à instalação que acabou de configurar.\n"
+"   Note que duas opções diferentes são disponíveis depois de clicar\n"
+"naquele botão:\n"
 "\n"
-"   Note que duas opções diferentes são disponíveis depois de carregar\n"
-"no botão :\n"
-"    * \"%s\". Isto é uma instalação automática por parte pois só\n"
-"a partição do disco fica interactiva;\n"
+"    * \"%s\". Isto é uma instalação parcial automática. O passo de\n"
+"particionar é o único procedimento interactivo.\n"
 "\n"
-"    * \"%s\". Instalação completamente automática : o disco\n"
-"rígido é completamente apagado, todos os dados são perdidos.\n"
+"    * \"%s\". Instalação completamente automática : o disco rígido\n"
+"é completamente reescrito, todos os dados serão perdidos.\n"
 "\n"
-"   Esta opção é muito pratica para instalar varias máquinas iguais.\n"
-"Veja a secção Auto Instalação no nosso servidor web;\n"
+"   Esta opção é muito prática para instalar várias máquinas similares.\n"
+"Veja a secção Auto Instalação no nosso web site para mais\n"
+"informações.\n"
 "\n"
-" * \"%s\"(*): grava a selecção de pacotes\n"
-"como foi feita. Depois, quando faz outra instalação, insira a disquete\n"
-"no leitor e lance a instalação pelo ecrã de ajuda carregando na tecla\n"
-"[F1], e escrevendo >>linux defcfg=\"floppy\"<<.\n"
+" * \"%s\"(*): grava uma lista de pacotes seleccionados na instalação.\n"
+"Para usar esta selecção com outra instalação, insira uma disquete e\n"
+"comece a instalação. Na linha de comandos, carregue na tecla [F1],\n"
+"escreva >>linux defcfg=\"floppy\"<< e carregue na tecla [Enter].\n"
 "\n"
-"(*) Pode precisar duma disquete formatada FAT (para criar uma sob\n"
-"GNU/Linux, escreva \"mformat a:\")"
+"(*) Precisa de uma disquete formatada FAT. Para criar uma em GNU/Linux,\n"
+"escreva \"mformat a:\", ou \"fdformat /dev/fd0\" seguido de \"mkfs.vfat\n"
+"/dev/fd0\"."
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
-msgstr "Criar disquete de instalação automática"
+msgstr "Gerar disquete auto-instal"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Repetir"
 
-#: 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 "Guardar selecção de pacotes"
 
-#: help.pm:421
-#, fuzzy, c-format
+#: help.pm:412
+#, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Todas as partições que foram novamente definidas devem ser formatadas\n"
-"para ser utilizadas (formatar significa criar um sistema de ficheiros).\n"
+"Se escolher reúsar algumas partições GNU/Linux, pode querer reformatar\n"
+"algumas delas e apagar os dados nelas contidos. Para o fazer, por favor\n"
+"escolha essas partições.\n"
 "\n"
-"Neste  momento, pode desejar formatar algumas partições que já existiam\n"
-"para apagar todos os dados que elas contem. Se deseja fazer isto, por\n"
-"favor seleccione também essas partições.\n"
+"Por favor note que não é necessário reformatar todas a partições já\n"
+"existentes. Tem que reformatar as partições que contenham sistemas\n"
+"operativos (tais como \"/\", \"/usr\" or \"/var\") mas não tem que "
+"reformatar\n"
+"partições que contenham dados que deseja quardar (como \"/home\").\n"
 "\n"
-"Por favor note que não é obrigatório de formatar todas as partições que já\n"
-"existiam. Deve formatar as partições que contem o sistema operativo\n"
-"( como \"/\", \"/usr\" ou \"/var\") mas não é preciso formatar as partições\n"
-"que têm dados que deseja guardar ( normalmente \"/home\").\n"
+"Por favor tenha atenção quando seleccionar as partições. A seguir à\n"
+"formatação estar complecta, todos os dados nas partições seleccionadas\n"
+"serão perdidos e não será capaz de os recuperar.\n"
 "\n"
-"Seja atento quando selecciona partições. Depois de formatar, todos os\n"
-"dados das partições seleccionadas serão apagados e não poderá\n"
-"recuperar-los.\n"
+"Clique em \"%s\" quando estiver pronto para formatar as partições.\n"
 "\n"
-"Carregue em \"%s\" quando estiver pronto para formatar as partições.\n"
-"\n"
-"Carregue em \"%s\" se deseja escolher outra partição para instalar o seu\n"
-"novo sistema operativo Mandrakelinux.\n"
+"Clique em \"%s\" se deseja escolher outra partição para o seu novo\n"
+"sistema operativo Mandrakelinux.\n"
 "\n"
-"Carregue em \"%s\" se deseja indicar as partições a verificar\n"
-"fisicamente no caso de blocos defeituosos."
+"Clique em \"%s\" se deseja escolher partições para verificar se fisicamente\n"
+"há blocos defeituosos (\"bad blocks\") no disco."
 
-#: 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
-#, fuzzy, c-format
+#: help.pm:434
+#, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
-"No momento em que vai instalar Mandrakelinux, é quase certo que alguns\n"
-"pacotes vão ter sido actualizados desde a distribuição inicial. Alguns\n"
+"No momento que instala o Mandrakelinux, é quase certo que alguns\n"
+"pacotes terão sido actualizados desde a distribuição inicial. Alguns\n"
 "erros podem ter sido corrigidos, e problemas de segurança resolvidos. Para\n"
-"lhe permitir de aproveitar destas actualizações, pode agora descarregar-las\n"
-"a partir do Internet. Escolha \"%s\" se tem uma ligação Internet activa,\n"
-"ou \"%s\" se preferir instalar os pacotes actualizados mais tarde.\n"
+"lhe permitir beneficiar destas actualizações, está agora apto a fazer o\n"
+"download destas da Internet. Escolha \"%s\" se tem uma ligação Internet\n"
+"activa, ou \"%s\" se preferir instalar os pacotes actualizados mais tarde.\n"
 "\n"
-"Escolher \"%s\" mostra uma lista dos sítios a partir dos quais as\n"
-"actualizações podem ser descarregadas. Escolha o mais perto de si. Vai\n"
-"então aparecer uma arvore de selecção de pacotes : controle a selecção, e\n"
-"carregue em \"%s\" para descarregar e instalar os pacotes escolhidos,\n"
-"ou \"%s\" para parar."
+"Escolhendo \"%s\" mostra uma lista das localizações web de onde as\n"
+"actualizações podem ser descarregadas. Deve escolher a que estiver mais\n"
+"perto de si. Irá aparecer uma selecção de pacotes em árvore: reveja a\n"
+"selecção, e clique em \"%s\" para descarregar e instalar os pacotes\n"
+"seleccionados, ou clique em \"%s\" para abortar."
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: help.pm:460
-#, fuzzy, c-format
+#: help.pm:447
+#, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
-"Agora, o DrakX vai permitir-lhe de escolher o nível de segurança desejado\n"
-"para a máquina. Como regra de base, o mais exposta a máquina vai ser, e\n"
-"mais os dados gravados vão ser importantes, mais alto vai ser preciso\n"
-"meter o nível de segurança. No entanto, um alto nível de segurança é\n"
-"obtido perdendo facilidades de utilização.\n"
+"Nesta fase, o DrakX irá permitir-lhe escolher o nível de segurança desejado\n"
+"para a sua máquina. Como regra de ouro, o nível de seguraça deve ser maior\n"
+"quando a máquina contém informação crucial, ou quando está directamente\n"
+"exposta à internet. Porém, um nível de segurança superior, geralmente é "
+"obtido\n"
+"á custa de menos facilidade de uso/manuseamento.\n"
 "\n"
-"Se não sabe o que escolher, guarde o valor por omissão."
+"Se não sabe o que escolher, deixe o valor por omissão. Poderá alterá-lo "
+"mais\n"
+"tarde com a ferramenta draksec, que faz parte do Centro de Controlo\n"
+"Mandrakelinux.\n"
+"\n"
+"Preencha o campo \"%s\" com o endereço de e-mail da pessoa responsável pela\n"
+"segurança. As mensagens de segurança serão enviadas para esse endereço."
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
-msgstr "Administrador da Segurança"
+msgstr "Administrador de Segurança"
 
-#: help.pm:475
-#, fuzzy, c-format
+#: help.pm:461
+#, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrakelinux system. If partitions have already been\n"
@@ -4515,89 +4769,91 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Neste ponto, precisa escolher quais partições vão ser utilizadas para a\n"
+"Neste fase, precisa escolher que partições vão ser utilizadas para a\n"
 "instalação do seu sistema Mandrakelinux. Se já foram definidas partições,\n"
 "seja por uma instalação anterior do GNU/Linux seja por outra ferramenta de\n"
 "particionamento, pode utilizar-las . Senão, precisa definir partições no\n"
 "disco rígido.\n"
 "\n"
-"Para criar partições, é preciso primeiro escolher um disco rígido. Pode\n"
-"escolher o disco que quer particionar carregando em ``hda'' para o primeiro\n"
+"Para criar partições, tem primeiro que escolher um disco rígido. Pode\n"
+"escolher o disco que quer particionar clicando em ``hda'' para o primeiro\n"
 "disco IDE, ``hdb'' para o segundo, ``sda'' para o primeiro disco SCSI e\n"
-"assim de seguida.\n"
+"por aí adiante.\n"
+"\n"
+"Para particionar o disco selecionado, pode usar estas opções :\n"
 "\n"
-"Para particionar o disco selecionado, pode utilizar estas opções :\n"
+" * \"%s\": esta opção apaga todas as partições do disco seleccionado\n"
 "\n"
-" * \"%s\": esta opção apaga todas as partições do disco rígido\n"
-"seleccionado;\n"
-" * \"%s\": esta opção permite de criar automaticamente partições\n"
-"de ext3 e de memoria virtual no espaço livre do disco;\n"
+" * \"%s\": esta opção permite criar automaticamente partições\n"
+"ext3 e partições swap no espaço livre do seu disco\n"
 "\n"
-"\"%s\": propõe funções suplementares :\n"
+"\"%s\": dá acesso para opções adicionais:\n"
 "\n"
-" * \"%s\": grava a tabela das partições numa\n"
-"disquete. Útil para recuperar a tabela das partições mais tarde, se\n"
-"necessário. É muito aconselhado de fazer isto;\n"
+" * \"%s\": grava a tabela das partições para uma disquete. Útil para\n"
+"mais tarde recuperar a tabela das partições, se necessário. É fortemente\n"
+"recomendado que execute este passo.\n"
 "\n"
-" * \"%s\": permite de restaurar uma tabela\n"
-"gravada anteriormente a partir duma disquete;\n"
+" * \"%s\": permite restaurar uma tabela de partições anteriormente\n"
+"gravada numa disquete;\n"
 "\n"
-" * \"%s\": se a sua tabela das partições está estragada, pode tentar\n"
-"recuperar-la com esta opção. Por fvor seja atento e lembre-se que\n"
-"isto não funciona sempre.\n"
+" * \"%s\": se a sua tabela das partições está danificada, pode-a tentar\n"
+"recuperar com esta opção. Por favor esteje atento e lembre-se que isto\n"
+"nem sempre resulta.\n"
 "\n"
-" * \"%s\": apaga todas as mudanças e carrega\n"
-"a tabela de partições inicial do disco;\n"
+" * \"%s\": apaga todas as alterações e recarega a tabela de partições\n"
+"que estava originalmente no disco.\n"
 "\n"
-" * \"%s\": se desligar esta opção os\n"
-"utilizadores deverão montar e desmontar manualmente os médias amoviveis\n"
-"como a disquete e os CD-ROMs.\n"
+" * \"%s\": des-seleccione este opção para forçar os utilizadores a\n"
+"manualmente montar e desmontar medias amoviveis como disquetes e CR-ROMs.\n"
 "\n"
-" * \"%s\": utilize esta opção se deseja utilizar um assistente\n"
-"para particionar o disco rígido. Isto é aconselhado se você não conhece\n"
-"bem o particionamento;\n"
+" * \"%s\": use esta opção se deseja usar um assistente para particionar o\n"
+"disco rígido. Isto é recomendado se não tem um bom conhecimento de \n"
+"como se faz um bom particionamento do disco.\n"
 "\n"
-" * \"%s\": utilize esta opção para anular as suas mudanças;\n"
+" * \"%s\": use esta opção para cancelar as alterações.\n"
 "\n"
-" * \"%s\": permite acções suplementares nas\n"
-"partições (tipo, opções, formatar) e dá mais informações;\n"
+" * \"%s\": permite acções suplementares nas partições\n"
+"(tipo, opções, formatar) e dá mais informações sobre o disco rígido.\n"
 "\n"
-" * \"%s\": quando acabou de particionar o seu disco rígido, isto vai\n"
-"permitir-lhe de gravar as mudanças no disco.\n"
+" * \"%s\": quando tiver acabado de particionar o seu disco rígido, isto irá\n"
+"gravar as suas alterações no disco.\n"
 "\n"
-"Nota : pode atingir qualquer opção com o teclado. Mude de partição com\n"
-"[Tab] e as flechas [Subir/Descer].\n"
+"Quando a definir o tamanho de uma partição, pode finalmente configurar\n"
+"o tamanho usando as teclas [Tab] e as setas [Subir/Descer]'Setas'Nota : pode "
+"chegar a qualquer opção usando o teclado. Navegue atravéz\n"
+"das partições usando as teclas [Tab] e as setas [Subir/Descer].\n"
 "\n"
-"Quando uma partição está selecionada, pode utilizar :\n"
+"Quando uma partição é selecionada, pode usar :\n"
 "\n"
-" * Ctrl-c para criar uma nova partição (quando é uma partição vazia);\n"
+" * Ctrl-c para criar uma nova partição (quando se escolhe uma partição "
+"vazia)\n"
 "\n"
-" * Ctrl-d para apagar uma partição;\n"
+" * Ctrl-d para apagar uma partição\n"
 "\n"
-" * Ctrl-m para definir o ponto de montagem.\n"
+" * Ctrl-m para definir o ponto de montagem\n"
 "\n"
-"Para obter mais informações sobre os diferentes tipos de sistemas de\n"
-"ficheiros disponíveis, por favor leia o capitulo ext2FS do ``Guia de\n"
-"Referencia''.\n"
+"Para obter mais informações acerca dos diferentes tipos de sistemas de\n"
+"ficheiros disponíveis, por favor leia o capítulo ext2FS do ``Manual de\n"
+"Referência''.\n"
 "\n"
-"Se está a fazer uma instalação numa máquina PPC, vai precisar de criar\n"
-"uma pequena partição de arranque HFS com pelo menos 1MB, que vai ser\n"
-"utilizada pelo carregador de arranque yaboot. Se optar por uma partição\n"
-"maior, como 50MB, vai ter um espaço útil para guardar um núcleo e imagens\n"
-"de disco memoria de socorro."
+"Se está a instalar numa máquina PPC, irá querer criar umas pequena partição\n"
+"de arranque HFS com pelo menos 1MB, que será usada pelo carregador de\n"
+"arranque yaboot. Se optar por criar uma partição maior, tipo 50MB, pode-lhe\n"
+"ser útil para quardar um kernel e a uma imagem ramdisk para situações de\n"
+"de emergência."
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Automontagem dos dispositivos amovíveis"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Alterna entre os modos normal/perito"
 
-#: help.pm:547
-#, fuzzy, c-format
+#: help.pm:533
+#, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
@@ -4630,146 +4886,154 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mais do que uma partição Microsoft foi detectada no seu disco rígido.\n"
-"Por favor escolha a qual deseja reduzir para poder instalar o seu\n"
-"sistema operativo Mandrakelinux.\n"
+"Por favor escolha qual deseja redimencionar para poder instalar o seu\n"
+"novo sistema operativo Mandrakelinux.\n"
 "\n"
-"Cada partição é listada como segue : \"Nome Linux\", \"Nome Windows\"\n"
-"\"Capacidade\".\n"
+"Cada partição é listada da seguinte maneira : \"Nome Linux\",\n"
+"\"Nome Windows\", \"Capacidade\".\n"
 "\n"
-"O \"Nome Linux\" tem a estrutura : \"tipo de disco\", \"numero de disco\",\n"
-"\"numero da partição\" (por exemplo, \"hda1\").\n"
+"O \"Nome Linux\" é estruturado: \"tipo de disco rígido\",\n"
+" \"numero de disco\", \"numero da partição\" (por exemplo, \"hda1\").\n"
 "\n"
 "O \"Tipo de Disco\" é \"hd\" se o disco rígido é IDE e \"sd\" se é um\n"
 "disco rígido SCSI.\n"
 "\n"
 "O \"Numero de disco\" é sempre uma letra depois de \"hd\" ou \"sd\".\n"
-"Com os discos IDE :\n"
+"Com os discos rígidos IDE :\n"
 "\n"
-" * \"a\" significa \"disco rígido mestre no controlador IDE principal\";\n"
+" * \"a\" significa \"disco rígido master no controlador IDE principal\";\n"
 "\n"
-" * \"b\" significa \"disco rígido escravo no controlador IDE principal\";\n"
+" * \"b\" significa \"disco rígido slave no controlador IDE principal\";\n"
 "\n"
-" * \"c\" significa \"disco rígido mestre no controlador IDE segundario\";\n"
+" * \"c\" significa \"disco rígido master no controlador IDE segundario\";\n"
 "\n"
-" * \"d\" significa \"disco rígido escravo no controlador IDE segundario\";\n"
+" * \"d\" significa \"disco rígido slave no controlador IDE segundario\";\n"
 "\n"
-"Com os discos SCSI, um \"a\" significa \"SCSI ID mais baixo\", um\n"
-"\"b\" significa \"segundo SCSI ID mais baixo\", etc.\n"
+"Com os discos rígidos SCSI, um \"a\" significa \"SCSI ID mais baixo\",\n"
+"um \"b\" significa \"segundo SCSI ID mais baixo\", etc.\n"
 "\n"
 "O \"Nome Windows\" é a letra do seu disco rígido sob Windows\n"
 "(o primeiro disco ou partição é chamado \"C:\")."
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
-"\"%s\": Verifique o país seleccionado. Se não está neste país,\n"
-"carregue no botão \"%s\" e escolha outro. Se o seu país\n"
-"não estiver na primeira lista dada, carregue no botão \"%s\"\n"
-"para obter a lista completa dos países."
+"\"%s\": verifique o país seleccionado. Se não está neste país, carregue no\n"
+"botão \"%s\" e escolha outro. Se o seu país não estiver na lista dada, "
+"carregue\n"
+"no botão \"%s\" para obter a lista dos países completa."
 
-#: help.pm:584
-#, fuzzy, c-format
+#: help.pm:569
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
-"Este passo só aparece se uma partição GNU/Linux antiga foi\n"
+"Este passo só fica disponível se uma partição GNU/Linux existente for\n"
 "encontrada na sua máquina.\n"
 "\n"
-"DrakX precisa agora de saber se deseja instalar de novo ou actualizar o\n"
-"sistema Mandrakelinux já instalado :\n"
+"O DrakX agora precisa saber se deseja fazer uma nova instalação ou uma\n"
+"actualização num sistema Mandrakelinux existente:\n"
 "\n"
-" * \"%s\": Globalmente, isto apaga completamente o antigo sistema.\n"
-"Se deseja mudar o particionamento dos seus discos rígidos, ou mudar\n"
-"os sistemas de ficheiros, deveria utilizar esta opção. No entanto, seguinte\n"
-"o seu particionamento, pode evitar de sobreescrever alguns dados.\n"
+" * \"%s\": Para a maior parte, isto apaga completamente o sistema antigo.\n"
+"No entanto, dependendo no seu esquema de particionamento, pode prevenir\n"
+"que parte dos seus dados existentes (principalmente os directórios \"home"
+"\")\n"
+"sejam sobrescritos. Se desejar alterar como o particionamento dos seus\n"
+"discos rígidos é feito, ou mudar o seu sistema de ficheiros, deve usar esta "
+"opção.\n"
 "\n"
-" * \"%s\": esta instalação permite de actualizar os pacotes de programas\n"
-"actualmente instalados no seu sistema Mandrakelinux. O seu particionamento\n"
-"actual assim como os dados dos utilizadores não serão mudados.\n"
-"Os outros passos da instalação continuam de ser feitos, como numa instalação "
-"normal.\n"
+" * \"%s\": Este tipo de instalação permite actualizar os pacotes "
+"actualmente\n"
+"instalados no seu sistema Mandrakelinux. O seu actual esquema de\n"
+"particionamento, assim como os dados dos utilizadores não serão alterados.\n"
+"A maior parte dos outros passos da configuração permanece disponível e "
+"similar a uma instalação standard.\n"
 "\n"
-"A opção ``Actualizar'' deveria funcionar bem nos sistemas Mandrakelinux\n"
-"versão \"8.1\" ou superior. A desaconselhado Actualizar versões anteriores\n"
-"ao Mandrakelinux versão \"8.1\"."
+"A opção ``Actualizar'' deverá funcionar correctamente nos sistemas\n"
+"Mandrakelinux versão \"8.1\" ou superior. É desaconselhável actualizar\n"
+"versões anteriores à versão \"8.1\"  do Mandrakelinux."
 
-#: help.pm:605
-#, fuzzy, c-format
+#: help.pm:591
+#, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"Seguinte a língua escolhida, DrakX escolheu o bom teclado para si.\n"
-"No entanto, você pode não ter o teclado que corresponde\n"
-"à língua : por exemplo, se é um Francês que fala Português, pode desejar\n"
-"mesmo assim um teclado Francês. Ou se você fala Português mas vive\n"
-"na Inglaterra, vai encontrar-se na mesma situação. Nos dois casos, vai\n"
-"poder escolher o bom teclado na lista.\n"
+"Dependendo da linguagem que escolhe (), o DrakX irá automáticamente\n"
+"escolher um determinado tipo de configuração do teclado. Seleccione a opção\n"
+"que melhor lhe sirva ou escolha outra disposição de teclado.\n"
+"\n"
+"Também, pode não ter um teclado que corresponde exactamente à sua língua:\n"
+"por exemplo, se é Francês mas fala Português, pode desejar, mesmo assim um\n"
+"teclado Francês. Ou se você fala Português mas vive em Inglaterra, vai\n"
+"encontrar-se na mesma situação. Nos dois casos, pode escolher o teclado\n"
+"apropriado da lista.\n"
 "\n"
-"Carregue no botão \"%s\" para obter a lista de todos os teclados\n"
-"suportados.\n"
+"Clique no botão \"%s\" para obter a lista de todos os teclados suportados.\n"
 "\n"
-"Se escolhe um mapa de teclado para um alfabeto não-latim, vai-lhe ser\n"
-"perguntado no próximo dialogo de escolher a sequência de teclas que vai\n"
-"passar do mapa Latim para o não-Latim."
+"Se escolheu a disposição de um teclado baseado num álfabeto diferente de\n"
+"latim, o próximo diálogo irá-lhe permitir escolher a mapeação de teclas que "
+"lhe \n"
+"permita mudar o teclado entre uma disposição Latin uma não Latim."
 
-#: help.pm:624
-#, fuzzy, c-format
+#: help.pm:609
+#, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4778,129 +5042,164 @@ 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"
-"\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 ""
-"A escolha da sua língua preferida vai mudar a língua da documentação,\n"
-"do instalador e do sistema de maneira geral. Escolha primeiro o sitio\n"
-"onde está, e depois a língua que fala.\n"
-"\n"
-"Se carregar no botão \"%s\" vai poder escolher outras línguas\n"
-"a instalar na sua máquina. O facto de escolher outras línguas vai\n"
-"instalar o ficheiros específicos às línguas para a documentação do\n"
-"sistema e as aplicações. Por exemplo, se vai ter utilizadores\n"
-"Espanhóis, escolha Português como língua principal na vista arvore\n"
-"e na secção avançado carregue em \"%s\".\n"
-"\n"
-"Nota que pode instalar quantas línguas quiser. Até pode as instalar\n"
-"todas carregando na caixa \"%s\". Escolher uma língua\n"
-"significa instalar as traduções, tipos de letra e verificação ortográfica.\n"
-"Além disso, a caixa \"%s\" permite de obrigar\n"
-"o sistema a utilizar o Unicode (UTF-8). Note no entanto que isto é uma\n"
-"funcção experimental. Se escolher línguas com códigos diferentes\n"
-"o Unicode é sempre instalado. \n"
-"\n"
-"Para trocar entre as diferentes línguas instaladas no sistema, pode\n"
-"lançar o programa \"/usr/sbin/localedrake\" como \"root\" para mudar a\n"
-"língua utilizada por todo o sistema. Se utilizar o programa como utilizador\n"
-"normal vai só mudar a língua para esse utilizador."
-
-#: help.pm:660
+"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 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 ""
+"O primeiro passo, é escolher a sua linguagem preferida.\n"
+"\n"
+"A sua escolha da linguagem preferida irá afectar o instalador, a\n"
+"documentação, e o sistema em geral. Primeiro seleccione a região\n"
+"onde está localizado, depois a língua que fala.\n"
+"\n"
+"Ao clicar no botão \"%s\" irá permitir-lhe escolher outras linguagens\n"
+"para instalar na sua área de trabalho, consequentemente instalará os\n"
+"ficheiros para a documentação do sistemae aplicações referentes à\n"
+"linguagem específicada . Porexemplo, se utilizadores espanhóis estão\n"
+"para usar a sua máquinam, escolha Inglês como linguagem por omissão\n"
+"na vista em árvore e \"%s\" na secção Avançada.\n"
+"\n"
+"Sobre o suporte UTF-8 (unicode): Unicode é uma codificação de caracter\n"
+"feito para cobrir todas as linguagens existentes. No entanto o seu suporte\n"
+"complecto em GNU/Linux ainda está a ser desenvolvido. Por essa razão,\n"
+"o uso de UTF-8 em Mandrakelinux depende das escolhas do utilizador:\n"
+"\n"
+" * Se escolher uma linguagem com um forte legado de codificação\n"
+"(linguagens latin1, Russo, Japonês, ChinêsCoreano, Tailandês, grego, turco,\n"
+"maior parte de linguagens iso-8859-2), o legado da codificação será usado\n"
+"por omissão\n"
+"\n"
+" * Outras linguagens irão usar unicode por omissão;\n"
+"\n"
+" * Finalmente, o unicode pode também ser forçado para uso através do\n"
+"por um pedido do utilizadorao selecionar a opção \"%s\", independentemente\n"
+"como as linguagens tenham sido escolhidas.\n"
+"\n"
+"Notar que não você não está limitado a escolher uma única linguagem\n"
+"adicional. Pode escolher várias, ou até as instalar ao selecionar a caixa\"%s"
+"\".\n"
+"Selecionar suporte para uma linguagem, quer dizer traduções, fontes,\n"
+"verificadores de ortografia, etc., que será também instalados para essa\n"
+"linguagem.\n"
+"\n"
+"Para trocar entre as várias linguagens instaladas no seu sistema, pode\n"
+"correr o comando \"/usr/sbin/localedrake\" como \"root\" para mudar a\n"
+"linguagem usada por todo o sistema. Correndo o comando como utilizador\n"
+"normal , irá apenas mudar as configurações da linguagem para esse\n"
+"utilizador em particular."
+
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Espanhol"
 
-#: help.pm:663
-#, fuzzy, c-format
+#: help.pm:650
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
-msgstr ""
-"DrakX detecta normalmente o numero de botões do seu rato. Se não, ele\n"
-"considera que tem um rato com dois botões e vai configurar a emulação\n"
-"do terceiro botão. O terceiro botão dum rato com dois botões pode ser\n"
-"carregado quando se carrega ao mesmo tempo nos dois botões. DrakX\n"
-"vai saber automaticamente se é um rato PS/2, série ou USB.\n"
-"\n"
-"Se deseja indicar um tipo particular de rato, escolha o bom tipo a partir "
-"da\n"
-"lista fornecida.\n"
-"\n"
-"Se você escolher outro rato que o modelo por omissão, um ecrã de teste\n"
-"vai ser proposto. Utilize os botões e a roda para verificar que a "
-"configuração\n"
-"está correcta. Se o rato não funciona bem, carregue na barra de espaço ou\n"
-"em [Entrada] para parar o teste e voltar à lista de escolha.\n"
-"\n"
-"Por vezes, os ratos com roda não são detectados automaticamente. Vai ser\n"
-"preciso escolher-los manualmente na lista. Assegure-se de escolher bem o\n"
-"que corresponde à ligação a que está ligado. Depois de carregar no botão\n"
-"\"%s\", uma imagem de rato vai aparecer. Vai ser preciso mover a\n"
-"roda do rato para o activar correctamente. Pode então testar se os botões\n"
-"e os movimentos estão correctos."
-
-#: help.pm:691
+"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 ""
+"Usualmente, o DrakX naõ tem problemas em detectar o numero de botões\n"
+"no seu rato. Se tiver, assume que tem um rato de dois botões e irá\n"
+"configurá-lo para a emulação do terceiro botão. O terceiro botão de um rato\n"
+"de dois botões, pode ser obtido por simultâneamente clicar nos botões\n"
+"esquerdo e direito.\n"
+"O DrakX irá automáticamente saber se o seu rato usa um interface\n"
+"PS/2 ou USB\n"
+"Se tem um rato de 3 botôes sem roda, pode escolher um rato \"%s\".\n"
+"O DrakX irá então configurar o seu rato para que possa simular a roda: para\n"
+"o fazer, carregue o botão do meio e mova o apontador do seu rato para cima\n"
+"e para baixo.\n"
+"\n"
+"Se por alguma razão deseja especificar um topi diferente de rato, selecione\n"
+"o tipo desejado a partir da lista fornecida.\n"
+"\n"
+"Você pode escolher a entrada \"%s\" para escolher um rato ``generico'' que\n"
+"trabalhe práticamente com todos os ratos.\n"
+"Se escolher outro rato diferente que o por omissão, um teste no ecrâ será \n"
+"mostrado. Use os botões e a roda para verificar que as configurações estão\n"
+"correctas e o rato está a trabalhar correctamente. Se o rato não esta a\n"
+"trabalhar bem, carregue na tecla espaço ou [Return] par acancelar o teste\n"
+"e returnará à lista de ratos.\n"
+"\n"
+"Ocasionalmente a roda do rato não é detectada automáticamente, então é\n"
+"preciso que selecione o seu rato da lista. Assegure-se em selecionar o\n"
+"correspondente à porta que o seu rato está ligado. Depois de selecionar o "
+"rato\n"
+"e carregar em \"%s\", uma imagem será mostrada no ecrâa mover a roda.\n"
+"Teste os botões e verifique se o apontador do rato se move no ecrâ assim "
+"como\n"
+"você mexe no rato."
+
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "com emulação de Roda"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Universal | Qualquer rato PS/2 & USB"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"Por favor escolha o bom dispositivo. Por exemplo, o \"COM1\" sob\n"
-"Windows chama-se \"ttyS0\" sob GNU/Linux."
+"Por favor escolha a porta correcta. Por exemplo, em Windows é \"COM1\",\n"
+"em GNU/Linux já é \"ttyS0\"."
 
-#: help.pm:698
-#, fuzzy, c-format
+#: help.pm:688
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4909,290 +5208,146 @@ 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 ""
-"Esta é a decisão mais importante para a segurança do seu sistema\n"
+"Este é o ponto mais crucial de decisão para a segurança do seu sistema\n"
 "GNU/Linux : deve escolher a senha do \"root\". O \"root\" é o administrador\n"
-"do sistema e portanto é o único que pode fazer actualizações, adicionar\n"
-"utilizadores, mudar a configuração global do sistema, e etc. De maneira\n"
-"curta, \"root\" pode fazer tudo! Por isso deve escolher uma senha difícil\n"
-"de adivinhar -- DrakX vai-lhe dizer se ela é demasiado simples. Como\n"
-"pode ver, pode escolher de não meter nenhuma senha, mas não é nada\n"
-"aconselhado pelo menos por uma razão : não pense que porque lançou\n"
-"GNU/Linux os outros sistemas operativos instalados estão protegidos dos\n"
-"erros de utilização. Como o \"root\" pode ultrapassar todas as barreiras e\n"
-"apagar por erro todas as partições acedendo a elas, é importante que seja\n"
-"difícil de passar em \"root\".\n"
-"\n"
-"A senha deveria ser uma mistura de pelo menos 8 letras e números.\n"
-"Nunca escreva em nenhum lado a senha do \"root\" -- torna demasiado\n"
-"fácil de comprometer um sistema.\n"
-"\n"
-"No entanto, faça atenção a não fazer uma senha demasiado comprida\n"
-"ou complicada porque vai ser preciso lembrar-se dela sem muitos\n"
-"esforços.\n"
-"\n"
-"A senha não vai ser mostrada no ecrã quando a vai escrever. Portanto,\n"
-"vai ser preciso escrever-la duas vezes para reduzir as possibilidades de\n"
-"erro de teclado. Se lhe acontecer de fazer o mesmo erro de teclado duas\n"
-"vezes, a senha ``incorrecta'' resultante vai ter de ser utilizada a "
-"primeira\n"
-"vez que se vai ligar.\n"
-"\n"
-"Se deseja se ligar a um servidor de autenticação para controlar o acesso\n"
-"a este computador, carregue no botão \"%s\".\n"
-"\n"
-"Se a sua rede utiliza seja LDAP, NIS ou a autenticação por um serviço\n"
-"PDC dum Dominio Windows, escolha a opção desejada como\n"
-"\"%s\". Se não sabe, pergunte ao seu administrador de rede.\n"
-"\n"
-"Se você tem problemas para se lembrar de senhas, pode escolher\n"
-"\"%s\", se o seu computador não vai estar ligado ao Internet,\n"
-"e se você tiver confiança em todas as pessoas que acedem a ele."
-
-#: help.pm:733
-#, c-format
-msgid "authentication"
-msgstr "Autenticação"
-
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
-#, c-format
-msgid "No password"
-msgstr "Nenhuma senha"
-
-#: help.pm:736
-#, fuzzy, c-format
-msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-"Este dialogo propõe-lhe varias opções.\n"
-"\n"
-" * \"%s\": você tem três escolhas :\n"
-"\n"
-"    * \"%s\": se preferir o grub (lista textual);\n"
-"\n"
-"    * \"%s\": se preferir o LILO com o seu interface\n"
-"de lista textual.\n"
-"\n"
-"    * \"%s\": se preferir o LILO com o seu interface\n"
-"gráfico;\n"
+"do sistema e é o único utilizador autorizado para fazer actualizações,\n"
+"adicionar utilizadores, mudar a configuração global do sistema, e por aí a\n"
+" fora. Em poucas palavras, o \"root\" pode fazer tudo! É por isso que deve\n"
+"escolher uma senha que seja difícil de adivinhar: o DrakX irá-lhe dizer se "
+"a\n"
+"senha que escolheu é muito simples. Como pode ver, não é obrigado a digitar\n"
+"uma senha, mas aconselhamos vivamente a não o fazer.O GNU/Linux é tão\n"
+"propenso ao erro do operador como qualquer outro sistema operativo. Já que\n"
+"o \"root\" pode ultrapassar todas as limitações e involuntáriamente apagar\n"
+"todos os dados nas partições por as acessar descuidadamente ele próprio,\n"
+"é muito importante que seja difícil tornar-se \"root\".\n"
 "\n"
-" * \"%s\": na maioria dos casos, não vai mudar o por\n"
-"omissão (\"%s\"), mas se preferir, o carregador de arranque pode ser\n"
-"instalado no segundo disco rígido (\"%s\"), ou mesmo numa disquete\n"
-"(\"%s\");\n"
+"A senha deve ser uma mistura de caractéres alfa numéricos e com pelos\n"
+"menos 8 caracteres de comprimento.Nunca aponte a senha do \"root\" -- torna\n"
+"demasiado fácil comprometer o seu sistema.\n"
 "\n"
-" * \"%s\": quando liga o computador,\n"
-"este é o prazo dado ao utilizador para escolher -- na lista do carregador\n"
-"de arranque, outro sistema do que o por omissão.\n"
+"Uma advertência: não faça a senha demasiado longa ou muito complicada\n"
+"para que seja capaz de se lembrar dela.\n"
 "\n"
-"!! Seja atento ao facto que se escolhe de não instalar nenhum carregador\n"
-"de arranque (escolhendo \"%s\" aqui), deve assegurar-se que tem uma\n"
-"maneira de iniciar o seu sistema Mandrakelinux! Também deveria saber o\n"
-"que faz quando antes de mudar qualquer opção!!\n"
+"A senha não vai ser mostrada no ecrã à medida que a escreve. Para reduzir\n"
+"a chance de ser mal digitada, é necessário que a senha seja digitada duas\n"
+"vezes. Se lhe acontecer o mesmo erro duas vezes, aí terá que usar essa "
+"senha\n"
+"``incorrect'' na primeira vez que tentar ligar-se como \"root\".\n"
 "\n"
-"Ao carregar no botão \"%s\" neste dialogo vai obter algumas opções\n"
-"avançadas, que são reservadas ao utilizador perito."
-
-#: 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 "Prazo antes de arrancar a imagem padrão"
-
-#: 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 ""
-"Depois de ter configurado os parametros gerais do arranque, a lista\n"
-"das opções de arranque que vão estar disponíveis vai aparecer.\n"
+"Se deseja um servidor de autenticação para controlar o acesso ao seu\n"
+"computador, clique em \"%s\".\n"
 "\n"
-"Se houver outros sistemas operativos instalados na sua máquina, eles\n"
-"vão ser adicionados automaticamente à lista de arranque. Aqui, você\n"
-"pode personalizar completamente estas opções. \"%s\" cria\n"
-"um novo elemento, ou escolha um elemento e carregue em \"%s\"\n"
-"ou \"%s\" para o mudar ou o apagar. \"%s\" valida as suas\n"
-"mudanças.\n"
+"Se a sua rede usa seja LDAP, NIS ou a autenticação de serviços para um\n"
+"domínio PDC Windows, selecione o apropriado para \"%s\".\n"
+"Se não sabe qual o a usar, deve perguntar ao admnistrador da sua rede.\n"
 "\n"
-"Você também pode não querer dar acesso a esses outros sistemas\n"
-"operativos a toda a gente. Nesse caso, pode remover os elementos\n"
-"correspondentes. Mas assim, vai precisar de um disco de arranque\n"
-"para lançar esses sistemas operativos!"
+"Se lhe acontecer ter problemas em relembrar senhas, ou se o seu computador\\ "
+"nunca for conectado à internet, se confia em toda a gente que usa o seu\n"
+"computador, aí pode escolher em ter \"%s\"."
 
-#: 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
+#: help.pm:722
 #, c-format
-msgid "Add"
-msgstr "Adicionar"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Mudar"
+msgid "authentication"
+msgstr "Autenticação"
 
-#: 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
+#. -PO: keep this short or else the buttons will not fit in the window
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
-msgid "Remove"
-msgstr "Suprimir"
+msgid "No password"
+msgstr "Nenhuma senha"
 
-#: help.pm:787
+#: help.pm:725
 #, c-format
 msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
-"O LILO e o GRUB são gestores de arranque do GNU/Linux. Normalmente, esta\n"
-"fase é completamente automática. O DrakX analisa o sector de\n"
-"arranque do disco e age de acordo com o que encontrou nele:\n"
+"O carregador de arranque é um pequeno programa que é iniciado pelo\n"
+"computador no seu arranque. É responsável pela inicialização de todo o\n"
+"sistema. Normalmente, a fase de instalação do gestor de arranque é\n"
+"completamente automática. O DrakX irá analisar o sector de arranque do\n"
+"disco e agir de acordo com o que lá encontrar:\n"
 "\n"
-" * se encontrou um sector de arranque Windows, irá trocá-lo por um sector\n"
-"de arranque GRUB/LILO. Vai, portanto, poder optar entre o arranque do\n"
-"GNU/Linux ou do outro Sistema Operativo;\n"
+" * se encontrar um sector de arranque Windows, irá trocá-lo por um sector\n"
+"de arranque GRUB/LILO. Desta maneira será capaz de escolher entre carregar\n"
+"o GNU/Linux ou qualquer outro Sistema Operativo instalado na sua máquina.\n"
 "\n"
-" * se encontrou um sector de arranque GRUB ou LILO, irá trocá-lo por um\n"
+" * se encontrar um sector de arranque GRUB ou LILO, irá trocá-lo por um "
 "novo.\n"
 "\n"
-"Se não tiver a certeza, o DrakX perguntar-lhe-á onde deseja instalar o \n"
-"carregador de arranque. Geralmente, o \"%s\" é o local mais seguro. Ao\n"
-"escolher \"%s\" nenhum gestor de arranque será instalado. Apenas utilize\n"
-"esta opção se souber o que está a fazer."
+"Se o DrakX não conseuir determinar onde deve colocar o sector de arranque,\n"
+"irá-lhe perguntar onde o quer colocar. Geralmente, o \"%s\" é o local mais\n"
+"seguro. Ao escolher \"%s\" nenhum gestor de arranque será instalado. Use\n"
+"esta opção apenas se souber o que está a fazer."
 
-#: help.pm:803
-#, fuzzy, c-format
+#: help.pm:742
+#, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
-"Aqui, vamos escolher o sistema de impressão por omissão do seu computador.\n"
-"Os outros Sistemas Operativos podem propor só um, Mandrakelinux oferece\n"
-"dois. Cada um deles é óptimo para uma configuração particular.\n"
+"Agora, é tempo de escolher o sistema de impressão para o seu computador.\n"
+"Outros sistemas operativos podem oferecer um, mas o Mandrakelinux oferece\n"
+"dois. Cada um deles bem servido para tipos particulares de configuração.\n"
 "\n"
-".*.\"%s\" -- que significa ``imprimir, não meter em fila'', é a boa escolha "
-"se\n"
+".*.\"%s\" -- que significa ``imprimir, não meter em fila'', é a escolha se\n"
 "tem uma ligação directa para a sua impressora e deseja poder parar tudo\n"
 "facilmente nos erros da impressora, e se não tem impressoras em rede.\n"
 "(\"%s\" só vai gerir os casos mais simples de rede e é bastante lento nas\n"
@@ -5207,21 +5362,26 @@ msgstr ""
 "servidor \"lpd\", tem de activar o demónio \"cups-lpd\". \"%s\" tem\n"
 "interfaces gráficos para imprimir ou escolher as opções de impressão.\n"
 "\n"
-"Poderá mudar a sua escolha de sistema após a instalação lançando\n"
-"PrinterDrake a partir do Centro de Controlo Mandrake e carregando\n"
-"no botão perito."
+"Poderá mudar a sua escolha de sistema após a instalação correndo o\n"
+"PrinterDrake a partir do Centro de Controlo Mandrakelinux e clicando\n"
+"no botão \"%s\"."
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "Perito"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5241,249 +5401,93 @@ msgid ""
 "which parameters need to be passed to the hardware, you'll need to manually\n"
 "configure the driver."
 msgstr ""
-"DrakX vai detectar os dispositivos IDE presentes no seu computador.\n"
-"Também tentará localizar adaptadores PCI SCSI. Se o DrakX encontrar\n"
-"um adaptador SCSI e souber qual piloto utilizar, ele será instalado\n"
-"automaticamente.\n"
+"O DrakX virá primeiro detectar os dispositivos IDE presentes no seu\n"
+"computador. Irá também procurar por um ou mais adaptadores PCI SCSI\n"
+"no seu sistema. Se um adaptador SCSI for encontrado, o DrakX irá\n"
+"automáticamente instalar o driver apropriado.\n"
 "\n"
-"Como a detecção de material não é perfeita, DrakX pode não reconhecer\n"
-"os seus discos. Nesse caso, deverá indicar o material manualmente.\n"
+"Porque a detecção de hardware não é a toda a prova, o DrakX pode falhar\n"
+"a detectar os discos rígidos. Se isso acontecer, terá de específicar o seu\n"
+"hardware á mão..\n"
 "\n"
-"Se tem que especificar manualmente o seu adaptador, DrakX perguntará\n"
-"se quer configurar opções para ele. Deveria deixar o DrakX examinar o\n"
-"material para descobrir as opções. Isso normalmente funciona bem.\n"
+"Se tiver que o específicar manualmenteo seu adaptador PCI SCSI, o DrakX\n"
+"irá-lhe perguntar se quer configurar as opções deste. Deve permitir que o\n"
+"DrakX verifique o hardware para as opçºoes específicas das placas que são\n"
+"necessárias para inicializar o adaptador. Na maior parte do tempo, o DrakX\n"
+"irá executar este passo sem qualquer problema.\n"
 "\n"
-"Se o DrakX não consegue descobrir as opções, precisará definir\n"
-"manualmente as opções para o piloto."
+"Se o DrakX não conseguir verificar quais são as opções que automáticamente\n"
+"determinem que parâmetros são necessários para o hardware em questão, irá\n"
+"precisar de configurar o driver manualmente."
 
-#: help.pm:847
-#, fuzzy, 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 ""
-"Pode adicionar entradas ao yaboot, seja para outros sistemas operativos,\n"
-"outros núcleos, ou para uma imagem de arranque de socorro.\n"
-"\n"
-"Para outros SO, a entrada compõe-se de um nome e de uma partição \"raíz\".\n"
-"\n"
-"Para o Linux, há algumas opções possíveis :\n"
-"\n"
-" * Nome : é simplesmente o nome que deve escrever no cursor do yaboot\n"
-"para escolher esta opção de arranque;\n"
-"\n"
-" * Imagem : isto será o nome do núcleo a iniciar. De habito, vmlinux\n"
-"ou uma variação de vmlinux com uma extensão;\n"
-"\n"
-" * Raíz : o dispositivo \"raíz\" ou ``/'' para a sua instalação Linux;\n"
-"\n"
-" * Adicionar : no material Apple, esta opção é utilizada bastantes vezes\n"
-"para ajudar a inicializar o material vídeo, ou para activar a emulação pelo\n"
-"teclado dos segundos e terceiros botões do rato que faltam muitas vezes nos\n"
-"ratos Apple. Aqui tem alguns exemplos :\n"
-"\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd : esta opção pode ser utilizada seja para carregar imediatamente\n"
-"módulos, antes que o dispositivo de arranque esteja disponível, ou para\n"
-"carregar um disco memoria, no caso de um arranque de socorro;\n"
-"\n"
-" * Tamanho do Initrd : o tamanho por omissão de um disco memoria é\n"
-"habitualmente 4,096 bytes. Se você precisar de um disco memoria maior, pode\n"
-"utilizar esta opção;\n"
-"\n"
-" * Ler-escrever : normalmente a partição \"raíz\" é iniciada em leitura-só,\n"
-"para permitir de verificar o sistema de ficheiros antes que o sistema fique\n"
-"operacional. Aqui, você pode mudar esta opção;\n"
-"\n"
-" * SemVídeo: se o material vídeo Apple tivesse problemas excepcionais,\n"
-"pode escolher esta opção para arrancar num modo ``SemVídeo'', com um\n"
-"suporte nativo do frame buffer;\n"
-"\n"
-" * Por Omissão : selecciona esta entrada como Linux por omissão,\n"
-"que se vai iniciar directamente carregando na tecla ENTRADA no cursor\n"
-"yaboot. Esta entrada também vai ser marcada com um ``*'' se carregar\n"
-"em [Tab] para ver a possibilidades de arranque."
-
-#: help.pm:894
-#, fuzzy, 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 é um carregador de arranque para maquinas Macintosh do NovoMundo\n"
-"e pode iniciar GNU/Linux, MacOS ou MacOSX. Normalmente, estes outros\n"
-"sistemas operativos são bem detectados e instalados no menu de arranque.\n"
-"Se não for o caso, pode adicionar-los manualmente neste ecrã. Faça cuidado\n"
-"em escolher os bons parametros.\n"
-"\n"
-"As opções principais do Yaboot são:\n"
-"\n"
-" * Mensagem de Inicio : um simples texto mostrado antes do cursor de "
-"arranque;\n"
-"\n"
-" * Dispositivo de Arranque : indica onde deseja meter as informações\n"
-"necessárias para arrancar o GNU/Linux. Em geral, já preparou uma partição\n"
-"de arranque antes de preencher esta informação;\n"
-"\n"
-" * Prazo Open Firmware : há dois prazos disponíveis com o yaboot. O "
-"primeiro\n"
-"é medido em segundos e permitelhe de escolher entre um arranque do\n"
-"CD, do OF, do MacOS ou do Linux;\n"
-"\n"
-" * Prazo de arranque do núcleo : este prazo corresponde ao do LILO.\n"
-"Depois de escolher o Linux, vai ter este prazo em décimos de segundo antes\n"
-"que os parametros de núcleo por omissão sejam escolhidos;\n"
-"\n"
-" * Autorizar o arranque dum CD? : se escolher esta opção vai poder escolher\n"
-"``C'' para arrancar a partir dum CD no primeiro ecrã de arranque;\n"
-"\n"
-" * Autorizar o arranque do OF? : se escolher esta opção vai poder escolher\n"
-"``N'' para arrancar o Open Firmware no primeiro ecrã de arranque;\n"
-"\n"
-" * SO por omissão : pode escolher qual Sistema Operativo vai arrancar por\n"
-"omissão quando o Prazo Open Firmware expira."
-
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 "\"%s\": se foi detectada uma placa de som no seu sistema, será\n"
 "listada aqui. Se verificar que a placa de som listada não é a placa que \n"
-"realmente tem no seu sistema, pode clicar no botão e escolher outro piloto."
+"está presente no seu sistema, pode clicar no botão e escolher outro driver."
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "Placa de Som"
 
-#: help.pm:932
-#, fuzzy, c-format
+#: help.pm:791
+#, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5493,124 +5497,132 @@ 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 ""
-"Como resumo, DrakX vai propor uma lista das informações que tem sobre\n"
-"o seu sistema. Seguinte o material instalado, pode ter estas entradas.\n"
-"Cada uma delas é o elemento a configurar, e um curto resumo da\n"
-"configuração actual. Carregue no botão \"%s\" que corresponde\n"
-"para a mudar.\n"
+"Em revisão, o DrakX irá apresentar um sumário que junta a informação\n"
+"recolhida sobre o seu sistema. Dependendo do hardware instalado na sua\n"
+" máquina, poderá ter uma ou todas das seguintes entradas.\n"
+"Cada entrada é feita sobre o item de hardware para ser configurado,\n"
+"seguido de um rápido sumário da corrente configuração.\n"
+"Clica no botão correspondente \"%s\" para fazer as alterações.\n"
 "\n"
-" * \"%s\": verifique o esquema de teclado actual e mude-o se for\n"
-"preciso.\n"
+" * \"%s\": verifique a configuração actual do mapa do teclado corrente\n"
+"e mude-a se necessário.\n"
 "\n"
-" * \"%s\": verifique o país actual. Se não estiver neste país, carregue\n"
-"no botão \"%s\" e escolha outro. Se o seu país não aparecer na primeira\n"
-"lista mostrada, carregue no botão \"%s\" para obter a lista completa dos\n"
-"países.\n"
+" * \"%s\": verifique a selecção de país actual. Se não estiver neste país,\n"
+"clique no botão \"%s\" e escolha outro. Se o seu país não aparecer na lista\n"
+"mostrada, clica no botão \"%s\" para obter a lista completa de países.\n"
 "\n"
-" * \"%s\": Por omissão, DrakX escolhe o fuso horario do país\n"
-"escolhido. Carregue no botão \"%s\" que corresponde\n"
-"para o mudar.\n"
+" * \"%s\": por omissão, o DrakX escolhe o fuso horario do país\n"
+"escolhido. Poed clicar no botão \"%s\" se esta não é a opção correcta.\n"
 "\n"
-" * \"%s\": verifique o rato actual e mude-o se for preciso.\n"
+" * \"%s\": verifique a actual configuração do rato e clique no botão para\n"
+"mudar se necessário.\n"
 "\n"
-" * \"%s\": carregue no botão \"%s\" para lançar o assistente\n"
-"de configuração. Veja o capitulo que corresponde no``Guia do Utilizador''\n"
-"para saber mais sobre como configurar uma impressora.\n"
+" * \"%s\": carregue no botão \"%s\" irá abrir o assitente de configuração "
+"de\n"
+"impressoras. Consulte o capítulo correspondente do ``Guia do Utilizador'',\n"
+"para mais informação sobre como configurar uma nova impressora.\n"
+"O interface apresentado no nosso manual, é similar ao usado na instalação.\n"
 "\n"
-" * \"%s\": se uma placa de som foi detectada no seu sistema,\n"
-"é indicada aqui. Se não é a boa placa, pode carregar no botão e escolher\n"
-"outro piloto.\n"
+" * \"%s\": se uma placa de som for detectada no seu sistema,será mostrada\n"
+"aqui. SE notar que a placa de som não é actualmente presente no seu\n"
+"sistema, pode clicar no botão para escolher um driver diferente.\n"
 "\n"
-" * \"%s\": por omissão, DrakX configura o seu ecrã em\n"
-"\"800x600\" ou \"1024x768\". Não não é o que deseja, carregue em\n"
-"\"%s\" para reconfigurar o interface gráfico.\n"
+" * \"%s\": se tem uma placa de TV, é aqui que a informação acerca da\n"
+"configuração é mostrada, Se tem uma placa de TV e não é detectada,\n"
+"clique em \"%s\" para a tentar configurar manualmente.\n"
 "\n"
-" * \"%s\":se uma placa TV foi detectada no seu sistema,\n"
-"é indicada aqui. Se tem uma placa e não foi detectada, pode carregar\n"
-"no botão \"%s\" para tentar configurar-la manualmente.\n"
+" * \"%s\": pode clicar em \"%s\" para mudar os parâmetros associados\n"
+"com a placa se acha que a configuração está errada.\n"
 "\n"
-" * \"%s\": se uma placa ISDN foi detectada no seu sistema,\n"
-"é indicada aqui. Pode carregar no botão \"%s\" e mudar os\n"
-"parametros da placa.\n"
+" * \"%s\": por omissão, o DrakX configura o seu inteface gráfico nas\n"
+"resoluções \"800x600\" ou \"1024x768\". Se isso não lhe serve, pode\n"
+"clicar em \"%s\" para configurar o seu interface gráfico.\n"
 "\n"
-" * \"%s\": se deseja configurar o Internet ou o acesso a uma rede\n"
-"local agora.\n"
+" * \"%s\": se deseja configurar a sua internet ou acesso de rede local\n"
+"pode faze-lo. Referira-se a documentação impressa ou use o Centro de\n"
+"Controlo do Mandrakelinux a sequir a instalação tenha terminado.\n"
 "\n"
-" * \"%s\": aqui pode redefinir o nível de segurança\n"
-"que escolheu antes.\n"
+" * \"%s\": permite-lhe configurar endereços HTTP e FTP proxy se a máquina\n"
+"onde está a instalar é para ser localizada atrás de um servidor proxy.\n"
 "\n"
-" * \"%s\": se pensa ligar a sua maquina ao Internet, é uma boa\n"
-"ideia de a proteger configurando um pára-fogo. Veja o capitulo que\n"
-"corresponde no ``Guia de Utilizador'' para mais detalhes sobre a\n"
-"configuração dum pára-fogo.\n"
+" * \"%s\": esta entrada permite-lhe redefinir o nível de segurança como\n"
+"configurado num passo anterior.\n"
 "\n"
-" * \"%s\": se deseja mudar a configuração deste,\n"
-"carregue no botão. Isto deveria ser reservado aos utilizadores\n"
-"avançados.\n"
+" * \"%s\": se planeia ligar a sua máquina à internet, é uma boa ideia\n"
+"proteger-se de intrusões ao configurar uma firewall. Consultar secção\n"
+"correspondente do ``Guia de Utilizador'' para detalhes acerca de como\n"
+"configurar uma firewall.\n"
 "\n"
-" * \"%s\": vai poder escolher aqui quais serviços vão ser lançados\n"
-"na sua maquina. Se pensa utilizar a sua máquina como servidor é uma\n"
-"boa ideia de verificar isto."
-
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Teclado"
+" * \"%s\": se deseja mudar a configuração do carregador de arranque,\n"
+"clique nesse botão. Isto deveria ser reservado aos utilizadores\n"
+"avançados.Referira-se à documentação impressa, ou à linha de ajuda\n"
+"sobre a configuração de carregador de arranque (bootloader) no\n"
+"Centro de Controlo Mandrakelinux.\n"
+"\n"
+" * \"%s\": atravéz desta entrada pode ajustar quais os serviços que serão\n"
+"executados na sua máquina. Se planeia configurar esta máquina como\n"
+"um servidor, é uma boa ideia rever a configuração."
 
-#: 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 "Fuso horário"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Interface gráfico"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Placa TV"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Placa ISDN"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Interface gráfico"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Proxies"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Carregador de arranque"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Serviços"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5621,7 +5633,7 @@ msgstr ""
 "Mandrakelinux. Tenha cuidado, todos os ficheiros no disco serão\n"
 "perdidos de forma irrecuperável!"
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5632,32 +5644,114 @@ msgid ""
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
 "present on this hard drive."
 msgstr ""
-"Se desejar apagar todos os dados e partições presentes neste disco rígido\n"
-"clique em \"%s\". Atenção: depois de clicar em \"%s\", não será possível\n"
-"recuperar nenhum dado ou partição que estava no disco, incluindo dados\n"
-"do Windows.\n"
+"Clique em \"%s\" se deseja apagar todos os dados e partiçoes presentes\n"
+"neste disco rígido.Tenha cuidado, depois de clicar em \"%s\", não será\n"
+"capaz de recuperar qualquer dado e partição presente neste disco rígido,\n"
+"incluindo qualquer dado do Windows.\n"
 "\n"
-"Clique em \"%s\" para anular esta operação sem perder nenhum dado\n"
-"ou partição presente neste disco."
+"Clique em \"%s\" para anular esta operação sem perder dados e partições\n"
+"presentes neste disco."
+
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Próximo ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Anterior"
 
-#: install2.pm:119
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
-"Não é possível aceder aos módulos que correspondem ao seu núcleo (falta o "
-"ficheiro %s), isto normalmente significa que a sua disquete de arranque não "
-"corresponde ao média de instalação (por favor crie uma nova disquete de "
-"arranque)"
+"Não é possível aceder aos módulos que correspondem ao seu kernel (falta o "
+"ficheiro %s), isto geralmente significa que a sua disquete de arranque não "
+"está em sintonia com a média de instalação (por favor crie uma nova disquete "
+"de arranque)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
-msgstr "Deve também formatar %s"
+msgstr "Também deve formatar %s"
+
+#: 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 ""
+"A segiuinte media de instalação foi encontrada.\n"
+"Se quer evitar alguns deles, pode desmarcá-los agora."
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "Tem mais medias suplementares?"
 
-#: install_any.pm:402
+#. -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 ""
+"A seguinte media foi encontrada e será usada durante a instalação: %s.\n"
+"\n"
+"\n"
+"Tem alguma media de instalação suplementar para configurar?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Rede (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Rede (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Nenhum dispositivo encontrado"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Insira o CD"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Insira o CD 1 outra vez"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "URL do mirror?"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Não é possível encontar o ficheiro hdlist neste mirror"
+
+#. -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"
@@ -5674,14 +5768,14 @@ msgstr ""
 "\n"
 "\n"
 "Estes servidores são activados por omissão. Não possuem nenhum problema\n"
-"de segurança conhecido, mas algum novo pode ser encontrado. Neste caso, "
-"certifique-se \n"
-"da sua actualização logo que possível.\n"
+"de segurança conhecido, mas algum novo pode ser encontrado. Neste caso,\n"
+"certifique-se da sua actualização logo que possível.\n"
 "\n"
 "\n"
 "Deseja mesmo instalar estes servidores?\n"
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5689,23 +5783,23 @@ msgid ""
 "\n"
 "Do you really want to remove these packages?\n"
 msgstr ""
-"Os pacotes seguintes vão ser apagados para poder actualizar o seu sistema : %"
+"Os seguintes pacotes serão removidos para poder actualizar o seu sistema : %"
 "s\n"
 "\n"
 "\n"
-"Deseja mesmo apagar estes pacotes ?\n"
+"Deseja realemente remover estes pacotes ?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Insira uma disquete formatada em FAT no drive %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Esta disquete não está formatada em FAT"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5714,12 +5808,17 @@ msgstr ""
 "Para usar esta selecção guardada de pacotes, arranque a instalação com "
 "``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 "Erro ao ler o ficheiro %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "%s (Porta %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5728,12 +5827,12 @@ msgstr ""
 "Ocorreu um erro - nenhum dispositivo válido foi encontrado para criar novos "
 "sistemas de ficheiros. Por favor verifique no hardware a causa deste problema"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Instalação do sistema"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Configuração do sistema"
@@ -5754,7 +5853,7 @@ msgid ""
 "For this, create a partition (or click on an existing one).\n"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
-"Tem ter uma partição root.\n"
+"Tem que ter uma partição root.\n"
 "Para isso, crie uma partição (ou clique numa existente).\n"
 "Então escolha a acção ``Ponto de montagem'' e defina-a como `/'"
 
@@ -5765,11 +5864,11 @@ msgid ""
 "\n"
 "Continue anyway?"
 msgstr ""
-"Não possui uma partição de memória virtual\n"
+"Não tem uma partição swap.\n"
 "\n"
 "Continuar mesmo assim?"
 
-#: 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 "Tem que ter uma partição FAT montada em /boot/efi"
@@ -5782,7 +5881,7 @@ msgstr "Sem espaço livre suficiente para alocar as novas partições"
 #: install_interactive.pm:105
 #, c-format
 msgid "Use existing partitions"
-msgstr "Utilizar as partições existentes"
+msgstr "Usar as partições existentes"
 
 #: install_interactive.pm:107
 #, c-format
@@ -5807,32 +5906,31 @@ msgstr "Escolha os tamanhos"
 #: install_interactive.pm:120
 #, c-format
 msgid "Root partition size in MB: "
-msgstr "Tamanho da partição root em MB:"
+msgstr "Tamanho da partição root em MB: "
 
 #: install_interactive.pm:121
 #, c-format
 msgid "Swap partition size in MB: "
-msgstr "Tamanho da partição de memória virtual em MB: "
+msgstr "Tamanho da partição swap em MB: "
 
 #: install_interactive.pm:130
 #, c-format
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
 msgstr ""
-"Não há partições FAT para utilizar como loopback (ou não têm espaço livre "
-"suficiente)"
+"Não há partições FAT para usar como loopback (ou não têm espaço suficiente)"
 
 #: install_interactive.pm:139
 #, c-format
 msgid "Which partition do you want to resize?"
-msgstr "Qual partição que quer redimensionar?"
+msgstr "Qual partição quer redimensionar?"
 
 #: install_interactive.pm:153
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
-"O redimensionador de FAT é incapaz de manipular sua partição, \n"
+"O redimensionador de FAT é incapaz de mexer na sua partição, \n"
 "ocorreu o seguinte erro: %s"
 
 #: install_interactive.pm:156
@@ -5846,9 +5944,13 @@ msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
 "Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
 "installation."
-msgstr "A sua partição Windows está muito fragmentada, corra primeiro o ``defrag''"
+msgstr ""
+"A sua partição Windows está demasiado fragmentada. Por favor reinicie o seu "
+"computador em Windows, execute a utilidade ``defrag'', depois recomece a "
+"instalação 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"
@@ -5862,63 +5964,63 @@ msgid ""
 "installation. You should also backup your data.\n"
 "When sure, press Ok."
 msgstr ""
-"ATENÇÃO!\n"
+"AVISO!\n"
 "\n"
-"DrakX vai agora redimensionar sua partição Windows. Tenha cuidado:\n"
-"esta operação é perigosa. Se o não tiver feito ainda, deve primeiro\n"
-"sair da instalação, correr \"chkdsk c:\" a partir duma Linha de Commando\n"
-"sob Windows (cuidado, correr o scandisk gráfico não chega, assegure-se\n"
-"de utilizar \"chkdsk\" numa Linha de Commando!), e opcionalmente correr o\n"
-"defrag) nesta partição, e então reiniciar a instalação. Também deveria "
-"fazer\n"
-" backup dos seus dados. Quando tiver certeza, pressione Ok."
+"O DrakX irá agora redimensionar a sua partição Windows. Tenha cuidado:\n"
+"esta operação é perigosa. Se ainda não o tiver feito, deve primeiro sair da\n"
+"instalação, correr \"chkdsk c:\" a partir de uma Linha de Comandos sob\n"
+"Windows (cuidado, correr o programa gráfico \"scandisk\"não chega,\n"
+"assegure-se em usar \"chkdsk\" numa Linha de Comandos!), e\n"
+"opcionalmente correr o defrag) nesta partição, e então reiniciar a\n"
+"instalação. Também deve fazer um  backup dos seus dados.\n"
+"Quando tiver certeza, pressione Ok."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
-msgstr "Quanto de espaço quer deixar para o Windows em"
+msgstr "Que tamanho quer deixar para o Windows em"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "partição %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
-msgstr "Computando limites do sistema de ficheiros do Windows"
+msgstr "Redimensionar partição Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Falha no redimensionamento 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 "Não há partições FAT a redimensionar (ou não têm espaço livre suficiente)"
+msgstr "Não há partições FAT para redimensionar (ou espaço livre insuficiente)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Remover 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 "Tem mais de um disco rígido, em qual deles quer instalar o linux?"
+msgstr "Tem mais que um disco rígido, em qual deles quer instalar o 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 "TODAS as partições existentes e os dados nelas contidos serão perdidos %s"
+msgstr "TODAS as partições existentes e seus dados serão perdidos no drive %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Usar fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -5927,32 +6029,34 @@ msgstr ""
 "Pode agora particionar %s.\n"
 "Quando terminar, não esqueça de guardar usando `w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
-msgstr "Não consigo encontrar espaço para instalação"
+msgstr "Não consigo encontrar espaço para instalar"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "O assistente de particionamento DrakX encontrou as seguintes soluções:"
+msgstr ""
+"O assistente de particionamento do DrakX encontrou as seguintes soluções:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
-msgstr "O particionamento falhou: %s"
+msgstr "Particionamento falhado: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "A ligar a rede"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "A desligar a rede"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -5970,7 +6074,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 "
@@ -5992,7 +6096,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"
@@ -6000,14 +6104,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"
@@ -6037,10 +6141,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"
@@ -6051,11 +6155,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"
@@ -6071,7 +6175,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Introdução\n"
 "\n"
@@ -6079,8 +6183,8 @@ msgstr ""
 "Mandrakelinux \n"
 "deveriam ser chamados os \"Produtos de Software\" a partir daqui. Os "
 "Produtos de Software incluem, \n"
-"mas não se limitam a, o grupo de programas, métodos, regras e "
-"documentações relativos ao sistema operativo \n"
+"mas não se limitam a, o grupo de programas, métodos, regras e documentações "
+"relativos ao sistema operativo \n"
 "assim como os diferentes elementos da distribuição Mandrakelinux.\n"
 "\n"
 "\n"
@@ -6088,14 +6192,15 @@ msgstr ""
 "\n"
 "Por favor leia com atenção este documento. Este documento é o termo de "
 "licença entre você e \n"
-"a MandrakeSoft S.A. que se aplica aos Produtos de Software.\n"
-"Ao instalar, duplicar ou utilizar os Produtos de Software de qualquer "
-"maneira, aceita explicitamente \n"
+"a Mandrakesoft S.A. que se aplica aos Produtos de Software.\n"
+"Ao instalar, duplicar ou usar os Produtos de Software de qualquer maneira, "
+"aceita explicitamente \n"
 "e completamente os termos e condições desta Licença. \n"
 "Se não aceita qualquer parte da Licença, não lhe é permitido de instalar, "
 "duplicar ou \n"
-"utilizar os Produtos de Software. \n"
-"Qualquer tentativa de instalar, duplicar ou utilizar os Produtos de Software duma maneira que não \n"
+"usar os Produtos de Software. \n"
+"Qualquer tentativa de instalar, duplicar ou usar os Produtos de Software "
+"duma maneira que não \n"
 "corresponde com os termos e condições desta Licença é proibido e vai tirar-"
 "lhe os seus direitos \n"
 "sob esta Licença. Sem direitos sob esta Licença, deve imediatamente destruir "
@@ -6105,71 +6210,73 @@ msgstr ""
 "\n"
 "2. Garantia Limitada\n"
 "\n"
-"Os Produtos de Software e a documentação são fornecidos \"como estão\", "
-"sem nenhuma garantia, \n"
+"Os Produtos de Software e a documentação são fornecidos \"como estão\", sem "
+"nenhuma garantia, \n"
 "quanto permitido pela lei.\n"
-"MandrakeSoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "
+"Mandrakesoft S.A. não vai ser, em nenhuma circunstância e quanto permitido "
 "pela lei, responsável de qualquer\n"
 "acidente particular, dos danos directos ou indirectos (inclusive os "
 "resultantes de perda de lucros, interrupção\n"
 "de negócios, perda de informações e dividas legais resultando dum julgamento,"
 "ou qualquer ou perca consequente) \n"
 "decorrentes do uso ou da impossibilidade de usar os Produtos de Software, "
-"mesmo se a MandrakeSoft S.A. foi \n"
+"mesmo se a Mandrakesoft S.A. foi \n"
 "avisada da possibilidade de ocorrimento de tais danos.\n"
 "\n"
 "LIMITAÇÃO DE RESPONSABILIDADE LIGADA A POSSESSÃO OU UTILIZAÇÃO DE PROGRAMAS "
 "PROIBIDOS EM CERTOS PAÍSES\n"
 "\n"
-"MandrakeSoft S.A. e os seus distribuidores não vão ser, em nenhuma "
-"circunstância e quanto permitido \n"
-"pela lei, responsável de quaisqueres danos directos ou indirectos (inclusive "
-"os resultantes de perda de lucros, interrupção\n"
-"de negócios, perda de informações e dividas legais resultando dum julgamento,"
-"ou qualquer ou perca consequente) \n"
-"decorrentes da possessão, do uso ou do descarregamento dos Produtos de Software a partir de um dos servidores da \n"
-"Mandrakelinux que sejam proibidos ou limitados pela lei em certos países "
-"pelas leis locais.\n"
-"Esta limitação de responsabilidade inclui, mas não se limita aos elementos "
-"de codificação inclusos nos \n"
-"Produtos de Software.\n"
+"Pelo que é permitido por lei, a Mandrakesoft S.A. ou os seus distribuidores "
+"não vão ser, em nenhuma\n"
+"circunstância, ser responsável por quaisque danos directos ou indirectos "
+"(inclusive os resultantes\n"
+"de perda de lucros, interrupção de negócios, perda de informações e dívidas "
+"legais resultado de um\n"
+"julgamento, ou qualquer perca consequente) decorrentes da possessão, do uso "
+"ou do descarregamento\n"
+"dos Produtos de Software a partir de um dos servidores da Mandrakelinux que "
+"sejam proibidos\n"
+"ou limitados pela lei em certos países pelas leis locais.\n"
+"Este limite de responsabilidade inclui, mas não se limita aos elementos de "
+"codificação inclusos\n"
+"nosProdutos de Software.\n"
 "\n"
 "\n"
-"3. A licença GPL e as licenças relatadas\n"
+"3. A licença GPL e as Licenças Relacionadas\n"
 "\n"
 "Os Produtos de Software consistem em elementos criados por pessoas ou "
-"organizações diferentes. \n"
-"A maioria deles são publicados sob os termos e condições da licença GNU "
-"General Public License, \n"
-" também denominada \"GPL\", ou por licenças similares. A maioria dessas "
-"licenças permite utilizar, \n"
-"duplicar, adaptar ou redistribuir os elementos que elas cobrem. Por favor "
-"leia com atenção \n"
-"os termos e condições de licença de cada elemento antes de o utilizar. "
-"qualquer pergunta sobre a \n"
-"licença dum elemento devera ser feita ao autor do elemento e não á "
-"MandrakeSoft.\n"
-"O programas desenvolvidos por MandrakeSoft S.A. são publicados sob os termos "
-"da licença GPL. \n"
-"A documentação escrita por MandrakeSoft S.A. é publicada sob uma licença "
-"especifica. Por favor veja \n"
-"a documentação para mais detalhes.\n"
+"identidades.  A \n"
+"maior parte destes componentes são publicados sob os termos e condições da "
+"licença GNU\n"
+"General Public License, também denominada \"GPL\", ou de licenças similares. "
+"A maioria destas\n"
+"licenças permite usar, duplicar, adaptar ou redistribuir os elementos que "
+"elas cobrem. Por favor\n"
+"leia com atenção os termos e condições de licença de cada elemento antes de "
+"usar qualquer\n"
+"componente. Qualquer pergunta sobre uma da licença deve ser endereçada ao "
+"autor do componente\n"
+"e não à Mandrakesoft. O programas desenvolvidos pela Mandrakesoft S.A. são "
+"publicados sob os\n"
+"termos da licença GPL. A documentação escrita por Mandrakesoft S.A. é "
+"publicada sob uma licença\n"
+"especifica. Por favor veja a documentação para mais detalhes.\n"
 "\n"
 "\n"
 "4. Direitos de Propriedade Intelectual\n"
 "\n"
-"Todos os direitos dos elementos dos Produtos de Software pertencem aos "
-"seus autores respectivos \n"
+"Todos os direitos dos elementos dos Produtos de Software pertencem aos seus "
+"autores respectivos \n"
 "e são protegidos pela propriedade intelectual e pelas leis de Copyright "
 "aplicáveis a produtos de software.\n"
-"MandrakeSoft S.A. reserva os seus direitos de modificar ou adaptar os "
+"Mandrakesoft S.A. reserva os seus direitos de modificar ou adaptar os "
 "Produtos de Software, como um \n"
 "todo ou parcialmente, em qualquer sentido e para todos os fins.\n"
 "\"Mandrake\", \"Mandrakelinux\" e os logotipos associados são marcas "
-"registradas da MandrakeSoft S.A.  \n"
+"registradas da Mandrakesoft S.A.  \n"
 "\n"
 "\n"
-"5. Legislação em vigor \n"
+"5. Legislação em Vigor \n"
 "\n"
 "Se alguma parte deste contrato é considerada nula, ilegal ou não aplicável "
 "por um tribunal,\n"
@@ -6181,10 +6288,10 @@ msgstr ""
 "resolvidos sem tribunal. \n"
 "Como ultima solução, o desacordo será referido ao Tribunal de Paris - "
 "França.\n"
-"Para qualquer pergunta sobre este documento, contacte por favor MandrakeSoft "
+"Para qualquer pergunta sobre este documento, contacte por favor 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"
@@ -6195,15 +6302,15 @@ msgid ""
 "patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
-"Warning: Free Software may not necessarily be patent free, and some Free\n"
-"Software included may be covered by patents in your country. For example, "
-"the\n"
-"MP3 decoders included may require a licence for further usage (see\n"
-"http://www.mp3licensing.com for more details). If you are unsure if a "
-"patent\n"
-"may be applicable to you, check your local laws."
+"Aviso: O Software livre pode não ser necessáriamente livre de patentes,\n"
+"e algum Software incuido pode ser coberto por patentes no seu país. Por\n"
+"exemplo os\n"
+"MP3 decoders incluidos podem requerer uma licença para uso futuro (ver\n"
+"http://www.mp3licensing.com para mais detalhes). Se não tem a certeza\n"
+"que uma patente possa ser aplicada a si, veja as suas leis locais."
 
-#: 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"
@@ -6236,35 +6343,36 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 "\n"
-"Atenção\n"
+"Aviso\n"
 "\n"
-"Por favor leia atentamente isto. Se não aceita qualquer parte,\n"
-"não tem a direito de instalar o próximo média CD. Carregue em'Recusar' \n"
-"para continuar a instalação sem utilizar este média.\n"
+"Por favor leia atentamente os termos em baixoSe não concorda com,\n"
+"alguma porção, não lhe é premitido instalar a próxima media CD.\n"
+"Clique em 'Recusar' para continuara instalação sem usar esta media.\n"
 "\n"
 "\n"
-"Alguns componentes do próximo média CD não são fornecidos sob\n"
-"a licença GPL ou similares. Cada componente é então fornecido\n"
-"sob a sua própria licença especifica. \n"
-"Por favor leia atentamente e aceite essas licenças especificas antes \n"
-"de utilizar ou distribuir esses componentes. \n"
-"Estas licenças vão em geral proibir a transferência, a copia\n"
-"(a não ser para arquivar), a distribuição, a analise invertida, \n"
-"ou a modificação do componente. \n"
-"Qualquer recusa da licença vai imediatamente tirar-lhe todos os\n"
-"direitos da licença especifica. a não ser que a licença o permita,\n"
-"não vai poder normalmente instalar esses programas em mais de\n"
-"uma máquina, ou adaptar-los para os usar pela rede. Em caso de duvidas,\n"
-"contacte directamente o distribuidor do componente. \n"
-"Transferir a terças-partes ou copiar esses componentes incluindo a\n"
-"documentação é geralmente proibido.\n"
+"Algumas componentes da próxima media CD não são governados por\n"
+"licença GPL ou acordos similares. Cada componente é então governado\n"
+"pelos termos e condições da sua própria licensa.\n"
+"Por favor leia atentamente e cumpra com estas licenças especificas\n"
+"antes que use ou redistribua os ditos componentes.\n"
+"Tais licenças irão no geral prevenir transferência, duplicação\n"
+"(excepto para porpósitos de bachup), redistribuição, engenharia reversa,\n"
+"de-assemblar, de-compilar ou modificação do componente.\n"
+"Qualquer brecha no acordo irá imediatamente terminar os seus direitos\n"
+"sob a licensa especifica. A não ser que os termos da especifica licensa\n"
+"lhe garantam tais direitos, normalmente não pode instalar os programas\n"
+"ou mais que um sistema, ou adapte-a para ser usada numa rede. Em\n"
+"dúvida, por favor contacte directamente o distribuidor ou o editor do\n"
+"componente. A transferência para terceiros ou a cópia de tais componentes "
+"incluindo\n"
+"a documentação, é usualmente proibido.\n"
 "\n"
 "\n"
-"Todos os direitos dos componentes do próximo média pertencem aos \n"
-"autores respectivos e são protegidos pela propriedade intelectual e \n"
-"pelas leis de direitos de autor que se podem aplicar aos programas.\n"
+"Todos os direitos para os componentes da próxima media CD pertencem\n"
+"aos seus respectivos autores e são protegidos pela propriedade intelectual\n"
+"e leis de copyright aplicavel aos programas software.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6283,10 +6391,10 @@ msgid ""
 "install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
 "Parabéns, a instalação está completa.\n"
-"Retire o suporte de arranque e carregue em Enter para reinicializar.\n"
+"Retire a media de arranque e clique em Enter para reiniciar.\n"
 "\n"
 "\n"
-"Para informações sobre as correcções disponíveis para esta versão do "
+"Para informação das correcções disponíveis para esta versão do "
 "Mandrakelinux,\n"
 "consulte a Errata disponível em: \n"
 "\n"
@@ -6294,33 +6402,34 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Informações sobre a configuração do seu sistema estão disponíveis no\n"
+"Informação em configurar o seu sistema está disponivel no\n"
 "capítulo pós-instalação do Guia Oficial do Utilizador do 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 "Ponto de montagem %s duplicado"
+msgstr "Duplicar ponto de montagem %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 pacotes importantes não foram instalados correctamente.\n"
+"Alguns pacotes importantes não foram devidamente instalados.\n"
 "O seu drive de cdrom ou o seu cdrom está defeituoso.\n"
-"Verifique o cdrom num computador instalado usando \"rpm -qpl Mandrake/RPMS/*."
-"rpm\"\n"
+"Verifique o cdrom num computador instalado usando \"rpm -qpl media/main/*.rpm"
+"\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Nenhum drive de disquete disponível"
@@ -6330,7 +6439,7 @@ msgstr "Nenhum drive de disquete disponível"
 msgid "Entering step `%s'\n"
 msgstr "A entrar no passo `%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"
@@ -6338,97 +6447,99 @@ msgid ""
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Seu sistema está com poucos recursos. Pode ter algum problema na\n"
+"O seu sistema está baixo em recursos. Pode ter algum problema na\n"
 "instalação do Mandrakelinux. Se isso ocorrer, pode tentar instalar usando o\n"
 "modo texto. Para isso, prima `F1' no quadro de inicialização e escreva "
 "`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 "Selecção de Grupo de Pacotes"
+msgstr "Selecção do Grupo de Pacotes"
 
-#: 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 "Tamanho total: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Pacote defeituoso"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Versão: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: 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 "Não pode seleccionar/de-seleccionar esse pacote"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
-msgstr "devido ao %s em falta"
+msgstr "devido a faltar %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a %s insatisfeitas"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
-msgstr "tentando promover %s"
+msgstr "a tentar promover %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %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"
-msgstr "Não pode seleccionar esse pacote pois não existe espaço livre para o instalar"
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+"Não pode seleccionar esse pacote pois não existe espaço livre para o instalar"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes serão instalados"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes serão removidos"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Este é um pacote obrigatório, tem que ser seleccionado"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Não pode deixar de seleccionar este pacote. Ele já está instalado"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6437,276 +6548,291 @@ msgstr ""
 "Este pacote tem que ser actualizado\n"
 "Tem certeza que não o quer seleccionar?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "Não pode deixar de seleccionar este pacote. Ele tem que ser actualizado"
+msgstr ""
+"Não pode deixar de seleccionar este pacote. Ele tem que ser actualizado"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar pacotes seleccionados automaticamente"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Carregar/Gravar em disquete"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "A actualizar a selecção de pacotes"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Instalação 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 "Escolha os pacotes que deseja instalar"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "A instalar"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Sem detalhes"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "A estimar"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Tempo restante "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
-msgstr "Por favor aguarde, a preparar a instalação"
+msgstr "Por favor aguarde, a preparar a instalação..."
+
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Sem detalhes"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pacotes"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "A instalar pacote %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 "Recusar"
 
-#: 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 ""
-"Troque o seu Cd-Rom!\n"
-"\n"
-"Por favor insira o Cd-Rom rotulado \"%s\" no seu drive e prima  Ok quando "
-"estiver pronto.\n"
+"Mude o seu Cd-Rom!\n"
+"Por favor insira o Cd-Rom rotulado \"%s\" no seu drive e prima Ok quando "
+"feito.\n"
 "Se não o tiver, prima Cancelar para evitar a instalação deste 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 "Houve um erro na ordenação dos pacotes:"
+msgstr "Houve um erro ao ordenar os pacotes:"
 
-#: 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 "Continuar mesmo assim?"
 
-#: 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 "Houve um erro a instalar os pacotes:"
 
-#: 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 "não configurado"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Quer recuperar o seu sistema ?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
-msgstr "Contrato de licença"
+msgstr "Acordo da licença"
+
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Notas da Versão Saida (release)"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Por favor escolha o tipo de teclado."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
-msgstr "Aqui encontra-se a lista completa dos teclados disponíveis"
+msgstr "Aqui está a lista completa dos teclados disponíveis"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Isto é uma instalação ou uma actualização?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
-msgstr "Senha de codificação para %s"
+msgstr "Senha de encriptação para %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Por favor escolha o tipo de rato."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta do Rato"
 
-#: 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 "Por favor escolha a que porta série o rato está ligado."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Emulação de botões"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emulação Botão 2"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emulação Botão 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 "A configurar cartões 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 "A configurar 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 "sem partições disponíveis"
+msgstr "Sem partições disponíveis"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
-msgstr "Procurando partições para encontrar pontos de montagem"
+msgstr "Examinar partições para procurar pontos de montagem"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Escolha os pontos de montagem"
 
-#: 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 "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
-"Não há 1MB livre para o arranque! A instalação vai continuar, mas para "
-"arrancar o seu sistema, vai precisar de criar a partição de arranque no "
-"DiskDrake"
+"Sem espaço livre 1MB de arranque (bootstrap)! A instalação irá continuar, "
+"mas para arrancar o seu sistema, irá precisar de criar a partição de "
+"arranque (bootstrap) no DiskDrake"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Escolha as partições que quer formatar"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Verificar blocos defeituosos?"
 
-#: 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, "
 "you can lose data)"
 msgstr ""
-"A verificação do sistema de ficheiros %s falhou. Deseja corrigir os erros? "
+"Falha na verificação do sistema de ficheiros %s. Deseja corrigir os erros? "
 "(cuidado, pode perder dados)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr ""
-"Sem memória virtual suficiente para completar a instalação, por favor "
-"adicione mais"
+msgstr "Sem espaço swap para concluir a instalação, por favor adicione mais"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "A procurar pacotes disponíveis e a reconstruir a base rpm..."
+msgstr "A procurar pacotes disponíveis e a reconstruir a base de dados 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 "A procurar pacotes disponíveis..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "A procurar os pacotes já instalados..."
+msgstr "A ver os pacotes já instalados..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "A procurar pacotes para actualizar"
+msgstr "A procurar pacotes para actualizar..."
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr ""
+"A contactar o site Mandrakelinux para obter a lista dos servidores espelho "
+"disponíveis..."
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Escolha um servidor espelho de onde obter os pacotes"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6715,115 +6841,115 @@ msgstr ""
 "O seu sistema não tem espaço suficiente para instalação ou actualização (%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"
 "The format is the same as auto_install generated floppies."
 msgstr ""
-"Por favor carregue ou grave uma selecção de pacotes numa\n"
+"Por favor escolha carreguar ou gravar uma selecção de pacotes numa\n"
 "disquete. O formato é o mesmo que nas disquetes de auto_install."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Restaurar a partir da disquete"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
-msgstr "Guardar em disquete"
+msgstr "Gravar na disquete"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Selecção de Pacotes"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
-msgstr "A restaurar da disquete"
+msgstr "A carregar da disquete"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Insira uma disquete com a selecção de pacotes"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "O tamanho seleccionado é maior que o espaço disponível"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalação"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
-"Você não escolheu nenhum grupo de pacotes.\n"
-"Escolha por favor o tipo de instalação mínima que deseja:"
+"Você não escolheu qualquer grupo de pacotes.\n"
+"Por favor escolha o tipo de instalação mínima que deseja:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "Com a documentação de base (recomendado!)"
+msgstr "Com documentação dbásica (recomendado!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Verdadeira instalação mínima (nem sequer urpmi)"
+msgstr "Verdadeira instalação mínima (especialmente sem urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Tudo"
 
-#: 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"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
-"Se tiver todos os CDs da lista abaixo, clique em Ok.\n"
-"Se não tiver nenhum desses CDs, clique em Cancelar.\n"
-"Se apenas alguns CDs estiverem em falta, desmarque-os e então clique em Ok."
+"Se tem todos os CDs da lista abaixo, clique Ok.\n"
+"Se não tem nenhum desses CDs, clique Cancelar.\n"
+"Se apenas faltarem alguns CDs, desmarque-os e então clique Ok."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "Cd-Rom rotulado como \"%s\""
+msgstr "Cd-Rom rotulado \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
-msgstr "A preparar a instalação"
+msgstr "A preparar instalação"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
-"Instalando o pacote %s\n"
+"A instalar o pacote %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuração pós-instalação"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "Insira uma disquete com os módulos actualizados no drive %s"
+msgstr "Por favor Insira uma disquete com os módulos actualizados no drive %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"
@@ -6833,190 +6959,177 @@ 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 ""
 "Tem agora a possibilidade de descarregar os pacotes de actualização.\n"
-"Estes pacotes foram feitos depois desta distribuição. Eles podem ter\n"
-"correcções de segurança ou de erros.\n"
+"Estes pacotes foram actualizados depois da distribuição ter saido. Eles\n"
+"podem ter correcções de segurança ou de erros.\n"
 "\n"
-"Para descarregar estes pacotes, vai precisar de uma ligação Internet \n"
+"Para descarregar estes pacotes, irá precisar de uma ligação Internet \n"
 "funcional.\n"
 "\n"
 "Deseja instalar as actualizações ?"
 
-#: install_steps_interactive.pm:769
-#, c-format
-msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"A contactar o site Mandrakelinux para obter a lista dos servidores espelho "
-"disponíveis..."
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Escolha um servidor espelho de onde obter os pacotes"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
-msgstr "A contactar o servidor espelho para obter a lista de pacotes disponíveis"
+msgstr ""
+"A contactar o servidor espelho para obter a lista de pacotes disponíveis..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
-msgstr "Incapaz de ligar ao espelho %s"
+msgstr "Incapaz de contactar o espelho %s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Deseja tentar outra vez?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Qual é o seu fuso horário?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Sincronização automática da hora (com 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 "Sumário"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Servidor CUPS remoto"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Nenhuma impressora"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Tem alguma placa de som ISA?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
-msgstr "Execute \"alsaconf\" ou \"sndconfig\" depois da instalação para configurar a sua placa de som"
+msgstr ""
+"Execute \"alsaconf\" ou \"sndconfig\" depois da instalação para configurar a "
+"sua placa de som"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Nenhuma placa de som foi encontrada. Tente \"harddrake\" depois da instalação"
+msgstr ""
+"Nenhuma placa de som detectada. Tente \"harddrake\" depois da instalação"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface gráfico"
 
-#: 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 "Rede & Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Proxies"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Segurança"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
-msgstr "desligado"
+msgstr "desactivado"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Arranque"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, c-format
 msgid "%s on %s"
 msgstr "%s em %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 "Serviços : %d activados dos %d registados"
+msgstr "Serviços : %d activados para %d registados"
 
-#: 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 "Não configurou o X. Tem a certeza que é isto que quer?"
+msgstr "Não configurou o X. Tem a certeza que realmente quer isto?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
-msgstr "Define a senha root e os métodos de autenticação por rede"
+msgstr "Defina a senha root e os métodos de autenticação por rede"
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Senha do 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 "Essa senha é muito simples (deve ter ao menos %d caracteres)"
 
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
 #, c-format
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
-msgstr "A preparar o carregador de arranque"
+msgstr "A preparar o carregador de arranque..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7024,55 +7137,27 @@ msgid ""
 "The install will continue, but you'll\n"
 " need to use BootX or some other means to boot your machine"
 msgstr ""
-"Você parece ter uma máquina do AntigoMundo ou\n"
+"Parece ter uma máquina do AntigoMundo ou\n"
 " Desconhecida, o carregador de arranque yaboot não\n"
-" vai funcionar para si.\n"
-"A instalação vai continuar, mas vai precisar de utilizar\n"
-" BootX ou alguma outra maneira para arrancar a sua máquina"
+" irá funcionar para si.\n"
+"A instalação irá continuar, mas irá precisar de usar o BootX\n"
+" ou alguum outro meio para arrancar a sua máquina"
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Quer usar o aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "Erro ao instalar o aboot, \n"
-"tento forçar a instalação, mesmo que isso estrague a primeira partição?"
-
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "A instalar o carregador de arranque"
+"tentar forçar a instalação mesmo que isso destrua a primeira partição?"
 
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "A instalação do carregador de arranque falhou. Ocorreram os seguintes erros:"
-
-#: 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 ""
-"Vai talvez precisar de mudar o seu dispositivo de arranque Open\n"
-" Firmware para activar o carregador de arranque.  Se não vê o\n"
-" carregador de arranque ao reiniciar, mantenha Command-Option-O-F\n"
-" ao reiniciar e escreva :\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" E depois escreva : shut-down\n"
-"No próximo inicio deveria obter o carregador de arranque."
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7081,22 +7166,22 @@ msgstr ""
 "Neste nível de segurança, o acesso aos ficheiros na partição do Windows é "
 "limitado ao 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 "Insira uma disquete vazia no drive %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
-msgstr "Pff Insira outra disquete para o disco de drivers"
+msgstr "Por favor Insira outra disquete para o disco de drivers"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "A criar disquete de auto-instalação"
+msgstr "A criar disquete de auto-instalação..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7107,12 +7192,12 @@ msgstr ""
 "\n"
 "Quer realmente sair agora?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
-msgstr "Criar disquete de auto instalação"
+msgstr "Gerar disquete de auto instalação"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7122,8 +7207,8 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 "A auto instalação pode ser totalmente automatizada se\n"
-"quiser, neste caso, ela tomará de conta do disco\n"
-"rígido!! (com vista a instalação em outra máquina).\n"
+"quiser, nesse caso ela tomará conta do disco rígido!!\n"
+"(isto é feito para instalar outra máquina).\n"
 "\n"
 "Pode preferir repetir a instalação.\n"
 
@@ -7132,27 +7217,50 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Instalação do 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 "
-msgstr " <Tab>/<Alt-Tab> entre opções  | <Espaço> selecciona | <F12> próximo passo "
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgstr ""
+" <Tab>/<Alt-Tab> entre opções  | <Espaço> seleccione | <F12> próximo ecrâ"
 
 #: interactive.pm:170
 #, c-format
 msgid "Choose a file"
 msgstr "Escolha um ficheiro"
 
+#: 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 "Adicionar"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Modificar"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "Remover"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Básico"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "Terminar"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Fazer"
@@ -7165,7 +7273,7 @@ msgstr "Má escolha, tente novamente\n"
 #: interactive/stdio.pm:30 interactive/stdio.pm:149
 #, c-format
 msgid "Your choice? (default %s) "
-msgstr "Sua escolha? (por omissão %s) "
+msgstr "Sua escolha? (padrão %s) "
 
 #: interactive/stdio.pm:54
 #, c-format
@@ -7173,7 +7281,7 @@ msgid ""
 "Entries you'll have to fill:\n"
 "%s"
 msgstr ""
-"Entradas que vai ter de preencher :\n"
+"Entradas que irá ter que preencher:\n"
 "%s"
 
 #: interactive/stdio.pm:70
@@ -7189,22 +7297,22 @@ msgstr "Botão '%s': %s"
 #: interactive/stdio.pm:95
 #, c-format
 msgid "Do you want to click on this button?"
-msgstr "Quer carregar neste botão?"
+msgstr "Quer clicar neste botão?"
 
 #: interactive/stdio.pm:104
 #, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "Sua escolha? (por omissão '%s'%s) "
+msgstr "Sua escolha? (padrão '%s'%s) "
 
 #: interactive/stdio.pm:104
 #, c-format
 msgid " enter `void' for void entry"
-msgstr " escreva `void' para uma entrada vazia"
+msgstr " digite `void' para uma entrada vazia"
 
 #: interactive/stdio.pm:122
 #, c-format
 msgid "=> There are many things to choose from (%s).\n"
-msgstr "=> Há muitas coisas a escolher a partir de (%s).\n"
+msgstr "=> Há muitas coisas a escolher de (%s).\n"
 
 #: interactive/stdio.pm:125
 #, c-format
@@ -7214,7 +7322,7 @@ msgid ""
 "Your choice? "
 msgstr ""
 "Por favor escolha o primeiro numero dos 10 que deseja editar,\n"
-"ou carregue só em Entrada para proceder.\n"
+"ou apenas clique em Enter para proceder.\n"
 "A sua escolha ? "
 
 #: interactive/stdio.pm:138
@@ -7231,1751 +7339,1968 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Re-submeter"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Checo (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Alemão"
 
-#: 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 "Espanhol"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Finlandês"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Francês"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Norueguês"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polaco"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Russo"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Sueco"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Teclado Inglês"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "Teclado Americano"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albanêz"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Arménio (antigo)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Arménio (máquina de escrever)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Arménio (Fonético)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Árabe"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbaijão (latino)"
 
-#: 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 "Bengala"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
-msgstr "Estoniano"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
+msgstr "Bósnio"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Bielorrusso"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Suíço (mapa Alemão)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Suíço (mapa Francês)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Alemão (sem teclas mortas)"
 
-#: 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 "Dinamarquês"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (Norueguês)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estoniano"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Georgiano (mapa \"Russo\")"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Georgiano (mapa \"Latim\")"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Grego"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Grego (politónico)"
 
-#: 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 "Húngaro"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Croata"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irlandês"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
-msgstr "Israeliano"
+msgid ""
+"_: keyboard\n"
+"Israeli"
+msgstr "Israelita"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
-msgstr "Israeliano (Fonético)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
+msgstr "Israelita (Fonético)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iraniano"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Islandês"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Italiano"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Japonês 106 teclas"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
-msgstr "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
+msgstr "Canada"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Teclado coreano"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Teclado Kyrgyz"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Latino Americano"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laociano"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lituano AZERTY (velho)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lituano AZERTY (novo)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Lituano \"número de colunas\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Lituano \"fonético\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Latuniano"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macedónio"
 
-#: 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 "Mongoliano (cirílico)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltês (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltês (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Holandês"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Polaco (mapa QWERTY)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polaco (mapa 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 "Canadiano (Quebeco)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Romeno (QWERTZ)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Romeno (QWERTY)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Russo (Fonético)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (Norueguês)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandês)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Eslovaco"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbo (cirílico)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syriac"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Syriac (Fonético)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamil (máquina de escrever)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Teclado Tailandês"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Teclado Tajik"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Turco (modelo \"F\" tradicional)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Turco (modelo moderno \"Q\")"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ucraniano"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Teclado Americano (Internacional)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Uzbeco (cirílico)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"número de colunas\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Jugoslavo (latim)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "A tecla Alt Direita"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
-msgstr "As duas teclas Maiúscula simultaneamente"
+msgstr "As duas teclas Shift simultaneamente"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
-msgstr "As teclas Ctrl e Maiúscula simultaneamente"
+msgstr "Control e teclas Shift simultaneamente"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
-msgstr "A tecla de bloqueamento das Maiúsculas"
+msgstr "Tecla CapsLock"
+
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Premir as teclas Shift e CapsLock simultâneamente"
 
-#: keyboard.pm:294
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
-msgstr "As teclas Ctrl e Alt simultaneamente"
+msgstr "Ctrl e teclas Alt simultâneamente"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
-msgstr "As teclas Alt e Maiúscula simultaneamente"
+msgstr "Alt e teclas Shift simultâneamente"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
-msgstr "A tecla \"Menu\""
+msgstr "Tecla \"Menu\""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
-msgstr "A tecla \"Windows\" esquerda"
+msgstr "Tecla esquerda \"Windows\""
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
-msgstr "A tecla \"Windows\" direita"
+msgstr "Tecla direita \"Windows\""
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
-msgstr "As duas teclas Control simultaneamente"
+msgstr "As duas teclas Control simultâneamente"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
-msgstr "As duas teclas Alt simultaneamente"
+msgstr "As duas teclas Alt simultâneamente"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Shift esquerda"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
-msgstr "Tecla Maj Direita"
+msgstr "Tecla Shift Direita"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt Esquerda"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control Esquerda"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
-msgstr "A tecla Control Direita"
+msgstr "Tecla Control Direita"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
-"Aqui você pode escolher a tecla ou a sequência de teclas que\n"
-"vai permitir de mudar de mapa de teclado\n"
+"Aqui pode escolher a tecla ou a combinação de teclas que\n"
+"irão permitir mudar entre as diferentes disposições de teclado\n"
 "(ex: latim e não latim)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
 "During installation, you will need to use the Right Control\n"
 "key to switch between the different keyboard layouts."
 msgstr ""
-"Esta opção vai ser activa depois da instalação.\n"
-"Durante a instalação, vai ter de utilizar a tecla Controlo\n"
-"Direita para mudar de disposição de teclado."
+"Esta opção irá ser activada depois da instalação.\n"
+"Durante a instalação, irá ter de usar a tecla Control Direita\n"
+"para mudar a disposição de teclado."
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Afeganistão"
-
-#: 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 "Emirados Árabes Unidos"
+msgstr "Emiratos Árabes Unidos"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afeganistão"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua e 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 "Antilhas Holandesas"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antárctica"
 
-#: 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 Americano"
+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 "Azerbeijão"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bósnia e Herzegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "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 "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "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 "Bahamas"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Butão"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Ilha 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 "Ilhas 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 Centro-Africana"
 
-#: 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íça"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "China"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Servia & Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Ilhas Natal"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: 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 "Argéria"
+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 "Egipto"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Eritreia"
 
-#: 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 "Espanha"
 
-#: 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 "Ilhas Falkland (Malvinas)"
 
-#: 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 "Ilhas Faroé"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Gabão"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Granada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Guiana Francesa"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Gana"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Gronelâ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 "Guiné"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Sul da Geórgia e a Ilha Sandwich Sul"
 
-#: 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 "Guiné-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Guiana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
-msgstr "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
+msgstr "Hong Kong SAR (China)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Ilha Heard e Ilhas McDonald"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croácia"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Hungria"
 
-#: 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 "Territorio Inglês no Oceano Índio"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Iraque"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Irão"
 
-#: 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ão"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Japão"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
-msgstr "Kénia"
+msgstr "Quénia"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: 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 "Comoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Santo Kitts e Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Coreia do Norte"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Coreia"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Koweit"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
-msgstr "Ilhas Caiman"
+msgstr "Ilhas Caimão"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazaquistão"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Santa Lúcia"
 
-#: 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 "Lesoto"
 
-#: 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 "Luxemburgo"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Latvia"
 
-#: 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 "Marrocos"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldovia"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagáscar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Ilhas 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 "Ilhas Mariana do Norte"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinica"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Maurícias"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "México"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Moçambique"
 
-#: 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 "Ilha 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 "Nicarágua"
 
-#: 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 Zelândia"
 
-#: 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 "Peru"
 
-#: 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 Guiné"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistão"
 
-#: 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 "São Pedro e 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 "Porto 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 "Quatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Reunião"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Roménia"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Rússia"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: 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 "Ilhas Salomão"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seichelas"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Sudão"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Singapura"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Santa Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Eslovénia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ilhas Svalbard e Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
-msgstr "Slovaquia"
+msgstr "Eslovaquia"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
-msgstr "Serra Leão"
+msgstr "Serra Leoa"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "São 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 "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
-msgstr "São Tome e Príncipe"
+msgstr "São Tomé e 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 "Suazilandia"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Ilhas Turks e Caicos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chade"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: 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 "Tajikistão"
 
-#: 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 Leste"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistão"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tanga"
 
-#: 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 "Trinidad e 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 "Ucrânia"
 
-#: 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 "Estados Unidos - Ilhas Costeiras Menores"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistão"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vaticano"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "São Vicente e as Grenadinas"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Ilhas Virgens (Inglesas)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Ilhas Virgens (U.S.)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Vietname"
 
-#: 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 e Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia & Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "África do Sul"
 
-#: 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 "Deve instalar os seguintes pacotes %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 "Bem-vindo à %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Montagens circulares %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Remova os volumes lógicos primeiro\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "NENHUM"
@@ -8988,12 +9313,12 @@ msgstr "Configuração dos módulos"
 #: modules/interactive.pm:22
 #, c-format
 msgid "You can configure each parameter of the module here."
-msgstr "Você pode configurar cada parametro do módulo aqui."
+msgstr "Pode configurar cada parâmetro do módulo aqui."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Interfaces %s %s encontrados"
+msgid "Found %s interfaces"
+msgstr "Interfaces %s encontrados"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9028,8 +9353,8 @@ msgid ""
 "You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
-"Você pode agora inserir as opções para o modulo %s.\n"
-"Lembre-se que todo endereço deve ser escrito com o prefixo 0x como '0x12'"
+"Pode agora providênciar as opções para o modulo %s.\n"
+"Note que qualquer endereço deve ser escrito com o prefixo 0x como '0x12'"
 
 #: modules/interactive.pm:104
 #, c-format
@@ -9038,7 +9363,7 @@ msgid ""
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
-"Agora pode definir as opções para o módulo %s.\n"
+"Pode agora definir as opções para o módulo %s.\n"
 "As opções estão no formato ``nome=valor nome2=valor2 ...''\n"
 "Para exemplo, ``io=0x300 irq=7''"
 
@@ -9048,12 +9373,12 @@ msgid "Module options:"
 msgstr "Opções do módulo:"
 
 #. -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 "Qual driver %s que eu deveria tentar?"
+msgstr "Que driver %s devo tentar?"
 
-#: 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"
@@ -9064,23 +9389,23 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"Em alguns casos, o driver %s precisa de informações extra para funcionar\n"
-"correctamente, mas ele normalmente funciona bem sem estas informações.\n"
-"Deseja especificar opções extras ou deixar o driver localizar na sua\n"
-"máquina as informações que ele precisa? Ocasionalmente, isso poderá\n"
-"travar o computador, mas não deve causar algum dano."
+"Em alguns casos, o driver %s precisa ter informações extra para funcionar\n"
+"correctamente, contudo irá funcionar correctamente sem estas. Deseja\n"
+"especificar opções extras ou permitir que sonde a sua máquina pela\n"
+"informação que precisa? Ocasionalmente, sondar irá bloquear o\n"
+"computador, mas não deve causar qualquer dano."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
-msgstr "Auto-procurar"
+msgstr "Auto-sondar"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Especificar opções"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9097,12 +9422,12 @@ msgstr "um número"
 #: modules/parameters.pm:51
 #, c-format
 msgid "%d comma separated numbers"
-msgstr "%d números separados com virgulas"
+msgstr "%d números separados por vírgulas"
 
 #: modules/parameters.pm:51
 #, c-format
 msgid "%d comma separated strings"
-msgstr "%d cadeias separadas com virgulas"
+msgstr "%d cadeias separadas por virgulas"
 
 #: modules/parameters.pm:53
 #, c-format
@@ -9139,11 +9464,11 @@ msgstr "Rato Genérico PS2 com roda"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
@@ -9151,7 +9476,7 @@ msgstr "Automático"
 #: mouse.pm:39 mouse.pm:73
 #, c-format
 msgid "Kensington Thinking Mouse"
-msgstr "Rato Pensador Kensington"
+msgstr "Rato Kensington Thinking"
 
 #: mouse.pm:40 mouse.pm:68
 #, c-format
@@ -9161,7 +9486,7 @@ msgstr "Rato Rede Genius"
 #: mouse.pm:41
 #, c-format
 msgid "Genius NetScroll"
-msgstr "Genius RodaRede"
+msgstr "Genius NetScroll"
 
 #: mouse.pm:42 mouse.pm:52
 #, c-format
@@ -9201,12 +9526,12 @@ msgstr "Rato Genérico com 3 Botões"
 #: mouse.pm:60
 #, c-format
 msgid "Microsoft IntelliMouse"
-msgstr "Microsoft IntelliRato"
+msgstr "Microsoft IntelliMouse"
 
 #: mouse.pm:61
 #, c-format
 msgid "Logitech MouseMan"
-msgstr "Logitech RatoHomem"
+msgstr "Logitech MouseMan"
 
 #: mouse.pm:62
 #, c-format
@@ -9216,22 +9541,22 @@ msgstr "Logitech MouseMan com emulação da Roda"
 #: mouse.pm:63
 #, c-format
 msgid "Mouse Systems"
-msgstr "Rato Systems"
+msgstr "Sistemas do Rato"
 
 #: mouse.pm:65
 #, c-format
 msgid "Logitech CC Series"
-msgstr "Logitech Séries CC"
+msgstr "Séries Logitech CC"
 
 #: mouse.pm:66
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
-msgstr "Logitech Séries CC com emulação da roda"
+msgstr "Séries Logitech CC com emulação da roda"
 
 #: mouse.pm:67
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
-msgstr "Logitech RatoHomem+/PrimeiroRato+"
+msgstr "Logitech MouseMan+/FirstMouse+"
 
 #: mouse.pm:69
 #, c-format
@@ -9256,7 +9581,7 @@ msgstr "Rato Logitech (série, tipo C7 antigo) com emulação da Roda"
 #: mouse.pm:74
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
-msgstr "Rato Pensador Kensington com emulação da roda"
+msgstr "Rato Kensington Thinking com emulação da roda"
 
 #: mouse.pm:77
 #, c-format
@@ -9288,50 +9613,55 @@ msgstr "Universal"
 msgid "Any PS/2 & USB mice"
 msgstr "Qualquer rato PS/2 & 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 "Touchpad Synaptics"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "nenhum"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Nenhum Rato"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Por favor teste o rato"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activar o rato,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVA A SUA RODA!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "usar pppoe"
+msgid "use PPPoE"
+msgstr "use PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "usar pptp"
+msgid "use PPTP"
+msgstr "use PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "usar dhcp"
+msgid "use DHCP"
+msgstr "use DHCP"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9340,36 +9670,36 @@ msgstr " - detectado"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (utilizando pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (usar PPPoA) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (utilizando dhcp) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (usar DHCP) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
-msgstr "Ligar à Internet"
+msgstr "Conectar à 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 ""
-"A maneira mais comum de se ligar com adsl é pppoe.\n"
-"Mas algumas ligações usam pptp, poucas usam dhcp.\n"
-"Se não sabe, escolha 'usar pppoe'"
+"A maneira mais comum de conectar com adsl é pppoe.\n"
+"Algumas ligações usam PPTP, poucas usam DHCP.\n"
+"Se não sabe, escolha 'use PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
-msgstr "Tipo de ligação ADSL :"
+msgid "ADSL connection type:"
+msgstr "Tipo de conexão ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
@@ -9392,7 +9722,7 @@ msgstr "Servidor FTP"
 #: network/drakfirewall.pm:32
 #, c-format
 msgid "Mail Server"
-msgstr "Servidor de Correio"
+msgstr "Servidor de Correio Eletrônico"
 
 #: network/drakfirewall.pm:37
 #, c-format
@@ -9402,7 +9732,7 @@ msgstr "Servidor POP e IMAP"
 #: network/drakfirewall.pm:42
 #, c-format
 msgid "Telnet server"
-msgstr "Servidor  Telnet"
+msgstr "Servidor Telnet"
 
 #: network/drakfirewall.pm:48
 #, c-format
@@ -9438,11 +9768,11 @@ msgid ""
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
-"Configurador do drakfirewall\n"
+"Configurador drakfirewall\n"
 "\n"
-"Configura um pára-fogo pessoal para esta máquina Mandrakelinux.\n"
-"Para um pára-fogo poderoso e dedicado, por favor veja a \n"
-"distribuição especializada MandrakeSecurity Firewall"
+"Isto configura uma firewall pessoal para esta máquina Mandrakelinux.\n"
+"Para uma solução firewall poderosa e dedicada, por favor veja a \n"
+"distribuição especializada MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:158
 #, c-format
@@ -9452,15 +9782,15 @@ msgid ""
 "Make sure you have configured your Network/Internet access with\n"
 "drakconnect before going any further."
 msgstr ""
-"Configurador do drakfirewall\n"
+"Configurador drakfirewall\n"
 "\n"
-"Verifique que configurou o seu acesso à Rede/Internet com\n"
-"drakconnect antes de continuar."
+"Verifique se configurou o seu acesso à Rede/Internet com o\n"
+"drakconnect antes de avançar mais."
 
 #: network/drakfirewall.pm:175
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
-msgstr "A quais serviços deseja permitir a ligação desde o Internet ?"
+msgstr "A que serviços deseja permitir a ligação Internet se ligue ?"
 
 #: network/drakfirewall.pm:176
 #, c-format
@@ -9469,7 +9799,7 @@ msgid ""
 "Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Have a look at /etc/services for information."
 msgstr ""
-"Pode escrever portas diversas. \n"
+"Pode digitar portas diversas. \n"
 "Exemplos validos são : 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Veja em /etc/services para informações."
 
@@ -9484,120 +9814,121 @@ msgid ""
 msgstr ""
 "Porta dada inválida: %s.\n"
 "O formato adequado é \"porta/tcp\" ou \"porta/udp\", \n"
-"onde porta situa-se entre 1 e 65535.\n"
+"onde porta é entre 1 e 65535.\n"
 "\n"
-"Pode igualmente introduzir um intervalo de portas (ex: 24300:24350/udp)"
+"Pode também dar um intervalo de portas (ex: 24300:24350/udp)"
 
 #: network/drakfirewall.pm:192
 #, c-format
 msgid "Everything (no firewall)"
-msgstr "Tudo (nenhum pára-fogo)"
+msgstr "Tudo (sem firewall)"
 
 #: network/drakfirewall.pm:194
 #, c-format
 msgid "Other ports"
 msgstr "Outras portas"
 
-#: 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 "Não listado - editar manualmente"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "Eu não sei"
 
-#: 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 "Escolha manual"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Placa ISDN 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 "Managed"
+msgstr "Controlado"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: 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 "Secundário"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Configuração manual"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP Automático (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP Automático (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para o resto do mundo"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocolo 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"
@@ -9606,164 +9937,169 @@ msgstr ""
 "Protocolo para o resto do mundo\n"
 "Sem Canal-D (linhas alugadas)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem Alcatel speedtouch USB"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Protocolo de Configuração Dinâmica do Anfitrião (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Configuração manual do TCP/IP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Protocolo de Tunelamento Ponto a Ponto (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP através de Ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP através de ATM (PPPoA)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr "DSL sobre CAPI"
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Bridge em Ethernet LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Bridge em Ethernet VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
-msgstr "IP Roteado LLC"
+msgstr "IP Routeado LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
-msgstr "IP Roteado VC"
+msgstr "IP Routeado VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
-msgstr "Baseado em roteiro"
+msgstr "Baseado em 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 "Baseado em 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 "Configuração da Rede e do Internet"
+msgstr "Configuração de Rede & Internet"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(detectado na porta %s)"
 
 #  -PO: here, "(detected)" string will be appended to eg "ADSL connection"
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected %s)"
 msgstr "(detectado %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(detectado)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Conexão por modem"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
-msgstr "Ligação ISDN"
+msgstr "Conexão ISDN"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
-msgstr "Ligação ADSL"
+msgstr "Conexão ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
-msgstr "Ligação por Cabo"
+msgstr "Conexão por Cabo"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
-msgstr "Ligação à Rede"
+msgstr "Conexão LAN"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Conexão Wireless"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
-msgstr "Escolha a ligação que deseja configurar"
+msgstr "Escolha a conexão que deseja configurar"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9771,136 +10107,135 @@ msgid ""
 "\n"
 "Press \"%s\" to continue."
 msgstr ""
-"Vamos agora configurar a ligação %s.\n"
+"Vamos agora configurar a conexão %s.\n"
 "\n"
 "\n"
-"Carregue em \"%s\" para continuar."
+"Clique em \"%s\" para continuar."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
-msgstr "Configuração da Ligação"
+msgstr "Configuração da Conexão"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Por favor preencha ou verifique os campos abaixo"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ da Placa"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Memória da Placa (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "IO da Placa"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_O da Placa"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 da Placa"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "O seu número de telefone pessoal"
 
-#: 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 "Nome do provedor (ex: provedor.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Número do telefone do provedor"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Provedor DNS 1 (opcional)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Provedor DNS 2 (opcional)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Modo de marcação"
 
-#: 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 "Velocidade de Ligação"
+msgstr "Velocidade de conexão"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
-msgstr "Tempo de espera pela ligação (em segundos)"
+msgstr "Tempo de espera da conexão (em segundos)"
 
-#: 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 "Nome do utilizador da conta"
 
-#: 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 "Senha da conta"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, c-format
 msgid "Select the network interface to configure:"
-msgstr "Seleccione a interface de rede a configurar:"
+msgstr "Seleccione a interface de rede para configurar:"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de Rede"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem ISDN externo"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Seleccione um dispositivo !"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "Configuração ISDN"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
-msgstr "Qual tipo de placa tem?"
+msgstr "Que tipo de placa tem?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -9912,51 +10247,68 @@ msgstr ""
 "\n"
 "Se tiver uma placa ISA, os valores do próximo quadro devem estar correctos.\n"
 "\n"
-"Se tiver uma placa PCMCIA, tem que saber o irq e io da sua placa.\n"
+"Se tiver uma placa PCMCIA, tem que saber o \"irq\" e \"io\" da sua placa.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Continuar"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Abortar"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Qual destas é a sua placa ISDN?"
 
-#: 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 ""
+"Um driver CAPI está disponível para este modem. Este driver CAPI pode propor "
+"mais funcionalidades do que o driver livre (como o envio de telecopias). "
+"Qual driver deseja usar?"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Driver"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
-msgstr "Qual protocolo que quer usar?"
+msgstr "Que protocolo quer usar?"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
 "If it isn't listed, choose Unlisted."
 msgstr ""
 "Seleccione o seu provedor.\n"
-" Se não estiver na lista, escolha Não Listado"
+"Se não estiver listado, escolha Não Listado"
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, c-format
 msgid "Provider:"
 msgstr "Provedor:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9965,122 +10317,117 @@ msgstr ""
 "O seu modem não é suportado pelo sistema.\n"
 "Veja em http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Seleccione o modem 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 "Desculpe, só suportamos versões do kernel superiores ou iguais a 2.4."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Por favor escolha a que porta série o seu modem está ligado."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Seleccione o seu provedor:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Dialup: opções da conta"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
-msgstr "Nome da ligação"
+msgstr "Nome da conexão"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Número do telefone"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "ID de Login"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Dialup: parâmetros IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Parâmetros IP"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
-msgstr "Máscara de subrede"
+msgstr "Máscara subnet"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr "Ligação Dialup: parâmetros DNS"
+msgstr "Conexão Dialup: parâmetros DNS"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: 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 "Servidor DNS primário (opcional)"
+msgstr "Primeiro 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 "Servidor DNS secundário (opcional)"
+msgstr "Segundo Servidor DNS (opcional)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Definir hostname a partir do IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
-msgstr "Ponte"
+msgstr "Gateway"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Endereço IP do Gateway"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Configuração ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Por favor escolha o seu provedor ADSL"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10088,35 +10435,35 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 "Você precisa do microcode Alcatel.\n"
-"Pode fornecê-lo agora por uma disquete ou a sua partição windows,\n"
-"ou saltar e fazer-lo mais tarde."
+"Pode fornecê-lo agora via disquete ou pela sua partição windows,\n"
+"ou saltar e fazê-lo mais tarde."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
-msgstr "Utilizar uma disquete"
+msgstr "Usar uma disquete"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
-msgstr "Utilizar a minha partição Windows"
+msgstr "Usar a minha partição Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Fazer mais tarde"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
-msgstr "A cópia do firmware falhou, o ficheiro %s não foi encontrado"
+msgstr "Cópia do firmware falhada, o ficheiro %s não foi encontrado"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
-msgstr "A cópia do firmware sucedeu"
+msgstr "Cópia do firmware bem succedida"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10124,27 +10471,27 @@ msgid ""
 "%s\n"
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
-"Você precisa do microcódigo Alcatel.\n"
+"Precisa do microcódigo Alcatel.\n"
 "Descarregue-o em\n"
 "%s\n"
 "e copie o mgmt.o em /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "ID do Caminho Virtual (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "ID do Circuito Virtual (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Encapsulamento :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10157,52 +10504,53 @@ msgstr ""
 "\n"
 "Pode encontrar um driver em http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr "Carregar um driver manualmente"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
-"AVISO: Esse dispositivo já foi configurado para ligar à Internet.\n"
-"Apenas aceite manter este dispositivo configurado.\n"
-"A modificação dos campos abaixo irá sobrepor esta configuração."
+"AVISO: este dispositivo foi configurado préviamente para conectar à "
+"Internet.\n"
+"A modificação dos campos abaixo ira sobrepor esta configuração.\n"
+"Quer realmente reconfigurar este dispositivo?"
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "\n"
 msgstr ""
-"Parabéns. A configuração da rede e da Internet acabou.\n"
+"Parabéns, a configuração da rede e da Internet acabou.\n"
 "\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Resolução do hostname Zeroconf"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "A configurar o dispositivo de rede %s (driver %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
-"Os protocolos que se seguem podem ser utilizados para configurar uma conexão "
+"Os seguintes protocolos podem ser usados para configurar uma conexão "
 "ethernet. Por favor escolha o que pretende usar"
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10210,115 +10558,121 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 "Por favor introduza a configuração IP para esta máquina.\n"
-"Cada item deve ser introduzido como endereço IP ponteado-decimal\n"
-"(por exemplo, 1.2.3.4)."
+"Cada item deve ser introduzido como endereço IP em notação\n"
+"ponto-decimal (por exemplo, 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Obter o nome de anfitrião a partir do endereço DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome do anfitrião DHCP"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: 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 "Procurar o id da placa rede (útil para os portáteis)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
-msgstr "Ligação a quente da Rede"
+msgstr "Ligação à Rede \"Hotplugging\""
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
-msgstr "Iniciado ao arranque"
+msgstr "Iniciar no arranque"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "O endereço IP deve estar no formato 1.2.3.4"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
-msgstr "Cuidado : o endereço IP %s é normalmente reservado !"
+msgid "Warning: IP address %s is usually reserved!"
+msgstr "Aviso: o endereço IP %s é normalmente reservado !"
 
-#: 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 já está em uso\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Por favor introduza os parâmetros wireless para esta placa:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo de Operação"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome da Rede (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "ID de Rede"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Frequência de operação"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
-msgstr "Sensibilidade do limiar"
+msgstr "Sensibilidade do ponto inicial"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (em b/s)"
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
-"Freq deveria ter o sufixo k, M ou G (por exemplo, \"2.46G\" para uma "
-"frequência de 2.46 GHz), ou então insira suficientes '0' (zeros)."
+"Freq deve ter o sufixo k, M ou G (por exemplo, \"2.46G\" para uma frequência "
+"de 2.46 GHz), ou então insira suficientes '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 "
 "enough '0' (zeroes)."
 msgstr ""
-"Rate deveria ter o sufixo k, M ou G (por exemplo, \"11M\" para 11M), ou "
-"insira suficientes '0' (zeros)."
+"Rate deve ter o sufixo k, M ou G (por exemplo, \"11M\" para 11M), ou insira "
+"suficientes '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 "
@@ -10331,50 +10685,51 @@ msgid ""
 "fixed\n"
 "or off."
 msgstr ""
-"O RTS/CTS adiciona um handshake antes da transmissão de cada pacote para se "
+"O RTS/CTS adiciona um handshake antes da transmissão de cada pacote para "
 "certificar\n"
-"de que o canal está livre. Isto adiciona overhead, mas melhora a performance "
-"no caso de nós\n"
-"ocultos ou num número de nós activos muito elevado. Este pârametro define o "
-"tamanho pacote\n"
-"mais pequeno para o qual o nó envia RTS, um valor igual ao tamanho do maior "
-"pacote\n"
-"desactiva o esquema. Pode também definir este pârametro como auto, fixo ou "
+"que o canal está livre. Isto adiciona overhead, mas aumenta a performance no "
+"caso de\n"
+"nós escondidos ou um número grande de nós activos. Este pârametro define o "
+"tamanho do\n"
+"pacote mais pequeno para o qual o nó envia RTS, um valor igual ao tamanho "
+"máximo\n"
+"do pacote desactiva o esquema. Pode também definir este pârametro para "
+"auto,  fixo ou\n"
 "desligado."
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentação"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Argumentos extra do comando Iwconfig"
 
-#: 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 ""
-"Aqui, é possível configurar alguns parâmetros wireless extra, tais como:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick foi já definido "
-"como o hostname).\n"
+"Aqui, pode configurar alguns parâmetros extra wireless, tais como:\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick já está definido "
+"como hostname).\n"
 "\n"
-"Consulte a man page do iwpconfig(8) para informações adicionais."
+"Veja a páfina do manual iwconfig(8) para mais informações."
 
 #  -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Argumentos extra do comando lwspy"
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10385,21 +10740,21 @@ msgid ""
 "\n"
 "See iwpspy(8) man page for further information."
 msgstr ""
-"O Iwspy é utilizado para definir uma lista de endereços na interface\n"
-"da rede wireless e para monitorizar a qualidade da informação de cada um dos "
-"links.\n"
+"O Iwspy é usado para definir uma lista de endereços na interface\n"
+"de rede wireless e para monitorizar a informação da ligação para todos\n"
+"eles.\n"
 "\n"
 "Esta informação é a mesma que a disponível em /proc/net/wireless :\n"
-"qualidade do link, força do sinal e nível do ruído.\n"
+"qualidade da ligação, força do sinal e nível do ruído.\n"
 "\n"
-"Consulte a man page do iwpspy(8) para informações adicionais."
+"Consulte a página do manual iwpspy(8) para mais informações."
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Argumentos extra do comando lwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10416,40 +10771,20 @@ msgid ""
 "\n"
 "See iwpriv(8) man page for further information."
 msgstr ""
-"O Iwpriv disponibiliza a configuração de pârametros facultativos (privados) "
-"de uma\n"
-"interface de rede wireless.\n"
+"O Iwpriv permite configurar pârametros opcionais (privados) de\n"
+"uma\n"
+"interface de rede.\n"
 "\n"
-"O Iwpriv utiliza parâmetros e definições específicas a cada driver (ao "
-"contrário do\n"
-"iwconfig que faz uso de genéricos).\n"
+"O Iwpriv lida com parâmetros e definições específicas para cada driver (em "
+"oposição\n"
+"ao iwconfig que lida com os genéricos).\n"
 "\n"
-"Na teoria, a documentação de cada driver de dispositivo deve indicar como "
-"utilizar\n"
-"esses comandos de interface específicos e quais os efeitos.\n"
+"Em teoria, a documentação de cada dispositivo deve indicar como usar\n"
+"esses comandos de interface específicos e os seus efeitos.\n"
 "\n"
-"Consulte a man page do iwpriv(8) para informações adicionais."
-
-#: 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 ""
-"Nenhum adaptador de rede ethernet foi detectado no seu sistema.\n"
-"Eu não posso configurar este tipo de ligação."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Escolha o interface de rede"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid "Please choose which network adapter you want to use to connect to Internet."
-msgstr "Por favor escolher o adaptador de rede que quer usar para se ligar à Internet"
+"Veja a página do manual iwpriv(8) para mais informações."
 
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10459,132 +10794,156 @@ msgid ""
 msgstr ""
 "Por favor introduza o nome do seu anfitrião.\n"
 "O nome do anfitrião deve ser um nome de anfitrião totalmente qualificado,\n"
-"como por exemplo ``mybox.mylab.myco.com'' .\n"
-"Também pode introduzir o endereço IP de um ponte se tiver um"
+"tal como ``mybox.mylab.myco.com''.\n"
+"Pode também introduzir o endereço IP do gateway se tiver algum."
 
-#: 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 ""
-"Por fim, mas não menos importante, pode indicar os endereços IP do seu "
-"servidor DNS."
+"Último, mas não menos importante, pode também escrever os seus endereços IP "
+"do seu servidor DNS."
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Nome de anfitrião (opcional)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Nome do anfitrião"
 
-#: 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 "Domínio de procura"
 
-#: 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 ""
-"Por defeito o domínio de procura será definido a partir do hostname "
+"Por defeito o domínio de procura será definido a partir do nome de anfitrão "
 "devidamente qualificado"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
-msgstr "Porta de ligação (ex. %s)"
+msgstr "Gateway (ex. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
-msgstr "Dispositivo de ponte"
+msgstr "Dispositivo Gateway"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "O endereço do servidor DNS deve ser no formato 1.2.3.4"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
-msgstr "O endereço do portão deve ser no formato 1.2.3.4"
+msgstr "O endereço Gateway deve ser no formato 1.2.3.4"
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
-"Introduza um hostname Zeroconf para a sua máquina utilizar na comunicação "
-"com as outras máquinas da rede:"
+"Se desejado, introduza um nome de anfitrião Zeroconf.\n"
+"Este é o nome que a sua máquina irá usar para advertir qualquer\n"
+"dos seus recursos partilhados que não são geridos pela rede.\n"
+"Não é necessário na maioria das redes."
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
-msgstr "Nome do anfitrião Zeroconf"
+msgstr "Nome de anfitrião Zeroconf"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
-msgstr "Nome do anfitrião Zeroconf não deve conter um "
+msgstr "Nome de anfitrião Zeroconf não deve conter um ."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
-"você configurou varias maneiras de se ligar ao Internet.\n"
-"Escolha a que deseja utilizar.\n"
+"Deve ter configurado múltiplas maneiras de se ligar à Internet.\n"
+"Escolha aquela que deseja usar.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Ligação à Internet"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
-msgstr "A configuração está feita, deseja aplicar-la?"
+msgid "Configuration is complete, do you want to apply settings?"
+msgstr "A configuração está complecta, deseja aplicar as definições?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
-msgstr "Quer iniciar a sua ligação ao iniciar?"
+msgstr "Quer iniciar a sua ligação ao arrancar?"
 
-#: 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áticamente no arranque"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "Ao usar a Net Applet na bandeja do painel"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "Manualmente (a interface continuará a ser activada no arranque)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Como quer ligar esta conexão ?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "A rede precisa de ser reiniciada. Deseja reiniciá-la?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Configuração da Rede"
 
-#: 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 ""
@@ -10592,56 +10951,56 @@ 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 "Quer tentar ligar-se à Internet agora?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
-msgstr "A testar a sua ligação..."
+msgstr "A testar a sua conexão..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "O sistema está agora ligado à Internet."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
-msgstr "Por razões de segurança, será desligado(a) agora."
+msgstr "Por razões de segurança, será desligada agora."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
-"O sistema não parece estar ligado à Internet.\n"
-"Tente reconfigurar a sua ligação."
+"O sistema não parece estar conectado à Internet.\n"
+"Tente reconfigurar a sua conexão."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
-"Depois de completado, recomendamos que reinicie o seu \n"
-"ambiente X para evitar o problema da troca de nome do anfitrião."
+"Depois disto estar feito, recomendamos que reinicie o seu ambiente Xpara "
+"evitar qualquer problema relacionado com o nome do anfitrião."
 
-#: 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 ""
 "Ocorreram problemas durante a configuração.\n"
-"Teste a sua ligação com net_monitor ou mcc. Se a sua ligação não funciona, "
-"pode desejar relançar a configuração."
+"Teste a sua conexão via net_monitor ou mcc. Se a sua conexão não funcionar, "
+"pode querer relançar a configuração."
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10649,11 +11008,12 @@ msgid ""
 "Click on Ok to keep your configuration, or cancel to reconfigure your "
 "Internet & Network connection.\n"
 msgstr ""
-"Por que está a fazer uma instalação em rede a sua rede já está configurada.\n"
-"Clique em OK para manter a configuração, ou Cancelar para reconfigurar a sua "
-"ligação Internet & Rede.\n"
+"Por que está a fazer uma instalação de rede, a sua rede já está "
+"configurada.\n"
+"Clique em OK para manter a configuração, ou Cancelar para reconfigurar as "
+"suas ligações Internet & Rede.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10662,27 +11022,27 @@ msgstr ""
 "Ocorreu um erro inesperado:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Configuração de proxies"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Proxy FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "O Proxy deve ser http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "O Url deve começar com 'ftp:' ou 'http:'"
@@ -10698,10 +11058,10 @@ msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
-"Aviso! Uma configuração de firewall existente foi detectada. Pode necessitar "
-"de configuração manual depois da instalação."
+"Aviso! Uma configuração de firewall existente foi detectada. Pode precisar "
+"de algumas correções manuais a seguir à instalação."
 
-#: 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"
@@ -10714,40 +11074,40 @@ msgstr ""
 "Por favor escolha o nome do interface ligado ao internet.\n"
 "\n"
 "Exemplos:\n"
-"\t\tppp+ para um modem ou uma ligação DSL, \n"
-"\t\teth0, ou eth1 para uma ligação por cabo, \n"
-"\t\tippp+ para uma ligação ISDN.\n"
+"\t\tppp+ para um modem ou uma conexão DSL, \n"
+"\t\teth0, ou eth1 para uma conexão por cabo, \n"
+"\t\tippp+ para uma conexão ISDN.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Insira uma disquete"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
 msgstr ""
 "Insira uma disquete formatada em FAT no leitor %s com %s na pasta raíz e "
-"carregue em %s"
+"clique em %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Erro de acesso à disquete, incapaz de montar o dispositivo %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
-msgstr "falhou ao montar: "
+msgstr "falha ao montar: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Partição extendida não é suportada nesta plataforma"
 
-#: partition_table.pm:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10758,22 +11118,22 @@ msgstr ""
 "A única solução é mover as suas partições primárias para ter o buraco "
 "próximo das partições extendidas"
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "A restauração pelo ficheiro %s falhou: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
-msgstr "Ficheiro de cópia de segurança defeituoso"
+msgstr "Ficheiro de cópia de segurança danificado"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Erro ao escrever no ficheiro %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10781,32 +11141,32 @@ msgid ""
 "It means writing anything on the disk will end up with random, corrupted "
 "data."
 msgstr ""
-"Algo mau está acontecer no seu disco. \n"
-"O teste que verifica a integridade dos dados falhou. \n"
-"Isso significa que escrever algo no disco resultará em dados errados "
+"Alguma coisa maá está acontecer no seu disco. \n"
+"O teste para verificar a integridade dos dados falhou. \n"
+"Significa que escrever algo no disco resultará em dados danificados "
 "aleatóriamente."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "obrigatório"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "importante"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "muito bom"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "bom"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "talvez"
@@ -10821,7 +11181,7 @@ msgstr "(em %s)"
 msgid "(on this machine)"
 msgstr "(nesta máquina)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Configurado noutras máquinas"
@@ -10831,367 +11191,375 @@ msgstr "Configurado noutras máquinas"
 msgid "On CUPS server \"%s\""
 msgstr "No servidor CUPS \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
-msgstr " (Por omissão)"
+msgstr " (Padrão)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Imprimir, não meter em fila."
 
-#: 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 - Demónio de Impressão em Linha"
+msgstr "LPD - Daemon de Impressão em Linha"
 
-#: 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 Nova Geração"
 
-#: 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 - Sistema Unix Comum de Impressão"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Sistema Unix Comum de Impressão (servidor remoto)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "CUPS remoto"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Modelo Desconhecido"
 
-#: 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 num Servidor CUPS remoto"
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Impressora num servidor lpd remoto"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Impressora da rede (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Impressora num servidor SMB/Windows 95/98/NT"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Impressora num 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 "Entre uma impressora URI"
+msgstr "Introduza uma impressora URI"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
-msgstr "Envia o trabalho para um commando"
+msgstr "Envia o trabalho para um comando"
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
 #, c-format
 msgid "Unknown model"
 msgstr "Modelo desconhecido"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Configurado nesta máquina"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
-msgstr " no cabo paralelo #%s"
+msgstr " na porta paralela #%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 ", dispositivo multi-funções no cabo paralelo #%s"
+msgstr ", dispositivo multi-funções no porta paralela #%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
-msgstr ", dispositivo multi-funções no cabo paralelo"
+msgstr ", dispositivo multi-funções na porta paralela"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dispositivo multi-funções em USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dispositivo multi-funções em HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", dispositivo multi-funções"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", a imprimir para %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " no servidor LPD \"%s\", impressora \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", anfitrião TCP/IP \"%s\", porta %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " no servidor SMB/Windows \"%s\", partilha \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " no servidor Novell \"%s\", impressora \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
-msgstr ", utilizando o commando %s"
+msgstr ", a usar o comando %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
-msgstr "Ficha paralela #%s"
+msgstr "Porta paralela #%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 "Dispositivo multi-funções no cabo paralelo #%s"
+msgstr "Dispositivo multi-funções na porta paralela #%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
-msgstr "Dispositivo multi-funções num cabo paralelo"
+msgstr "Dispositivo multi-funções numa porta paralela"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dispositivo multi-funções em USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dispositivo multi-funções em HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Dispositivo multi-funções"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "A imprimir para %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 "Anfitrião TCP/IP \"%s\", porta %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Servidor SMB/Windows \"%s\", partilha \"%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 "Utiliza o commando %s"
+msgstr "Usa o comando %s"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
-msgstr "Impressora directa (sem piloto)"
+msgstr "Impressora directa (sem driver)"
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Rede(s) local(is)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interface \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Rede %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Anfitrião %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Porta %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"
 msgstr ""
 "A HP LaserJet 1000 precisa que o seu firmware seja carregado depois de ser "
-"ligada. Descarregue o piloto Windows a partir do site Web HP (o firmware do "
-"CD da impressora não funciona) e pegue o ficheiro do firmware  no ficheiro ."
-"exe com o utilitário 'unzip' procurando o ficheiro 'sihp1000.img'. Copie o "
-"ficheiro na pasta '/etc/printer'. Vai então ser encotrada pela programa "
-"automatico que a carrega cada vês que a impressora é ligada.\n"
+"ligada. Descarregue o driver Windows a partir do site Web HP (o firmware do "
+"CD da impressora não funciona) e extraia o ficheiro do firmware "
+"descomprimindo o ficheiro exe com o utilitário 'unzip' e procure o ficheiro "
+"'sihp1000.img'. Copie o ficheiro para a pasta '/etc/printer'. Vai então ser "
+"encontrado pelo script automático e depois irá ser carregado sempre que a "
+"impressora for ligada.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Configuração de impressoras 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 "
 "accessible by remote machines and by which remote machines."
 msgstr ""
-"Aqui pode decidir se as impressoras ligadas a esta máquina deveriam ser "
-"disponibilizadas para máquinas remotas e por quais máquinas."
+"Aqui pode escolher se as impressoras ligadas a esta máquina devem ser "
+"acessadas por máquinas remotas e por quais máquinas remotas."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
-"Também pode decidir aqui se as impressoras nas máquinas remotas deveriam ser "
+"Pode também decidir aqui se as impressoras nas máquinas remotas devem ser "
 "disponibilizadas automaticamente nesta máquina."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
-msgstr "As impressoras desta máquina estão disponíveis para os outros computadores"
+msgstr ""
+"As impressoras nesta máquina estão disponíveis para outros computadores"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
-msgstr "Encontrar automaticamente as impressoras disponíveis nas máquinas remotas"
+msgstr ""
+"Encontrar automaticamente as impressoras disponíveis em máquinas remotas"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
-msgstr "Partilhar impressoras no anfitrião/rede: "
+msgstr "Partilhar impressoras em anfitrião/rede: "
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Configuração personalizada"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
-msgstr "Nenhuma máquina remota"
+msgstr "Sem máquinas remota"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Servidores CUPS adicionais: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Nenhum"
-
-#: 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 "
@@ -11203,29 +11571,29 @@ msgid ""
 "address(es) and optionally the port number(s) here to get the printer "
 "information from the server(s)."
 msgstr ""
-"Para aceder a impressoras de servidores remotos CUPS na rede local só "
-"precisa activar a opção \"Encontrar automaticamente as impressoras "
-"disponíveis nas máquinas remotas\"; os servidores CUPS informam "
-"automaticamente a sua máquina sobre as suas impressoras. Todas as "
-"impressoras conhecidas pela sua máquina são listadas na secção \"Impressoras "
-"remotas\" na janela principal do Printerdrake. Se o s servidores CUPS não "
-"estão na sua rede local, deve indicar os endereços IP e em opção os números "
-"de porta para obter as informações sobre as impressoras dos servidores."
+"Para ter acesso a impressoras em servidores remotos CUPS na sua rede local "
+"só precisa activar a opção \"Encontrar automaticamente as impressoras "
+"disponíveis em máquinas remotas\"; os servidores CUPS informam a suamáquina "
+"automaticamente acerca das suas impressoras. Todas as impressoras conhecidas "
+"pela sua máquina são listadas na secção \"Impressoras remotas\" na janela "
+"principal do Printerdrake. Se os seus servidores CUPS não estão na sua rede "
+"local, deve indicar os endereços IP e opionalmenteção os números das portas "
+"para obter a informação das impressoras dos servidores."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Modo de impressão de texto japonês"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 "Activar isto permite de imprimir ficheiros em texto puro escritos em "
@@ -11236,12 +11604,12 @@ msgstr ""
 "imprimir texto japonês numa impressora configurada numa máquina remota, "
 "deverá activar isto na máquina remota."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Correcção automática da Configuração do 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 "
@@ -11257,25 +11625,55 @@ msgid ""
 "If some of these measures lead to problems for you, turn this option off, "
 "but then you have to take care of these points."
 msgstr ""
-"Quando esta opção está activada, a cada arranque do CUPS verifica-se "
+"Quando esta opção é activada, em cada arranque do CUPS verifica-se "
 "automaticamente que\n"
 "\n"
 "- se LPD/LPRng está instalado, /etc/printcap não é sobreposto pelo CUPS\n"
 "\n"
-"- se /etc/cups/cupsd.conf falta, ele vai ser criado\n"
+"- se /etc/cups/cupsd.conf falta, ele irá ser criado\n"
 "\n"
-"- quando as informações das impressoras são publicadas, elas não contém "
+"- quando as informações das impressoras são publicadas, não contém "
 "\"localhost\" como nome do servidor.\n"
 "\n"
-"Se alguma coisa nisto lhe der problemas, desligue esta opção, mas vai então "
-"precisar de cuidar com estes pontos."
+"Se alguma destas medidas levar a problemas, desligue esta opção, mas então "
+"irá ter que tratar desses pontos."
+
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr "Servidor CUPS remoto e nenhum daemon CUPS local"
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "Ligado"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Desligado"
+
+#: 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 ""
+"Neste modo o daemon CUPS local será parado e todos os pedidos de impressão "
+"irão directamente para o servidor especificado em baixo. Note que não é "
+"possivel definir filas locais de impressão e se o servidor especificado "
+"estiver em baixo não pode ser imprimido nada desta máquina."
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Partilha das impressoras locais"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11284,29 +11682,29 @@ msgstr ""
 "Estas são as máquinas e redes nos quais a impressoras locais deveriam estar "
 "disponíveis :"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Adicionar um anfitrião/rede"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Editar o anfitrião/rede seleccionado"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Remover o anfitrião/rede seleccionado"
 
-#: 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 "Endereço IP do anfitrião/rede :"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11315,32 +11713,33 @@ msgstr ""
 "Escolha a rede ou anfitrião nos quais a impressoras locais deveriam estar "
 "disponíveis :"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Falta o IP do anfitrião/rede."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
-msgstr "O IP anfitrião/rede não está correcto.\n"
+msgstr "O IP anfitrião/rede introduzido não está correcto.\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 "Exemplos para IPs correctos :\n"
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
-msgstr "Este anfitrião/rede já está na lista, não pode ser adicionado outra vez.\n"
+msgstr ""
+"Este anfitrião/rede já está na lista, não pode ser adicionado outra vez.\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 "A aceder às impressoras num servidor CUPS remoto"
 
-#: 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 "
@@ -11351,102 +11750,119 @@ msgstr ""
 "precisa de fazer isto se os servidores não enviam as informações de "
 "impressão na rede local."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Adicionar servidor"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Editar o servidor seleccionado"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Remover o servidor seleccionado"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
-msgstr "Insira o endereço IP e a porta do anfitrião cujas impressoras deseja usar."
+msgstr ""
+"Insira o endereço IP e a porta do anfitrião cujas impressoras deseja usar."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Se nenhuma porta é indicada, 631 vai ser pegado por omissão."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Falta o IP do servidor!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "O IP inserido não está correcto.\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 "O número da porta deve ser um inteiro!"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "Este servidor já existe na lista, não pode ser adicionado outra vez.\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 "Porta"
 
-#: 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 "Ligado, Nome ou IP do servidor remoto:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "Nome do servidor CUPS ou endereço IP em falta."
+
+#: 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 "A ler os dados da impressora..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "A relançar o CUPS..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
-msgstr "Seleccionar Ligação da Impressora"
+msgstr "Seleccionar conexão da Impressora"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Como está a impressora ligada?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11457,7 +11873,7 @@ msgstr ""
 "As impressoras nos servidores CUPS remotos não precisam de ser configuradas "
 "aqui; elas serão detectadas automaticamente."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11465,30 +11881,33 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 "\n"
-"ATENÇÃO: Nenhuma conexão à rede local está activa, as impressoras remotas "
-"não podem ser detectadas nem testadas!"
+"AVISO: Nenhuma conexão à rede local está activa, as impressoras remotas não "
+"podem ser detectadas nem testadas!"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "Auto-detecção de impressora (Local, TCP/Socket, impressoras SMB, e dispositivo URI)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgstr ""
+"Auto-detecção de impressora (Local, TCP/Socket, impressoras SMB, e "
+"dispositivo URI)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
-msgstr "A testar o seu sistema..."
+msgstr "A verificar o seu sistema..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
-msgstr "e uma impressora desconhecida está "
+msgstr "e uma impressora desconhecida"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
-msgstr "e %d impressoras desconhecidas estão "
+msgstr "e %d impressoras desconhecidas"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11501,7 +11920,7 @@ msgstr ""
 "%s%s\n"
 "estão ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11514,7 +11933,7 @@ msgstr ""
 "%s%s\n"
 "estão ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11527,7 +11946,7 @@ msgstr ""
 "%s%s\n"
 "está ligada directamente ao seu sistema"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11536,7 +11955,7 @@ msgstr ""
 "\n"
 "Há uma impressora desconhecida ligada directamente ao seu sistema"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11545,17 +11964,18 @@ msgstr ""
 "\n"
 "Há %d impressoras desconhecidas ligadas directamente ao seu sistema"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
-msgid "There are no printers found which are directly connected to your machine"
+msgid ""
+"There are no printers found which are directly connected to your machine"
 msgstr "Não encontrei nenhuma impressora ligada directamente à sua máquina"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr "(Por favor verifique que a sua impressora está ligada e acesa).\n"
+msgstr "(Por favor verifique se a sua impressora está conectada e ligada).\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 "
@@ -11564,22 +11984,22 @@ msgstr ""
 "Quer autorizar a impressão nas impressoras indicadas acima ou nas "
 "impressoras da rede 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 "Quer autorizar a impressão nas impressoras da rede 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 "Quer autorizar a impressão nas impressoras indicadas acima ?\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 "Tem a certeza que deseja configurar a impressão nesta 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 "
@@ -11588,48 +12008,42 @@ msgstr ""
 "NOTA : Dependendo do modelo da impressora e o sistema de impressão, vão ser "
 "instalados até %d MB de programas adicionais."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "A procurar novas impressoras..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "A configurar a Impressora..."
+msgid "Found printer on %s..."
+msgstr "Impressora encontrada em \"%s\"..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Configurar 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 " em "
 
-#: 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 "Escolha do modelo da impressora"
+msgstr "Selecção do modelo da 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 "Qual é o modelo de impressora que tem?"
+msgstr "Que modelo de impressora tem?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11642,30 +12056,33 @@ msgstr ""
 "O Printerdrake não consegue determinar o modelo da sua impressora %s. Por "
 "favor escolha o modelo correcto da lista."
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
-"Se a sua impressora não está na lista, escolha uma compatível (veja no "
-"manual da impressora) ou uma parecida."
+"Se a sua impressora não está na lista, escolha uma compatível (veja o manual "
+"da impressora) ou uma 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 applications..."
-msgstr "Configurar aplicações..."
+msgid "Configuring printer on %s..."
+msgstr "Configurar Impressora em \"%s\"..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "A configurar 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 "Instalar uma nova impressora"
+msgstr "Adicionar uma nova impressora"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11681,14 +12098,15 @@ msgstr ""
 "\n"
 "Bemvindo ao Assistente de Configuração de Impressoras\n"
 "\n"
-"Esta assistente permite-lhe de instalar impressoras locais ou remotas a "
-"utilizar a partir desta máquina e também a partir doutras maquinas na rede.\n"
+"Este assistente permite-lhe instalar impressoras locais ou remotas para "
+"seremusadas a partir desta máquina e também a partir doutras maquinas na "
+"rede.\n"
 "\n"
-"Vai-lhe pedir todas as informações necessárias para configurar a impressora "
-"e dar-lhe acesso a todos os pilotos de impressoras disponíveis, todas as "
-"opções, e tipos os tipos de ligação."
+"Pergunta-lhe por todas as informações necessárias para configurar a "
+"impressora e dá-lhe acesso a todos os drives de impressoras disponíveis, "
+"opções dos drives, e tipos de conexão de impressoras."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11712,21 +12130,21 @@ msgstr ""
 "\n"
 "Bemvindo ao Assistente de Configuração da Impressão\n"
 "\n"
-"Este assistente vai ajudar-lo a instalar a(s) impressora(s) ligada(s) a este "
-"computador, directamente à rede ou a uma máquina Windows remota.\n"
+"Este assistente irá ajuda-lo a instalar a(s) impressora(s) ligada(s) a este "
+"computador, ligadas directamente à rede ou a uma máquina Windows remota.\n"
 "\n"
-"Se tem alguma impressora ligada a esta máquina, por favor ligue-a de maneira "
-"a poder detectar-la. As impressoras remotas e as máquinas windows também têm "
-"de estar ligadas à rede e acesas.\n"
+"Por favor ligue todas as impressoras conectadas a esta máquina para que "
+"possam ser auto detectadas. Também a sua rede de impressoras e as suas "
+"máquinas Windows têm de estar conectadas e ligadas.\n"
 "\n"
-"Note que a auto-detecção de impressoras remotas na rede é mais lenta do que "
-"a auto-detecção das impressoras locais. Portanto deveria desactivar a auto-"
-"detecção na rede e/ou de impressoras Windows se não precisa delas.\n"
+"Note que auto-detectar impressoras em redes demora mais que uma auto "
+"detecção de impressoras apenas conectadas a esta máquina. Então desligue a "
+"auto-detecçãp da rede e/ou de impressoras Windows quando não precisa delas.\n"
 "\n"
-" Carregue em \"Seguinte\" quando estiver pronto, ou em \"Anular\" se não "
-"quiser configurar a(s) sua(s) impressora(s) agora."
+" Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
+"quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11744,16 +12162,16 @@ msgstr ""
 "\n"
 "Bemvindo ao Assistente de Configuração da Impressão\n"
 "\n"
-"Esta assistente vai ajudar-lo a instalar a(s) impressora(s) ligada(s) a este "
-"computador.\n"
+"Este assistente irá ajudá-lo a instalar a(s) impressora(s) conectada(s) a "
+"este computador.\n"
 "\n"
-"Se tem alguma impressora ligada a esta máquina, por favor ligue-a de maneira "
-"a poder detectar-la.\n"
+"Por favor conecte e ligue todas as impressoras que tenham haver com esta "
+"máquina para que possam ser auto detectadas.\n"
 "\n"
-" Carregue em \"Seguinte\" quando está pronto, ou em \"Anular\" se não quiser "
-"configurar a(s) sua(s) impressora(s) agora."
+" Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
+"quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -11779,18 +12197,16 @@ msgstr ""
 "Esta assistente vai ajudar-lo a instalar a(s) impressora(s) ligada(s) a este "
 "computador ou directamente à rede.\n"
 "\n"
-"Se tem alguma impressora ligada a esta máquina, por favor ligue-a de maneira "
-"a poder detectar-la. As impressoras remotas também têm de estar ligadas e "
-"acesas.\n"
-"\n"
-"Note que a auto-detecção de impressoras remotas na rede é mais lenta do que "
-"a auto-detecção das impressoras locais. Portanto deveria desactivar a auto-"
-"detecção na rede se não precisar dela.\n"
-"\n"
-" Carregue em \"Seguinte\" quando estiver pronto, ou em \"Anular\" se não "
-"quiser configurar a(s) sua(s) impressora(s) agora."
+"Se tem impressora(s) ligada(s) a esta máquina, por favor conecte-a(s) a este "
+"computadore ligue-a(s) para que possam ser auto detectadas. Também a sua "
+"rede de impressoras tem de ser conectada e ligada.\n"
+"Note que auto detectar impressoras na rede leva mais tempo que a auto "
+"detecção de apenas impressoras conectadas nesta máquina. Então desligue a "
+"auto detecção da rede de impressoras se não precisa.\n"
+" Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
+"quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -11808,31 +12224,32 @@ msgstr ""
 "\n"
 "Bemvindo ao Assistente de Configuração da Impressão\n"
 "\n"
-"Esta assistente vai ajudar-lo a instalar a(s) impressora(s) ligada(s) a este "
+"Este assistente irá ajudá-lo a instalar a(s) impressora(s) ligada(s) a este "
 "computador.\n"
 "\n"
-"Se tem alguma impressora ligada a esta máquina, por favor ligue-a de maneira "
-"a poder ser detectada.\n"
+"Se tem alguma impressora conectada a esta máquina, por favor ligue-a a este "
+"computador de maneira a que possa ser auto detectada.\n"
 "\n"
-" Carregue em \"Seguinte\" quando está pronto, ou em \"Anular\" se não quiser "
-"configurar a(s) sua(s) impressora(s) agora."
+" Clique em \"Seguinte\" quando estiver pronto, ou em \"Cancelar\" se não "
+"quiser configurar agora a(s) sua(s) impressora(s)."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Auto-detectar as impressoras ligadas a esta máquina"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Auto-detectar as impressoras ligadas directamente à rede local"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
-msgstr "Auto-detectar as impressoras ligadas a uma máquina sob Microsoft Windows"
+msgstr ""
+"Auto-detectar as impressoras ligadas a uma máquina sob Microsoft Windows"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -11848,77 +12265,78 @@ msgstr ""
 "\n"
 "Parabéns, a sua impressora encontra-se instalada e configurada!\n"
 "\n"
-"Pode imprimir usando o commando \"Imprimir\" das suas aplicações (usualmente "
+"Pode imprimir usando o comando \"Imprimir\" das suas aplicações (usualmente "
 "no menu \"Ficheiro\").\n"
 "\n"
-"Se deseja adicionar, remover, ou mudar o nome de uma impressora, ou se desejar "
-"mudar a configuração por omissão (fonte de papel, qualidade de impressão, ...),escolha \"Impressora\" na secção \"Hardware\" do Centro de "
+"Se deseja adicionar, remover, ou mudar o nome de uma impressora, ou se "
+"desejar mudar a configuração por omissão (fonte de papel, qualidade de "
+"impressão, ...),escolha \"Impressora\" na secção \"Hardware\" do Centro de "
 "Controlo %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 "Não foi possível instalar os pacotes %s !"
+msgstr "Não conseguiu instalar os pacotes %s !"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
-msgstr "Saltando a auto-detecção do servidor Windows/SMB"
+msgstr "Saltar a auto-detecção do servidor Windows/SMB"
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Auto-detecção de impressoras"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "A detectar dispositivos..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
-msgstr ", impressora rede \"%s\", porta %s"
+msgstr ", impressora de rede \"%s\", porta %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", impressora \"%s\" num servidor SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Detectou %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 no cabo paralelo #%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Impressora na rede \"%s\", porta %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Impressora \"%s\" num 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/"
@@ -11928,35 +12346,36 @@ msgid ""
 msgstr ""
 "Nenhuma impressora local encontrada ! Para instalar manualmente uma "
 "impressora escreva um nome de dispositivo/ficheiro na linha de entrada (Cabo "
-"Paralelo : /dev/lp0, /dev/lp1, ..., equivalem a LPT1:, LPT2:, ..., Primeira "
-"impressora USB : /dev/usb/lp0, segunda impressora USB : /dev/usb/lp1, ...)."
+"Paralelo : /dev/lp0, /dev/lp1, ..., equivalente a LPT1:, LPT2:, ..., "
+"Primeira impressora USB : /dev/usb/lp0, segunda impressora USB : /dev/usb/"
+"lp1, ...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
-msgstr "Você deve entrar um periférico ou um nome de ficheiro!"
+msgstr "Deve digitar um nome de periférico ou nome de ficheiro!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Nenhuma impressora encontrada!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Impressoras locais"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Impressoras disponíveis"
 
-#: 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 "A impressora seguinte foi detectada automaticamente. "
 
-#: 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 "
@@ -11965,19 +12384,20 @@ msgstr ""
 "Se não é a que deseja configurar, escreva um nome de dispositivo/ficheiro na "
 "linha de entrada"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
-msgid "Alternatively, you can specify a device name/file name in the input line"
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
-"Alternativamente, pode escrever um nome de dispositivo/ficheiro na linha de "
-"entrada"
+"Alternativamente, pode especificar um nome de dispositivo/ficheiro na linha "
+"de entrada"
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
-msgstr "Aqui tem a lista de todas as impressoras detectadas automaticamente. "
+msgstr "Aqui está a lista de todas as impressoras detectadas automaticamente. "
 
-#: 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 "
@@ -11986,7 +12406,7 @@ msgstr ""
 "Por favor escolha a impressora que deseja configurar ou escreva um nome de "
 "dispositivo/ficheiro na linha de entrada"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -11996,7 +12416,7 @@ msgstr ""
 "deveriam ser enviados.ou escreva um nome de dispositivo/ficheiro na linha de "
 "entrada"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12007,12 +12427,12 @@ msgstr ""
 "impressora não foi correctamente detectada ou se prefere personalizar a "
 "configuração, carregue em \"Configuração Manual\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
-msgstr "Não há por agora nenhuma alternativa possível"
+msgstr "Actualmente, não há nenhuma alternativa disponivel possível"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12025,14 +12445,14 @@ msgstr ""
 "correctamente detectada ou se prefere personalizar a configuração, carregue "
 "em \"Configuração Manual\"."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
-"Por favor escolha a impressora para a qual os trabalhos de impressão "
-"deveriam ser enviados."
+"Por favor escolha a impressora para a qual os trabalhos de impressão devem "
+"ir."
 
-#: 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 "
@@ -12041,41 +12461,41 @@ msgstr ""
 "Por favor escolha a ficha em que a sua impressora está ligada ou escreva um "
 "nome de dispositivo/ficheiro na linha de entrada"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Por favor escolha a ficha em que a sua impressora está ligada."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
-" (Cabo Paralelo : /dev/lp0, /dev/lp1, ..., equivalem a LPT1:, LPT2:, ..., "
+" (Cabo Paralelo : /dev/lp0, /dev/lp1, ..., equivalente a LPT1:, LPT2:, ..., "
 "Primeira impressora USB : /dev/usb/lp0, segunda impressora USB : /dev/usb/"
 "lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
-msgstr "Você deve escolher/entrar um dispositivo/impressora!"
+msgstr "Deve escolher/entrar um dispositivo/impressora!"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, c-format
 msgid "Aborting"
-msgstr "Abortando"
+msgstr "Abortar"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Opções da 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 "
@@ -12084,63 +12504,63 @@ msgstr ""
 "Para usar uma fila de impressão lpd remota, precisa indicar o nome do "
 "servidor de impressão e o nome da impressora naquele servidor."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Nome do anfitrião remoto"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Nome da impressora remota"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Falta o nome do anfitrião remoto!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Falta o nome da 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 "Informações"
+msgstr "Informação"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Modelo detectado : %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "A procurar na rede..."
 
-#: 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\" no 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\" no servidor \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opções de Impressão 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 "
@@ -12154,7 +12574,7 @@ msgstr ""
 "impressora que deseja aceder e qualquer informação aplicável sobre nome de "
 "utilizador, senha e grupo de trabalho."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12164,47 +12584,47 @@ msgstr ""
 "e então adicione um nome de utilizador, uma senha e um grupo de trabalho se "
 "necessário."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Anfitrião servidor SMB"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "IP do servidor SMB"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Nome de partilha"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
-msgstr "Auto-detectada"
+msgstr "Auto-detectado"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
-msgstr "Ou o nome de servidor ou o seu endereço IP têm de ser indicados !"
+msgstr "Deve ser dado ou o nome de servidor ou o seu endereço IP!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
-msgstr "Falta o nome do partilho Samba!"
+msgstr "Falta o nome da partilha Samba!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ALERTA DE SEGURANÇA!"
 
-#: 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 "
@@ -12227,12 +12647,11 @@ msgid ""
 "type in Printerdrake.\n"
 "\n"
 msgstr ""
-"Você está prestes a configurar a impressão para uma conta Windows com senha. "
-"Por causa de um erro na arquitectura da programa cliente Samba a senha é "
-"escrita em texto simples na linha de commando do cliente Samba utilizado "
-"para enviar a impressão ao servidor Windows. É portanto possível a cada "
-"utilizador desta máquina de ver a senha com um commando do tipo \"ps auxwww"
-"\".\n"
+"Está prestes a configurar a impressão para uma conta Windows com senha. Por "
+"causa de um erro na arquitectura da programa cliente Samba a senha é escrita "
+"em texto simples na linha de comando do cliente Samba utilizado para enviar "
+"a impressão ao servidor Windows. É portanto possível a cada utilizador desta "
+"máquina de ver a senha com um comando do tipo \"ps auxwww\".\n"
 "\n"
 "Aconselhamos uma das seguintes alternativas (em todos os casos precisa de "
 "ter a certeza que só as maquinas locais podem ligar-se ao servidor Windows, "
@@ -12247,7 +12666,7 @@ msgstr ""
 "tipo \"%s\" em Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12259,7 +12678,7 @@ msgstr ""
 "protocolo IPP e configure então a impressão a partir desta máquina com a "
 "ligação de tipo \"%s\" em Printerdrake.\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) "
@@ -12267,17 +12686,17 @@ msgid ""
 "\n"
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
-"Ligue a impressora a um servidor Linux e deixe que as suas maquinas Windows "
-"se liguem a ele como clientes.\n"
+"Conecte a sua impressora a um servidor Linux e deixe as suas maquinas "
+"Windows conectar-se como clientes.\n"
 "\n"
 "Deseja mesmo continuar a configurar a impressora desta maneira ?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Opções de Impressão 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 "
@@ -12290,52 +12709,52 @@ msgstr ""
 "também o nome da fila de impressão para a impressora que deseja aceder e "
 "qualquer nome de utilizador e senha aplicável."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Servidor de Impressão"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Nome da Fila de Impressão"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Falta o nome do servidor NCP!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Falta o nome da fila 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 ", anfitrião \"%s\", porta %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 "Anfitrião \"%s\", porta %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Opções do TCP/Socket da Impressora"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 "Escolha uma das impressoras auto-detectadas na lista ou escreva o nome de "
-"anfitrião ou o IP e em opção a porta (9100 por omissão) nas linhas de "
-"entrada."
+"anfitrião ou o IP e o número da porta opcional (9100 por omissão) nas linhas "
+"de entrada."
 
-#: 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 "
@@ -12344,31 +12763,31 @@ msgid ""
 "vary. See the manual of your hardware."
 msgstr ""
 "Para imprimir numa impressora TCP ou 'socket', precisa indicar o nome do "
-"servidor ou o IP da impressora e a número da porta (opcional). Nos "
-"servidores HP JetDirect a porta é normalemente 9100, noutros servidores pode "
-"ser diferente. Leia o manual do seu material."
+"servidor ou o IP da impressora e o número da porta (opcional). Nos "
+"servidores HP JetDirect a porta é normalemente 9100, nos outros servidores "
+"pode ser diferente. Leia o manual do seu hardware."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
-msgstr "Falta o nome ou o IP da impressora!"
+msgstr "Falta o nome do anfitrião ou o IP da impressora!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Nome do Servidor da impressora ou IP"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "A refrescar a lista do Dispositivo URI..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Dispositivo de Impressão URI"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12379,113 +12798,115 @@ msgstr ""
 "conforme às especificações CUPS ou Foomatic. Note que todos os tipos de URI "
 "são suportados por todos as filas de impressão."
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
-msgstr "Uma URI valida deve ser escrevida!"
+msgstr "Uma URI válida deve ser entrada!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
-msgstr "Envia o trabalho para o commando"
+msgstr "Envia o trabalho para o comando"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
-"Aqui pode indicar uma linha de comando para dirigir o trabalho de impressão "
-"de outra maneira do que directamente para a impressora."
+"Aqui pode especificar qualquer linha de comando arbitrária na qual o "
+"trabalho deve ser canalizado em vez de enviar directamente para uma "
+"impressora."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Linha de comando"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
-msgstr "Uma linha de comando deve ser escrevida!"
+msgstr "Uma linha de comando deve ser digitada!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
 "LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
 "an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
-"Tem uma impressora multi-funções HP ou Sony (OfficeJet, PSC, LaserJet "
+"A sua impressora é multi-funções HP ou Sony (OfficeJet, PSC, LaserJet "
 "1100/1200/1220/3200/3300 com digitalizador, DeskJet 450, Sony IJP-V100), uma "
 "HP PhotoSmart ou uma HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "A instalar o pacote HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Impressão apenas será possível em %s."
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
-msgstr "Verificando o dispositivo e configurando HPOJ..."
+msgstr "Verificar o dispositivo e configurar HPOJ..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "A instalar os pacotes SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
-msgstr "Digitalização em %s não será possível."
+msgstr "Não será possivel digitalizar em %s."
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "A instalar os pacotes mtools..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "O acesso ao cartão de memória fotográfico em %s não será possível."
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "A digitalizar no seu dispositivo multi-funções HP"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Acesso às cartas memorias de fotos no seu dispositivo multi-funções HP"
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
-msgstr "A disponibilizar o cabo paralelo para o CUPS..."
+msgstr "A tornar disponivel a porta de impressão para CUPS..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
-msgstr "Lendo banco de dados das impressoras..."
+msgstr "A ler base de dados das impressoras..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
-msgstr "escreva o Nome da Impressora e os Comentarios"
+msgstr "Escreva o Nome da Impressora e os Comentarios"
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
-msgstr "O nome da impressora deve apenas conter letras, números e traços baixos"
+msgstr ""
+"O nome da impressora deve apenas conter letras, números e traços baixos"
 
-#: 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"
@@ -12494,45 +12915,45 @@ msgstr ""
 "A impressora \"%s\" já existe,\n"
 "deseja sobrepor a sua configuração?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
-"Cada impressora precisa de um nome (por exemplo \"impressora\"). A Descrição "
-"e a Localização não são obrigatórias. São só comentarios para os "
+"Toda a impressora precisa de um nome (por exemplo \"impressora\"). Os campos "
+"de Descrição e Localização não são obrigatórios. São só comentarios para os "
 "utilizadores."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Nome da 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 "Descrição"
 
-#: 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 "Localização"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "A preparar a base de dados das impressoras..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "O seu modelo de impressora"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12546,29 +12967,29 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Printerdrake comparou o nome do modelo auto-detectado com os modelos na sua "
-"base de dados para encontrar a melhor escolha. O resultado pode ser errado, "
-"sobretudo se a sua impressora não existe na base de dados. Portanto "
-"verifique se a escolha foi correcta e carregue em\"O modelo está correcto\" "
-"se sim, e em \"Escolher o modelo manualmente\" se não, de maneira a poder "
-"escolher o modelo desejado manualmente na janela seguinte.\n"
+"O Printerdrake comparou o nome do modelo auto-detectado com os modelos na "
+"sua base de dados para encontrar a melhor escolha. O resultado pode ser "
+"errado, sobretudo se a sua impressora não existe na base de dados. Portanto "
+"verifique se a escolha foi correcta e clique em\"O modelo está correcto\" se "
+"sim, se não, clique em \"Escolher o modelo manualmente\" para que possa "
+"escolher o modelo desejado manualmente no próximo ecrâ.\n"
 "\n"
-"Para a sua impressora Printerdrake encontrou :\n"
+"Para a sua impressora o Printerdrake encontrou:\n"
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "O modelo está correcto"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
-msgstr "Escolher o modelo manualmente"
+msgstr "Escolha o modelo manualmente"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12579,16 +13000,16 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Por favor verifique que Printerdrake conseguiu detectar bem a sua "
-"impressora. Procure o bom modelo na lista se está escolhido um modelo errado "
-"ou a \"Impressão directa\"."
+"Por favor verifique se o Printerdrake fez a auto detecção do modelo da sua "
+"impressora correctamente. Procure o modelo correcto na lista quando um "
+"modelo errado ou a \"Impressão directa\" é indicado."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Instalar um ficheiro PPD fornecido pelo fabricante"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12597,7 +13018,7 @@ msgstr ""
 "Todas as impressoras PostScript são entregues com um ficheiro PPD que "
 "descreve as características e as opções da impressora."
 
-#: 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 "
@@ -12606,12 +13027,12 @@ msgstr ""
 "Este ficheiro usualmente encontra-se no CD que contém os drivers para "
 "Windows e Mac que acompanha a impressora."
 
-#: 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ém pode encontrar os ficheiros PPD nos web sites dos fabricantes."
+msgstr "Pode encontrar os ficheiros PPD nos web sites dos fabricantes."
 
-#: 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 "
@@ -12620,78 +13041,71 @@ msgstr ""
 "Se tem o Windows instalado na sua máquina, pode igualmente encontrar o "
 "ficheiro PPD na sua partição 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 "
 "makes all options of the printer available which are provided by the "
 "printer's hardware"
 msgstr ""
-"Ao instalar o ficheiro PPD da impressora utilizando quando configurar a "
-"impressora torna todas as opções disponibilizadas pelo harware da impressora "
-"disponíveis"
+"Ao instalar o ficheiro PPD da impressora e usando-o quando configurar a "
+"impressora torna todas as opções da impressora disponiveis que são "
+"providenciads pelo hardware da impressora"
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
-"Aqui pode escolher qual o ficheiro PPD a ser instalado na sua máquina, que "
-"posteriormente será utilizado para configurar a impressora."
+"Aqui pode escolher o ficheiro PPD a ser instalado na sua máquina, será então "
+"usado para configurar a sua impressora."
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Instalar ficheiro PPD a partir 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 "Disquete"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "Outro local"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Seleccione ficheiro PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "O ficheiro PPD %s não existe ou está ilegível!"
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "O ficheiro PPD %s não está de acordo com as especificações PPD!"
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "A instalar o ficheiro PPD..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
-msgstr "OK| configuração duma winimpressora"
+msgstr "Configuração da OKI winprinter"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12702,18 +13116,18 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 "Está a configurar uma impressora OKI laser winimpressora. Estas impressoras\n"
-"utilizam um protocolo de impressão muito especial e só podem funcionar "
-"ligadas à primeira ficha paralela. Se a sua impressora estiver ligada noutra "
-"ficha ou a um servidor de impressão, por favor ligue-a à primeira ficha "
-"antes de imprimir uma pagina de teste. Senão a impressora não vai funcionar. "
-"O parametro de tipo de ligação vai ser ignorado pelo piloto."
+"usam um protocolo de impressão muito especial e só podem funcionar ligadas à "
+"primeira porta paralela. Quando a sua impressora está ligada a outra porta "
+"ou a um servidor de impressão, por favor conecte a impressora à primeira "
+"porta paralela antes do imprimir uma página teste.Senão a impressora não irá "
+"funcionar. A sua definição do tipo de conexão será ignorado pelo driver."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Configuração das Lexmark a jacto de tinta"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12721,12 +13135,12 @@ msgid ""
 "printer to a local port or configure it on the machine where it is connected "
 "to."
 msgstr ""
-"Os pilotos de impressoras a jacto de tinta fornecidos por Lexmark só "
-"suportam impressoras locais, e não impressoras remotas ou ligadas a um "
-"servidor de impressão. Por favor ligue a sua impressora localmente ou "
-"configure-a na máquina à qual está ligada."
+"Os drivers de impressoras a jacto de tinta fornecidos pela Lexmark só "
+"suportam impressoras locais, não impressoras em máquinas remotas ou servidor "
+"de impressão. Por favor conecte a sua impressora localmente ou configure-a "
+"na máquina à qual se encontra ligada."
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12738,36 +13152,63 @@ msgid ""
 "agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
 "adjust the head alignment settings with this program."
 msgstr ""
-"Para poder imprimir com a sua Lexmark a jacto de tinta e com esta "
-"configuração, precisa dos pilotos fornecidos por Lexmark (http://www.lexmark."
-"com/). Visite o servidor US e carregue no botão \"Drivers\". Escolha então o "
-"seu modelo e depois \"Linux\" como sistema operativo. Os pilotos são "
-"fornecidos como pacotes RPM ou script com uma instalação gráfica "
-"interactiva. Não precisa fazer esta configuração com os interfaces gráficos. "
-"Anule logo depois de aceitar a licença. Imprima então as paginas de controlo "
-"das cabeças com \"lexmarkmaintain\" e configure a posição das cabeças com o "
-"mesmo programa."
+"Para poder imprimir com a sua Lexmark a jacto de tinta e esta configuração, "
+"precisa dos drivers fornecidos pela Lexmark (http://www.lexmark.com/). "
+"Clique no link \"Drivers\". Depois escolha o seu modelo e a seguir \"Linux\" "
+"como sistema operativo. Os drivers vêm como pacotes RPM ou scripts Shell com "
+"instalação gráfica interactiva. Não precisa fazer esta configuração pelos "
+"interfaces gráficos. Cancele directamente a seguir ao acordo de licensa. A "
+"seguir imprima paginas de controlo alinhadas \"lexmarkmaintain\" e configure "
+"as definições de alinhamento da cabeça de página com este programa."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Configuração da Lexmark X125"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
 "USB, no printers on remote machines or print server boxes. Please connect "
 "your printer to a local USB port or configure it on the machine where it is "
 "connected to."
-msgstr "O driver desta impressora apenas suporta impressoras locais conectadas via USB, não suporta impressoras em máquina remotas nem servidores de impressão. Por favor ligue a sua impressora a uma porta USB local ou configure-a na máquina à qual está ligada."
+msgstr ""
+"O driver desta impressora apenas suporta impressoras locais conectadas via "
+"USB, não suporta impressoras em máquina remotas nem servidores de impressão. "
+"Por favor ligue a sua impressora a uma porta USB local ou configure-a na "
+"máquina à qual está ligada."
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Configuração do Samsung ML/QL-85G"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"O driver para esta impressora apenas suporta impressoras conectadas "
+"localmente na primeira porta paralela, nenhumas impressores em máquinas "
+"remotas ou caixas de servidores de impressão ou em qualquer outra porta "
+"paralela. Por favor conecte a sua impressora na primeira porta paralela ou "
+"configure-a na máquina onde está ligada."
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Configuração da Canon LBP-460/660"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Descarregamento do firmware para HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12777,48 +13218,49 @@ msgid ""
 "duplex unit, extra trays) are set correctly. Note that with a very high "
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
-"Configuração por omissão da Impressora\n"
+"Configuração padrão da Impressora\n"
 "\n"
-"Deveria assegurar-se que o tamanho do papel e o tipo de tinta/impressão (se "
-"disponíveis) e também a configuração material das impressoras laser "
-"(memoria, opções) estão configurados correctamente. Pense que com uma muito "
-"alta qualidade/resolução a impressão pode tornar-se bastante lenta."
+"Deve assegurar-se que o tamanho do papel e o tipo de tinta/impressão (se "
+"disponíveis) e também a configuração do hardware das impressoras laser "
+"(memória, opções) estão configurados correctamente. Note que com uma "
+"impressão muito alta de qualidade/resolução, imprimir pode tornar-se "
+"bastante lento."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
-msgstr "Parametros por omissão da impressora"
+msgstr "Parâmetros padrão da impressora"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "A opção %s deve ser um numero inteiro!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "A opção %s deve ser um número!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
-msgstr "A opção %s é fora de alcance!"
+msgstr "A opção %s está fora de alcance!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr ""
 "Quer definir esta impressora (\"%s\")\n"
-"como impressora por omissão?"
+"como impressora padrão?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Páginas de teste"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12828,60 +13270,60 @@ msgid ""
 msgstr ""
 "Por favor escolha as paginas de teste que deseja imprimir.\n"
 "Nota : a pagina de fotos pode tomar bastante tempo a imprimir e as "
-"impressoras laser com pouca memoria podem mesmo não conseguir imprimir-la. "
-"Em geral basta imprimir a pagina de teste padrão."
+"impressoras laser com pouca memória podem até nem conseguir imprimir. Na "
+"maioria dos casos é suficiente imprimir a página de teste padrão."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
-msgstr "Nenhuma página de teste"
+msgstr "Sem páginas teste"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Imprimir"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Página de teste padrão"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Página de teste alternativa (Letter)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Página de teste alternativa (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Página de teste com fotos"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Não imprime nenhuma página de teste"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
-msgstr "A imprimir página(s) de teste..."
+msgstr "A imprimir página(s) teste..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
-msgstr "Não foi possível instalar o pacote %s !"
+msgstr "Não conseguiu instalar o pacote %s !"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Saltar a página de teste com fotos"
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12890,32 +13332,32 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"A(s) página(s) foi(foram) enviada(s) para a impressora.\n"
+"A(s) página(s) foram enviada(s) para a impressora.\n"
 "Pode demorar algum tempo antes da impressão começar.\n"
 "Estado da impressão:\n"
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 msgstr ""
-"A(s) página(s) foi(foram) enviada(s) para a impressora.\n"
+"A(s) página(s) foram enviada(s) para a impressora.\n"
 "Pode demorar algum tempo antes da impressão começar.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Funcionou correctamente?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Impressora directa"
 
-#: 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 "
@@ -12923,24 +13365,24 @@ msgid ""
 "\"kprinter <file>\". The graphical tools allow you to choose the printer and "
 "to modify the option settings easily.\n"
 msgstr ""
-"Para imprimir um ficheiro a partir da linha de commando (janela de sessão) "
-"pode usar ou o commando \"%s <ficheiro> ou uma ferramenta de impressão "
-"gráfica : \"xpp <ficheiro>\". A ferramenta gráfica permite-lhe de escolher "
-"mais facilmente a impressora a utilizar e as opções de configuração.\n"
+"Para imprimir um ficheiro a partir da linha de comando (janela de sessão) "
+"pode usar o comando \"%s <ficheiro> ou uma ferramenta de impressão gráfica: "
+"\"xpp <ficheiro>\". A ferramenta gráfica permite-lhe escolher mais "
+"facilmente a impressora a usar e as opções de configuração.\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 "
 "printing dialogs of many applications, but here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"Estes commandos também podem ser utilizados na zona \"Commando de impressão"
-"\" dos dialogos de impressão de muitas aplicações. Mas neste caso não "
-"indique o nome do ficheiro pois ele é indicado pela aplicação.\n"
+"Estes comandos também pode usar no campo \"Comando de impressão\" "
+"dosdiálogos de impressão de muitas aplicações, mas não ponha aqui o nome do "
+"ficheiro porque o ficheiro a imprimir é providenciado pela aplicação.\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"
@@ -12949,21 +13391,21 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 "\n"
-"O commando \"%s\" também permite de modificar a configuração de uma tarefa "
-"de impressão particular. Basta adicionar os parametros desejados na linha de "
-"commando, ex. \"%s <ficheiro>\". "
+"O comando \"%s\" também permite modificar a opção de para uma tarefa de "
+"impressão particular. Basta adicionar os parâmetros desejados na linha de "
+"comando, ex. \"%s <ficheiro>\". "
 
-#: 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 "
 "list shown below or click on the \"Print option list\" button.%s%s%s\n"
 "\n"
 msgstr ""
-"Para saber as opções disponíveis para a impressora actual pode ou ler a "
-"lista abaixo ou carregar no botão \"Imprimir a lista das opções\".%s%s%s\n"
+"Para saber acerca das opções disponíveis para a impressora actual, leia a "
+"lista abaixo ou clique no botão \"Imprimir a lista das opções\".%s%s%s\n"
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -12972,46 +13414,46 @@ msgstr ""
 "Aqui tem uma lista das opções disponíveis para a 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 "
 "<file>\".\n"
 msgstr ""
-"Para imprimir um ficheiro a partir da linha de commando (janela de sessão) "
-"use o commando \"%s <ficheiro>\".\n"
+"Para imprimir um ficheiro a partir da linha de comando (janela de sessão) "
+"use o comando \"%s <ficheiro>\".\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 "
 "printing dialogs of many applications. But here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"Este commando também pode ser utilizado na zona \"Commando de impressão\" "
-"dos dialogos de impressão de muitas aplicações. Mas neste caso não indique o "
-"nome do ficheiro pois ele é indicado pela aplicação.\n"
+"Este comando também pode usar no campo \"Comando de impressão\" dos dialogos "
+"de impressão de muitas aplicações. Mas aqui não forneça o nome ficheiro "
+"porque o ficheiro a imprimir é provienciado pela aplicação.\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 "
 "\"Print option list\" button."
 msgstr ""
-"Para obter uma lista das opções disponíveis para a impressora actual "
-"carregue no botão \"Imprimir a lista das opções\"."
+"Para obter uma lista das opções disponíveis para a impressora actual clique "
+"no botão \"Imprimir a lista das opções\"."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
-"Para imprimir um ficheiro a partir da linha de commando (janela de terminal) "
-"utilize o commando \"%s <ficheiro>\" ou \"%s <ficheiro>\".\n"
+"Para imprimir um ficheiro a partir da linha de comando (janela de terminal) "
+"use o comando \"%s <ficheiro>\" ou \"%s <ficheiro>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13021,13 +13463,14 @@ msgid ""
 "jobs immediately when you click it. This is for example useful for paper "
 "jams.\n"
 msgstr ""
-"Também pode utilizar o interface gráfico \"xpdq\" para definir as opções e "
-"gerir as tarefas de impressão.\n"
-"Se utiliza KDE tem um \"botão pânico\", um ícone no ecrã, chamado \"PARAR a "
-"Impressora!\", que pára todas as tarefas de impressão imediatamente quando "
-"carrega nele. Isto é útil por exemplo no caso de bloqueio do papel.\n"
+"Também pode usar o interface gráfico \"xpdq\" para definir as opções e gerir "
+"as tarefas de impressão.\n"
+"Se estiver a usar o KDE como ambiente de trabalho, tem um \"botão de pânico"
+"\", um icone no desktop, rotulado por \"PARAR Impressora\", que pára todas "
+"as tarefas de impressão imediatamente quando clica nele. Isto é por exemplo "
+"útil no caso de faltar o papel.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13036,46 +13479,36 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 "\n"
-"Os commandos \"%s\" e \"%s\" também permitem de mudar a configuração de uma "
-"tarefa de impressão particular. Basta adicionar os parametros desejados na "
+"Os comandos \"%s\" e \"%s\" também permitem mudar a configuração de uma "
+"tarefa de impressão particular. Basta adicionar os parâmetros desejados na "
 "linha de comando, ex. \"%s <ficheiro>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Cartas de impressão/digitalização/fotos em \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Impressão/digitalização em \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Carta de impressão/fotos acessível em \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "A imprimir na 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 "Fechar"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Lista das opções da impressora"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13086,19 +13519,23 @@ 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 ""
 "O seu dispositivo multi-funções foi configurado automaticamente para poder "
 "digitalizar. Pode agora digitalizar com \"scanimage\" \"scanimage -d hp:%s\" "
-"para indicar o digitalizador se tem vários) a partir da linha de commando ou "
-"com os interfaces gráficos \"xscanimage\" ou \"xsane\". Se utiliza o GIMP, "
-"também pode digitalizar escolhendo a boa entrada no menu \"Ficheiro\"/"
-"\"Capturar\". Peça também \"man scanimage\" na linha de commando para obter "
-"mais informações.\n"
+"para indicar ao digitalizador se tem mais de um) da linha de comando ou com "
+"os interfaces gráficos \"xscanimage\" ou \"xsane\". Se está a usar o GIMP, "
+"também pode digitalizar ao escolher a apropriada entrada no menu \"Ficheiro"
+"\"/\"Capturar\". Peça também \"man scanimage\" na linha de comando para "
+"obter mais informações.\n"
 "\n"
-"Não utilize \"scannerdrake\" para este dispositivo!"
+"Não precisa correr o \"scannerdrake\" para configurar a digitalização neste "
+"dispositivo, só precisa usar o \"scannerdrake\" se quiser partilhar o "
+"scanner na rede."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13112,27 +13549,22 @@ msgid ""
 "of the file lists."
 msgstr ""
 "A sua impressora foi configurada automaticamente para lhe dar acesso aos "
-"leitores de cartas de fotos a partir do seu PC. Pode agora aceder às suas "
-"cartas de fotos com o programa gráfico \"MtoolsFM\" (Menu: \"Aplicações\" -> "
+"drivers de cartas de fotos no seu PC. Pode agora aceder às suas cartas de "
+"fotos com o programa gráfico \"MtoolsFM\" (Menu: \"Aplicações\" -> "
 "\"Ferramentas de ficheiros\" -> \"Gestor de Ficheiros MTools\") ou com os "
-"utilitários em linha de commando \"mtools\" (escreva \"man mtools\" na linha "
-"de commando para mais informações). Vai encontrar o sistema de ficheiros da "
+"utilitários na linha de comando \"mtools\" (escreva \"man mtools\" na linha "
+"de comando para mais informações). Vai encontrar o sistema de ficheiros da "
 "carta na letra \"p:\", ou nas letras seguintes se tem mais de uma impressora "
-"HP com leitores de cartas de fotos. Em \"MToolsFM\" pode mudar de letra de "
+"HP com drivers de cartas de fotos. Em \"MToolsFM\" pode mudar de letra de "
 "dispositivo com a zona no canto direito superior da lista de ficheiros."
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Lendo os dados da 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 "Transfere a configuração da impressora"
+msgstr "Transferir a configuração da impressora"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13141,22 +13573,22 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"Você de copiar a configuração de impressora que fez para a fila %s para %s, "
-"a sua fila actual. Todos os dados de configuração (nome da impressora, "
-"descrição, localização, tipo de ligação, e configuração por omissão) são "
-"copiados, mas a tarefas em fila não vão ser transferidas.\n"
-"Todas as filas não podem ser transferidas pelas razoes seguintes :\n"
+"Pode copiar a configuração de impressora que fez para a fila %s para %s, a "
+"sua fila actual. Todos os dados de configuração (nome da impressora, "
+"descrição, localização, tipo de ligação, e configuração padrão) são tomados, "
+"mas a tarefas em fila não serão transferidas.\n"
+"Nem todas as filas podem ser transferidas pelas seguintes razoes:\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
-"CUPS não suporta as impressoras em servidores Novell que enviam os dados em "
-"comandos livremente-escritos.\n"
+"CUPS não suporta as impressoras em servidores Novell ou impressoras a enviar "
+"os dados para um comando livremente-escrito.\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13165,21 +13597,21 @@ msgstr ""
 "PDQ só suporta impressoras locais, impressoras LPD remotas, e impressoras "
 "TCP/Socket.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD e LPRng não suportam impressoras IPP.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
-"Para além disso, a filas que não foram criadas com este programa ou com "
-"\"foomatic-configure\" não podem ser transferidas."
+"Em adição, filas não criadas com este programa ou com definições \"foomatic-"
+"configure\" não podem ser transferidas."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13188,9 +13620,9 @@ msgid ""
 msgstr ""
 "\n"
 "Também as impressoras configuradas com ficheiros PPD fornecidos pelos "
-"fabricantes ou com pilotos CUPS nativos não podem ser transferidas."
+"fabricantes ou com drivers CUPS nativos não podem ser transferidas."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13198,71 +13630,71 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 "\n"
-"Marque as impressoras que deseja transferir e carregue em \n"
+"Marque as impressoras que deseja transferir e clique em \n"
 "\"Transferir\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
-msgstr "Não transferir as impressoras"
+msgstr "Não transferir impressoras"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Transferir"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
 "Click \"Transfer\" to overwrite it.\n"
 "You can also type a new name or skip this printer."
 msgstr ""
-"Uma impressora \"%s\" já existe em %s. \n"
-"Carregue em \"Transferir\" para a sobrescrever.\n"
+"Uma impressora chamada \"%s\" já existe em %s. \n"
+"Clique \"Transferir\" para a sobrescrever.\n"
 "Também pode escrever um novo nome ou saltar esta impressora."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
-msgstr "Novo nome da impressora"
+msgstr "Novo nome de impressora"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "A transferir %s ..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
-"Você transferiu a sua impressora por omissão (\"%s\"). Devo indicar-la como "
-"impressora por omissão no novo sistema de impressão %s?"
+"Você transferiu a sua anterior impressora padrão (\"%s\"). Deve ser esta "
+"também a impressora padrão no novo sistema de impressao %s?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
-msgstr "A refrescar os dados da impressora"
+msgstr "A refrescar os dados da impressora..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
-msgstr "A iniciar a sua ligação à rede..."
+msgstr "A iniciar a rede..."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, c-format
 msgid "Configure the network now"
 msgstr "Configurar a rede agora"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
-msgstr "Ligação à rede não configurada"
+msgstr "Funcionalidade da rede não configurada"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13270,17 +13702,17 @@ msgid ""
 "configuration, you will not be able to use the printer which you are "
 "configuring now. How do you want to proceed?"
 msgstr ""
-"Você vai configurar uma impressora remota. Isto necessita uma ligação à rede "
-"funcional, mas a sua rede ainda não está configurada. Se continua sem "
-"configurar a rede, não vai poder utilizar a impressora que está a configurar "
-"agora. Como deseja proceder?"
+"Você vai configurar uma impressora remota. Isto precisa de um acesso à rede "
+"funcional, mas a sua rede ainda não está configurada. Se vai continuar sem a "
+"configuração da rede, não irá ser capaz de usar a impressora que está agora "
+"a configurar. Como quer proceder?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Continuar sem configurar a rede"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13290,44 +13722,43 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 "A configuração de rede efectuada durante a instalação não pode ser iniciada "
-"agora. Por favor verifique se a rede está acessível depois de iniciar o "
-"sistema e corriga a configuração através do Centro de Controlo %s, na "
-"secção \"Rede e Internet\"/\"Ligação\", e depois configure a impressora, "
-"também com o Centro de Controlo %s, na secção \"Material\"/\"Impressora"
-"\""
+"agora. Por favor verifique se a rede está acessível depois de arrancar o "
+"sistema e corriga a configuração através do Centro de Controlo %s, na secção "
+"\"Rede e Internet\"/\"Conexão\", e depois configure a impressora, também com "
+"o Centro de Controlo %s, na secção \"Material\"/\"Impressora\""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
 "printer again."
 msgstr ""
-"O acesso à rede não estava lançado e não pôde ser iniciado. Por favor "
-"verifique a sua configuração e o seu material. Tente então de configurar a "
-"sua impressora remota outra vez."
+"O acesso à rede não estava a correr e não pôde ser iniciado. Por favor "
+"verifique a sua configuração e o seu hardware. Tente então configurar a sua "
+"impressora remota outra vez."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
-msgstr "A re-lançar o sistema de impressão..."
+msgstr "A reiniciar o sistema de impressão..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "alto"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranóico"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
-msgstr "A instalar um sistema de impressão ao nível de segurança %s"
+msgstr "A instalar um sistema de impressão no nível de segurança %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 %"
@@ -13341,22 +13772,22 @@ msgid ""
 "\n"
 "Do you really want to configure printing on this machine?"
 msgstr ""
-"Você vai instalar o sistema de impressão %s num sistema que funciona no "
+"Esta'prestes a instalar o sistema de impressão %s num sistema a correr no "
 "nível de segurança %s.\n"
-"Este sistema de impressão lança um demónio (processo permanente) que espera "
-"por tarefas de impressão para as tratar. Este demónio também é acessível "
-"pelas máquinas remotas através da rede e é portanto uma porta de entrada "
-"possível para ataques. De facto, só um numero limitado de demónios "
-"escolhidos são iniciados por omissão neste nível de segurança.\n"
+"Este sistema de impressão corre um daemon (processo background) que espera "
+"por tarefas de impressão trata destas. Este daemon é também acessível "
+"pormáquinas remotas através da rede e então é um possivel ponto para "
+"ataques. Então só uns poucos saemons seleccionados são iniciados por omissão "
+"neste nível de segurança.\n"
 "\n"
-"Deseja mesmo configurar a impressão nesta máquina?"
+"Deseja realmente configurar a impressão nesta máquina?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
-msgstr "A iniciar o sistema de impressão ao arranque"
+msgstr "A iniciar o sistema de impressão no arranque"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13369,269 +13800,346 @@ msgid ""
 "Do you want to have the automatic starting of the printing system turned on "
 "again?"
 msgstr ""
-"O sistema de impressão (%s) não vai ser lançado automáticamente quando a "
+"O sistema de impressão (%s) não vai ser iniciado automáticamente quando a "
 "máquina arranca.\n"
 "\n"
 "É possível que o arranque automático tenha sido desactivado ao mudar para um "
-"nível de segurança superior pois o sistema de impressão é uma porta de "
-"ataque possível.\n"
+"nível de segurança superior, pois o sistema de impressão é uma ponto "
+"potencial para ataques.\n"
 "\n"
-"Deseja que o arranque automático do sistema de impressão seja activado de "
-"novo?"
+"Deseja ter um arranque automático do sistema de impressão activado outra vez?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
-msgstr "A verificar os programas instalados..."
+msgstr "A verificar o software instalado..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
-msgstr "A apagar %s ..."
+msgid "Removing %s..."
+msgstr "A remover %s ..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
-msgstr "Não foi possível remover o sistema de impressão %s !"
+msgstr "Não conseguiu remover o sistema de impressão %s !"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "A instalar %s ..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
-msgstr "Não foi possível instalar o sistema de impressão %s !"
+msgstr "Não conseguiiu instalar o sistema de impressão %s !"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"Neste modo não ha um sistema local de impressão, todos os pedidos de "
+"impressão vão directamente para o servidor especificado em baixo. Note que "
+"não é possivel definir filas de impressão locais, então se o servidor "
+"especificado estiver em baixo não pode nada impresso a partir desta máquina."
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+"Se quiser usar este modo digite o nome do host ou IP do seu servidor CUPS e "
+"clique em OK, senão clique em \"Sair\"."
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Nome ou IP do servidor remoto:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
-msgstr "A definir a impressora por omissão..."
+msgstr "A definir a impressora padrão..."
+
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Sistema de impressão local CUPS ou servidor remoto CUPS?"
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "O sistema de impressão CUPS pode ser usado de duas maneiras:"
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. O sistema de impressão CUPS pode ser executado localmente. "
+
+#: 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 ""
+"Então as impressoras conectadas localmente podem ser usadas e as impressoras "
+"remotas noutros servidores CUPS na mesma rede são automáticamente "
+"descobertas. "
+
+#: 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 ""
+"A desvantagem desta abordagem +e, que mais recursos na máquina local são "
+"precisos: É necessário que seja instalado pacotes adicionais de software, o "
+"daemon CUPS tem que ser executado em 2º plano e é necessária mais memória, e "
+"a porta IPP (porta 631) é aberta. "
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+"2. Todos os pedidos de impressão são imediatamente enviados para um servidor "
+"CUPS remoto. "
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+"Aqui a ocupação dos recursos locais é reduzida ao m+inimo, Nenhum daemon "
+"CUPS é iniciado ou porta aberta, nenhuma infraestrutura de software para "
+"definir as filas de impressão local é necessária, então menos memória e "
+"espaço em disco é usado. "
+
+#: 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 ""
+"A desvantagem é que não é possivel definir impressoras locais, então e se o "
+"servidor especificado estiver em baixo não pode ser nada imprimido a partir "
+"deta máquina. "
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "Como deve o CUPS ser definido na sua máquina?"
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr "Servidor remoto, especifique aqui o Nome ou o IP:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "Sistema de impressão local CUPS"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Seleccionar a fila da Impressora"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
-msgstr "Que sistema de impressão (fila) deseja usar?"
+msgstr "Que sistema de impressão (spooler) deseja usar?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
-msgstr "Não consegui configurar a impressora \"%s\"!"
+msgstr "Falha ao configurar a impressora \"%s\"!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "A instalar Foomatic..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
-msgstr "Não foi possível instalar %s pacotes, %s não pode ser iniciado!"
+msgstr "Não conseguiu instalar %s pacotes, %s não pode ser iniciado!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Não foi possível instalar os pacotes necessários, %s não pode ser iniciado!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
 "it. "
 msgstr ""
-"As seguintes impressoras encontram-se configuradas. Clique duas vezes numa "
-"impressora para alterar a sua configuração; para a definir por omissão; ou "
-"para ver informações sobre ela."
+"As seguintes impressoras encontram-se configuradas. Faça duplo clique numa "
+"impressora para alterar a sua configuração; para a definir impressora "
+"padrão; ou para ver informações sobre esta."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
-msgstr "Refrescar a lista de todas as impressoras CUPS remotas disponíveis"
+msgstr "Mostrar todas as impressoras CUPS remotas disponíveis"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
-"Refrescar a lista das impressoras (para ver todas as impressoras CUPS "
+"Refrescar a lista das impressoras (para mostrar todas as impressoras CUPS "
 "remotas disponíveis)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
-msgstr "Configuração de CUPS"
+msgstr "Configuração CUPS"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Mudar de sistema de impressão"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Modo Normal"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Modo de Perito"
 
-#: 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 "Opções da impressora"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Mudar a configuração da 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"
-"Que deseja mudar nesta impressora?"
+"Impressora %s%s\n"
+"O que deseja modificar nesta impressora?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Esta impressora está desactivada"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
-msgstr "Fazer-lo!"
+msgstr "Fazer!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
-msgstr "Tipo de ligação da impressora"
+msgstr "Tipo de conexão da 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 "Nome da Impressora, descrição, localização"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
-msgstr "Fabricante da impressora, modelo, piloto"
+msgstr "Fabricante da impressora, modelo, driver"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Fabricante da impressora, modelo"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
-msgstr "Definir esta impressora por omissão"
+msgstr "Definir esta impressora como a padrão"
 
-#: 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 "Adicionar esta impressora para Star Office/OpenOffice.org/GIMP"
+msgid "Enable Printer"
+msgstr "Activar 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 "Apagar esta impressora para Star Office/OpenOffice.org/GIMP"
+msgid "Disable Printer"
+msgstr "Desactivar Impressora"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Imprimir páginas de teste"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, c-format
 msgid "Learn how to use this printer"
-msgstr "Aprender a utilizar esta impressora"
+msgstr "Aprender a usar esta impressora"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
-msgstr "Suprimir esta impressora"
+msgstr "Remover impressora"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
-msgstr "A suprimir a antiga impressora \"%s\"..."
-
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "A adicionar a impressora para Star Office/OpenOffice.org/GIMP"
+msgstr "A remover antiga impressora \"%s\"..."
 
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "A impressora \"%s\" foi adicionada para Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Não consegui adicionar a impressora \"%s\" para Star Office/OpenOffice.org/"
-"GIMP."
+msgid "Printer \"%s\" is now enabled."
+msgstr "A impressora \"%s\" está agora activada."
 
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "A apagar a impressora para Star Office/OpenOffice.org/GIMP"
+msgid "Printer \"%s\" is now disabled."
+msgstr "A impressora \"%s\" está agora desactivada."
 
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "A impressora \"%s\" foi apagada para Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "Não consegui apagar a impressora \"%s\" para 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 "Quer mesmo suprimir a impressora \"%s\"?"
+msgstr "Quer mesmo remover a impressora \"%s\"?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
-msgstr "A suprimir a impressora \"%s\"..."
+msgstr "A sremover a impressora \"%s\"..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
-msgstr "Impressora por omissão"
+msgstr "Impressora padrão"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
-msgstr "A impressora \"%s\" é agora a impressora por omissão."
-
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Não é possível adicionar partição ao RAID _formatado_ md%d"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid falhou (talvez as raidtools estejam em falta?)"
+msgstr "A impressora \"%s\" é agora a impressora padrão."
 
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed"
-msgstr "mkraid falhou"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "Não é possível adicionar uma partição ao RAID _formatado_ %s"
 
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Sem partições suficientes para RAID nível %d\n"
@@ -13639,53 +14147,54 @@ msgstr "Sem partições suficientes para RAID nível %d\n"
 #: scanner.pm:96
 #, c-format
 msgid "Could not create directory /usr/share/sane/firmware!"
-msgstr "Não foi possível criar o directório /usr/share/sane/firmware!"
+msgstr "Não conseguiu criar o directório /usr/share/sane/firmware!"
 
 #: scanner.pm:107
 #, c-format
 msgid "Could not create link /usr/share/sane/%s!"
-msgstr "Não foi possível criar a ligação /usr/share/sane/%s!"
+msgstr "Não conseguiu criar a ligação /usr/share/sane/%s!"
 
 #: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
-"Não foi possível copiar o ficheiro de firmware %s para /usr/share/sane/"
-"firmware!"
+"Não conseguiu copiar o ficheiro de firmware %s para /usr/share/sane/firmware!"
 
 #: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
-msgstr "Não foi possível definir as permissões do ficheiro de firmware %s!"
+msgstr "Não conseguiu definir as permissões do ficheiro 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 "Não pude instalar os pacotes precisos para partilhar o seu digitalizador."
+msgstr ""
+"Não conseguiu instalar os pacotes precisos para partilhar o seu scanner."
 
 #: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
-msgstr "O(s) seu(s) digitalizador(es) não vai(vão) estar disponível(eis) para utilizadores não-root."
+msgstr ""
+"O(s) seu(s) scanner(s) não irão estar disponíveis para utilizadores não-root."
 
 #: security/help.pm:11
 #, c-format
 msgid "Accept/Refuse bogus IPv4 error messages."
-msgstr "Aceitar/Recusar as falsas mensagens de erro IPv4."
+msgstr "Aceitar/Recusar mensagens de erro IPv4 adulteradas"
 
 #: security/help.pm:13
 #, c-format
 msgid " Accept/Refuse broadcasted icmp echo."
-msgstr " Aceitar/Recusar os pedidos echo icmp broadcast."
+msgstr " Aceitar/Recusar transmissão de icmp echo."
 
 #: security/help.pm:15
 #, c-format
@@ -13695,9 +14204,10 @@ msgstr "Aceitar/Recusar icmp echo."
 #: security/help.pm:17
 #, c-format
 msgid "Allow/Forbid autologin."
-msgstr "Permite/Proíbe a autoligação."
+msgstr "Permite/Proíbe autologin."
 
-#: 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"
@@ -13706,37 +14216,50 @@ msgid ""
 "\n"
 "Else only /etc/issue is allowed."
 msgstr ""
-"Se definido para \"TODOS\", /etc/issue e /etc/issue.net podem existir.\n"
+"Se definido para \"TODOS\" e /etc/issue e /etc/issue.net podem existir.\n"
 "\n"
-"Se definido para NENHUM, nenhum issue é permitido.\n"
+"Se definido para NENHUM, nenhuma edição é permitida\n"
 "\n"
 "Senão só /etc/issue é permitido."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
-msgstr "Permitir/Proíbir o reinicio pelo utilizador da linha de comando."
+msgstr "Permite/Proíbe reinicar pelo utilizador da consola."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
-msgstr "Permite/Proíbe a ligação remota do root."
+msgstr "Permite/Proíbe ligação root remota."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
-msgstr "Aceitar/Recusar a ligação directa do root."
+msgstr "Permite/Proíbe ligação root directa."
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
 "gdm)."
 msgstr ""
-"Permite/Proíbe de listar os utilizadores do sistema nos gestores de ecrã "
-"(kdm e gdm)."
+"Permite/Proíbe listar os utilizadores do sistema nos gestores de ecrã (kdm e "
+"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 ""
+"Permite/Proibe exportar o display quando\n"
+"passar da conta root para outros utilizadores.\n"
+"\n"
+"Ver pam_xauth(8) para mais detalhes.'"
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13747,7 +14270,7 @@ msgid ""
 "\n"
 "- NONE (no connection)."
 msgstr ""
-"Permite/Proíbe ligações ao X :\n"
+"Permite/Proíbe ligações X :\n"
 "\n"
 "- TODOS (todas as ligações são permitidas),\n"
 "\n"
@@ -13755,16 +14278,17 @@ msgstr ""
 "\n"
 "- NENHUM (nenhuma ligação)."
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
-"O argumento indica se os clientes são autorizados a ligar-se\n"
-"ou não ao servidor X a partir da rede na porta tcp 6000."
+"O argumento especifica se os clientes são autorizados a conectar\n"
+"ao servidor X a partir da rede na porta tcp 6000, ou não."
 
-#: 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"
@@ -13781,17 +14305,17 @@ msgid ""
 msgstr ""
 "Autoriza :\n"
 "\n"
-"- todos os serviços controlados por tcp_wrappers (veja o man de hosts.deny"
-"(5)) se definido para \"TODOS\",\n"
+"- todos os serviços controlados por tcp_wrappers (veja a página do manual "
+"hosts.deny(5)) se definido para \"TODOS\",\n"
 "\n"
 "- só os locais se definido para \"LOCAL\"\n"
 "\n"
 "- nenhum se definido para \"NENHUM\".\n"
 "\n"
-"Para autorizar os serviços que precisa, utilize /etc/hosts.allow (veja hosts."
+"Para autorizar os serviços que precisa, use /etc/hosts.allow (veja hosts."
 "allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13803,16 +14327,16 @@ msgid ""
 "add a service if it is present in the file during the installation of\n"
 "packages."
 msgstr ""
-"Se SERVER_LEVEL (ou, se não existe,  SECURE_LEVEL)\n"
+"Se SERVER_LEVEL (ou SECURE_LEVEL ausente)\n"
 "é superior a 3 em /etc/security/msec/security.conf, cria a\n"
 "ligação simbólica /etc/security/msec/server para\n"
 "/etc/security/msec/server.<SERVER_LEVEL>.\n"
 "\n"
-"O /etc/security/msec/server é utilizado por chkconfig --add\n"
-"para decidir de adicionar um serviço se ele está presente no ficheiro\n"
-"durante a instalação dos pacotes."
+"O /etc/security/msec/server é usado por chkconfig --add para decidir\n"
+"adicionar um serviço se este está presente no ficheiro durante\n"
+"a instalação dos pacotes."
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -13820,112 +14344,120 @@ msgid ""
 "Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1)\n"
 "and crontab(1))."
 msgstr ""
-"Activa/Desactiva crontab e at para os utilizadores.\n"
+"Activar/Desactivar crontab e at para os utilizadores.\n"
 "\n"
-"Meta os utilizadores autorizados em /etc/cron.allow et /etc/at.allow\n"
-"(veja man at(1) e crontab(1))."
+"Meta os utilizadores autorizados em /etc/cron.allow e /etc/at.allow\n"
+"(veja man em (1) e crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
-msgstr "Activa/Desactiva o envio do Syslog para a consola 12"
+msgstr "Activar/Desactivar registos Syslog para a consola 12"
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
-"Activa/Desactiva a protecção da resolução dos nomes.\n"
-"Se \\alert\\ é verdadeiro, também regista no syslog."
+"Activar/Desactivar protecção da resolução dos nomes.\n"
+"Se \"%s\" é verdadeiro, também regista no syslog."
+
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Alertas de Segurança:"
 
-#: security/help.pm:73
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
-msgstr "Activar/Desactivar a protecçao IP 'spoofing'"
+msgstr "Activar/Desactivar protecçao IP 'spoofing'"
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
-msgstr "Activa/Desactiva libsafe se libsafe é encontrado no sistema."
+msgstr "ActivarDesactivar libsafe se libsafe for encontrado no sistema."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
-msgstr "Activa/Desactiva o registo dos pacotes IPv4 extranhos."
+msgstr "Activar/Desactivar o registo dos pacotes IPv4 extranhos."
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
-msgstr "Activa/Desactiva a verificação msec todas as horas."
+msgstr "Activar/Desactivar a verificação msec todas as horas."
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
-msgid " Enabling su only from members of the wheel group or allow su from any user."
+msgid ""
+" Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
-"Activa su só para os membros do grupo wheel ou permite su a partir de todos "
-"os utilizadores."
+"Activa su só para membros do grupo wheel ou permite su a partir de "
+"qualquerutilizador."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
-msgstr "Utilizar senhas para autenticar os utilizadores"
+msgstr "Usar senha para autenticar utilizadores"
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
-msgstr "Activa/Desactiva o teste de promiscuidade das placas ethernet."
+msgstr "Activar/Desactivar teste de promiscuidade das placas ethernet."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
-msgstr "Activa/Desactiva a verificação de segurança quotidiana."
+msgstr "Activar/Desactivar verificação diária de segurança."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
-msgstr "Activa/Desactiva sulogin(8) em modo utilizador ùnico."
+msgstr "Activar/Desactivar sulogin(8) em nível único de utilizador."
 
-#: 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 "Adiciona o nome como uma excepção na gestão da idade das senhas pelo msec."
+msgstr ""
+"Adiciona o nome como uma excepção na gestão da idade da senha por msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 "Define a expiração da senha para \"max\" dias e retarda a mudança para "
 "\"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
-msgstr "Define o tamanho do histórico da senha para evitar a reutilização das senhas."
+msgstr ""
+"Define o tamanho do histórico da senha para evitar a reutilização das senhas."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr ""
-"Indique o tamanho mínimo da senha assim como o número mínimo de cifres e de "
-"letras Maiúsculas."
+"Define o comprimento mínimo da senha assim como o número mínimo de dígitos e "
+"de letras Maiúsculas."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
-msgstr "Define o umask do root."
+msgstr "Defina a umask do root."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
-msgstr "se configurado para sim, verifica os portos abertos."
+msgstr "se definido para sim, verifica as portas abertas."
 
-#: 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"
@@ -13933,137 +14465,140 @@ msgid ""
 "\n"
 "- for users with the 0 id other than root."
 msgstr ""
-"se configurado para sim, procura :\n"
+"se definido para sim, procura :\n"
 "\n"
 "- senhas vazias, \n"
 "\n"
-"- ausência de senha em /etc/shadow\n"
+"- sem senha em /etc/shadow\n"
 "\n"
-"- se há utilizadores com id 0 outros que root."
+"- para utilizadores com id 0 outros que não 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 ""
-"se configurado para sim, verifica as permissões dos ficheiros da directoria "
-"pessoal (home) de cada utilizador."
+"se definido para sim, verifica as permissões dos ficheiros da pasta pessoal "
+"(home) de cada utilizador."
 
-#: 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 ""
-"se configurado para sim, verifica se os dispositivos de rede estão em modo "
+"se definido para sim, verifica se os dispositivos de rede estão em modo "
 "promíscuo."
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
-msgstr "se configurado para sim, executa diariamente as verificações de segurança."
+msgstr ""
+"se definido para sim, executa diáriamente as verificações de segurança."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
-msgstr "se configurado para sim, verifica as adições/remoções dos ficheiros sgid."
+msgstr "se definido para sim, verifica as adições/remoções dos ficheiros sgid."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
-msgstr "se configurado para sim, verifica a ausência de senha em /etc/shadow."
+msgstr "se definido para sim, verifica a ausência de senha em /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 "se configurado para sim, verifica o checksum dos ficheiros suid/sgid."
+msgstr "se definido para sim, verifica o checksum dos ficheiros 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 ""
-"se configurado para sim, verifica as adições/remoções dos ficheiros suid "
-"root."
+"se definido para sim, verifica as adições/remoções dos ficheiros suid root."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
-msgstr "se configurado para sim, relata ficheiros sem proprietário."
+msgstr "se definido para sim, relporta ficheiros sem proprietário."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
-"se configurado para sim, verifica os ficheiros/directorias com direitos de "
-"escrita para todos.."
+"se definido para sim, verifica os ficheiros/directorias com permissão de "
+"escrita para todos."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
-msgstr "se configurado para sim, executa os testes chkrootkit."
+msgstr "se definido para sim, executa os testes chkrootkit."
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
-msgid "if set, send the mail report to this email address else send it to root."
+msgid ""
+"if set, send the mail report to this email address else send it to root."
 msgstr ""
-"se configurado, envia o relatório para este endereço e-mail, caso contrário "
+"se definido, envia o relatório para este endereço de e-mail, caso contrário "
 "envia para root."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
-msgstr "se configurado para sim, relata por e-mail os resultados das verificações."
+msgstr ""
+"se definido para sim, reporta por e-mail os resultados das verificações."
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
-msgstr "Não envie mensagens se não existir nada a avisar"
+msgstr "Não envie e-mails se não existir nada a avisar"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
-msgstr "se configurado para sim, executa alguns testes à base de dados rpm."
+msgstr "se definido para sim, executa alguns testes à base de dados rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
-msgstr "se configurado para sim, relata para syslog os resultados das verificações."
+msgstr ""
+"se definido para sim, reporta para syslog os resultados das verificações."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
-msgstr "se configurado para sim, relata para tty os resultados das verificações."
+msgstr "se definido para sim, reporta para tty os resultados das verificações."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
-"Define o tamanho do histórico da Linha de Comandos (shell). Um valor -1 "
+"Define o tamanho do histórico da Linha de Comandos (shell). Um valor de -1 "
 "significa ilimitado."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
-"Define o tempo de espera da Linha de Comandos (shell). Um valor zero "
+"Define o tempo de espera da Linha de Comandos (shell). Um valor de zero "
 "significa sem tempo de espera.."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
-msgstr "A unidade do Timeout é o segundo"
+msgstr "A unidade do intervalo de tempo é o segundo"
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
-msgstr "Define o umask do utilizador"
+msgstr "Defina a umask do utilizador"
 
 #: security/l10n.pm:11
 #, c-format
 msgid "Accept bogus IPv4 error messages"
-msgstr "Aceitar as falsas mensagens de erro IPv4"
+msgstr "Aceitar mensagens de erro IPv4 adulteradas"
 
 #: security/l10n.pm:12
 #, c-format
 msgid "Accept broadcasted icmp echo"
-msgstr "Aceitar os pedidos 'echo icmp broadcasted'."
+msgstr "Aceitar echo icmp transmitidos"
 
 #: security/l10n.pm:13
 #, c-format
@@ -14078,239 +14613,244 @@ msgstr "/etc/issue* existe"
 #: security/l10n.pm:16
 #, c-format
 msgid "Reboot by the console user"
-msgstr "Reinicio pelo utilizador da linha de comando."
+msgstr "Reinicio pelo utilizador da consola."
 
 #: security/l10n.pm:17
 #, c-format
 msgid "Allow remote root login"
-msgstr "Permitir a ligação remota do root"
+msgstr "Permitir login remoto do root"
 
 #: security/l10n.pm:18
 #, c-format
 msgid "Direct root login"
-msgstr "Ligação directa do root"
+msgstr "Login directo do root"
 
 #: security/l10n.pm:19
 #, c-format
 msgid "List users on display managers (kdm and gdm)"
-msgstr "Listar os utilizadores nos gestores de ecrã (kdm e gdm)"
+msgstr "Listar utilizadores nos gestores de ecrã (kdm e gdm)"
 
 #: security/l10n.pm:20
 #, c-format
-msgid "Allow X Window connections"
-msgstr "Permitir ligações X Window"
+msgid "Export display when passing from root to the other users"
+msgstr "Exportar o ecrâ ao passar de root para os outros utilizadores"
 
 #: security/l10n.pm:21
 #, c-format
+msgid "Allow X Window connections"
+msgstr "Permitir conexões à janela X"
+
+#: security/l10n.pm:22
+#, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Autorizar conexões TCP à janela X"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Autoriza todos os serviços controlados por tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig obedece às regras msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
-msgstr "Autorizar \"crontab\" e \"at\" aos utilizadores"
+msgstr "Activar \"crontab\" e \"at\" para utilizadores"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
-msgstr "Syslog envia para a consola 12"
+msgstr "Syslog reporta para a consola 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
-msgstr "Protecção contra o 'spoofing' da resolução dos nomes"
+msgstr "Protecção 'spoofing' da resolução de nomes"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
-msgstr "Activa a protecção contra o spoofing IP"
+msgstr "Activar protecção IP spoofing"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
-msgstr "Activa libsafe se libsafe é encontrado no sistema"
+msgstr "Activar libsafe se libsafe for encontrado no sistema"
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
-msgstr "Activa o registo dos pacotes IPv4 extranhos"
+msgstr "Activar o registo de pacotes IPv4 extranhos"
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
-msgstr "Activaa verificação msec todas as horas"
+msgstr "Activar verificação horária da segurança de msec"
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
-msgstr "Activa su só para os membros do grupo wheel ou para todos os utilizadores"
+msgstr "Activar su só para membros do grupo wheel ou para qualquer utilizador"
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
-msgstr "Utilizar uma senha para autentificar os utilizadores"
+msgstr "Usar senha para autentificar utilizadores"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
-msgstr "Teste da promiscuidade das placas ethernet"
+msgstr "Teste de promiscuidade das placas ethernet"
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
-msgstr "Verificação quotidiana da segurança"
+msgstr "Verificação diária da segurança"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
-msgstr "Sulogin(8) em modo utilizador ùnico"
+msgstr "Sulogin(8) no nível utilizador ùnico"
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
-msgstr "Nenhuma expiração de senha para"
+msgstr "Sem expiração de senha para"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
-msgstr "Define a expiração da senha e o tempo de inactivação das contas"
+msgstr "Definir expiração de senha e atraso de inactivação de contas"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
-msgstr "Tamanho do histórico da senha"
+msgstr "Comprimento do histórico da senha"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
-msgstr "Tamanho mínimo da senha e número de dígitos e maiúsculas"
+msgstr "Comprimento mínimo de senha e número de digitos e letras maiúsculas"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "Umask Root"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
-msgstr "Tamanho do histórico da linha de comando"
+msgstr "Tamanho do histórico da linha de comandos"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
-msgstr "Tempo limite da Linha de Comando"
+msgstr "Intervalo de tempo da Linha de Comandos"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Umask do utilizador"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
-msgstr "Verificar as portas abertas"
+msgstr "Verifica as portas abertas"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
-msgstr "Verificar as contas não seguras"
+msgstr "Verifica por contas inseguras"
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
-msgstr "Verifica as permissões dos ficheiros pessoais de cada utilizador"
+msgstr "Verifica permissões dos ficheiros na pasta pessoal do utilizador"
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Verifica se os dispositivos de rede estão em modo promíscuo"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
-msgstr "Executa diariamente as verificações de segurança"
+msgstr "Executa diáriamente as verificações de segurança"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Verifica as adições/remoções dos ficheiros sgid"
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
-msgstr "Verifica a ausência de senha em /etc/shadow."
+msgstr "Verifica senha vazia em /etc/shadow."
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Verifica o checksum dos ficheiros suid/sgid"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Verifica as adições/remoções dos ficheiros suid root"
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
-msgstr "Relata ficheiros sem proprietário"
+msgstr "Reporta ficheiros sem proprietário"
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
-msgstr "Verifica os ficheiros/directorias com direitos de escrita para todos"
+msgstr "Verifica os ficheiros/directorias com ppermissão de escrita para todos"
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Executa os testes chkrootkit"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
-msgstr "Não envia mensagens quando não é preciso"
+msgstr "Não envia e-mails quando não é preciso"
 
-#: 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 ""
-"Se configurado, envia o relatório para este endereço e-mail, caso contrário "
-"envia para o root"
+"Se configurado, envia o relatório para este endereço de e-mail, caso "
+"contrário envia-o para o root"
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
-msgstr "Relata por e-mail os resultados das verificações"
+msgstr "Reporta por e-mail os resultados das verificações"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Executa alguns testes na base de dados rpm"
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
-msgstr "Relata para syslog os resultados das verificações"
+msgstr "Reporta para syslog os resultados das verificações"
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
-msgstr "Relata para tty os resultados das verificações"
+msgstr "Reporta para tty os resultados das verificações"
 
 #: security/level.pm:10
 #, c-format
 msgid "Welcome To Crackers"
-msgstr "Bem-vinda aos Piratas"
+msgstr "Bem-vindo aos Crackers"
 
 #: security/level.pm:11
 #, c-format
@@ -14320,7 +14860,7 @@ msgstr "Pobre"
 #: security/level.pm:13
 #, c-format
 msgid "High"
-msgstr "Alto"
+msgstr "Elevado"
 
 #: security/level.pm:14
 #, c-format
@@ -14330,7 +14870,7 @@ msgstr "Superior"
 #: security/level.pm:15
 #, c-format
 msgid "Paranoid"
-msgstr "Paranoide"
+msgstr "Paranoico"
 
 #: security/level.pm:41
 #, c-format
@@ -14339,9 +14879,9 @@ msgid ""
 "but very sensitive. It must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"Este nível deve ser usado com cuidado. Ele torna o seu sistema mais fácil \n"
-"de usar, mas muito sensível: não deve ser usado numa máquina \n"
-"ligada a outras ou à Internet. Não existe acesso por senha."
+"Este nível é para ser usado com cuidado. Torna seu sistema mais fácil \n"
+"de usar, mas muito sensível Não deve ser usado para uma máquina \n"
+"conectada a outras ou à Internet. Não existe acesso por senha."
 
 #: security/level.pm:44
 #, c-format
@@ -14349,8 +14889,8 @@ msgid ""
 "Passwords are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
-"As senhas agora estão activadas, mas o uso como computador de rede ainda não "
-"é recomendado."
+"As senhas agora estão activas, mas o uso como computador de rede ainda não é "
+"recomendado."
 
 #: security/level.pm:45
 #, c-format
@@ -14358,8 +14898,8 @@ msgid ""
 "This is the standard security recommended for a computer that will be used "
 "to connect to the Internet as a client."
 msgstr ""
-"Esta é a segurança padrão recomendada para um computador que será usadopara "
-"se ligar à Internet como um cliente."
+"Esta é a segurança padrão recomendada para um computador que será usado para "
+"se conectar à Internet como um cliente."
 
 #: security/level.pm:46
 #, c-format
@@ -14367,8 +14907,8 @@ msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
 msgstr ""
-"Já há algumas restrições, e mais controlos automáticos são lançados todas as "
-"noites."
+"Já há algumas restrições, e mais controlos automáticos são executados todas "
+"as noites."
 
 #: security/level.pm:47
 #, c-format
@@ -14380,11 +14920,11 @@ msgid ""
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
 msgstr ""
-"Com este nível de segurança, o uso deste sistema como um servidor tornou-se "
+"Com este nível de segurança, o uso deste sistema como servidor tornou-se "
 "possível.\n"
-"A segurança agora está alta o suficiente para usar o sistema como um\n"
-"servidor que aceita ligações de muitos clientes. Nota: se o sistema é só um "
-"cliente que se liga à Internet, deveria escolher um nível mais baixo."
+"A segurança agora suficientemente alta para usar o sistema como umservidor\n"
+"que aceita pode aceitar conexões muitos clientes. Nota: se a sua máquina é "
+"apenas um cliente na Internet, deve escolher um nível mais baixo."
 
 #: security/level.pm:50
 #, c-format
@@ -14392,13 +14932,13 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Este é similar ao nível abaixo, mas agora o sistema está totalmente fechado "
+"Este é similar ao nível anterior, mas o sistema está complectamente fechado "
 "e as características de segurança estão no máximo."
 
 #: security/level.pm:55
 #, c-format
 msgid "DrakSec Basic Options"
-msgstr "Draksec Opções Simples"
+msgstr "Draksec Opções Básicas"
 
 #: security/level.pm:56
 #, c-format
@@ -14413,29 +14953,30 @@ msgstr "Nível de segurança"
 #: security/level.pm:62
 #, c-format
 msgid "Use libsafe for servers"
-msgstr "Utilizar libsafe para os servidores"
+msgstr "Use libsafe para servidores"
 
 #: security/level.pm:63
 #, c-format
-msgid "A library which defends against buffer overflow and format string attacks."
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
 msgstr ""
-"Uma livraria que protege contra ataques de tipo 'buffer overflow' e cadeia "
-"formatada."
+"Uma livraria que protege contra ataques tipo 'buffer overflow' e 'format "
+"string'"
 
 #: security/level.pm:64
 #, c-format
 msgid "Security Administrator (login or email)"
-msgstr "Administrador da segurança (login ou email)"
+msgstr "Administrador de Segurança (login ou email)"
 
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "Inicia o sistema de som ALSA (Arquitectura Avançada de Som Linux) "
+msgstr "Inicie o sistema de som ALSA (Arquitectura de Som Linux Avançada) "
 
 #: services.pm:20
 #, c-format
 msgid "Anacron is a periodic command scheduler."
-msgstr "Anacron, um calendarizador de comando periódicos"
+msgstr "Anacron é um programador de comandos periódicos."
 
 #: services.pm:21
 #, c-format
@@ -14443,8 +14984,8 @@ msgid ""
 "apmd is used for monitoring battery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
-"apmd é usado para monitorizar o estado da bateria registando-o via syslog.\n"
-"Pode ser usado também para desligar a máquina quando a bateria estiver fraca."
+"apmd é usado para monitorizar o estado da bateria e registando via syslog.\n"
+"Também pode ser usado para desligar a máquina quando a bateria está fraca."
 
 #: services.pm:23
 #, c-format
@@ -14452,9 +14993,9 @@ msgid ""
 "Runs commands scheduled by the at command at the time specified when\n"
 "at was run, and runs batch commands when the load average is low enough."
 msgstr ""
-"Executa comandos agendados pelo comando at na hora especificada quando\n"
-"at foi executado, e executa comandos em grupo de comandos quando o uso de "
-"memória estiver suficientemente baixo."
+"Executa comandos programados pelo comando at na hora especificada quando\n"
+"o at foi executado, e executa comandos batch quando a média de carregamento\n"
+"da memória estiver suficientemente baixo."
 
 #: services.pm:25
 #, c-format
@@ -14476,10 +15017,10 @@ msgid ""
 "change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
-"O FAM é um demónio de monitorização de ficheiros. É utilizado para obter "
+"FAM é um daemon de monitorização de ficheiros. É usado para obter "
 "relatórios\n"
 "quando os ficheiros são alterados.\n"
-"É utilizado pelo GNOME e pelo KDE"
+"É usado pelo GNOME e pelo KDE"
 
 #: services.pm:30
 #, c-format
@@ -14489,9 +15030,10 @@ msgid ""
 "operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
-"GPM adiciona suporte de rato a aplicações Linux em modo de texto\n"
-"tal como o Midnight Commander. Permite também copiar e colar utilizando\n"
-"o rato e inclui suporte para menus pop-up na consola."
+"GPM adiciona suporte de rato a aplicações Linux em modo de texto tais\n"
+"como o Midnight Commander. Permite também operações de cortar-e-colar com o "
+"rato\n"
+"e inclui suporte para menus pop-up na consola."
 
 #: services.pm:33
 #, c-format
@@ -14499,15 +15041,16 @@ msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
-"O Harddrake sonda o hardware, e opcionalmente\n"
-"configura hardware novo ou alterado."
+"Harddrake executa uma sondagem ao hardware, e opcionalmente\n"
+"configura hardware novo/alterado."
 
 #: services.pm:35
 #, c-format
-msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
-"Apache é um servidor World Wide Web. Ele é usado para servir ficheiros\n"
-"HTML e CGI."
+"Apache é um servidor World Wide Web. É usado para servir ficheiros HTML e "
+"CGI."
 
 #: services.pm:36
 #, c-format
@@ -14519,12 +15062,11 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"O demónio (daemon) Internet superserver(normalmente chamado inetd) inicia\n"
-"uma variedade de outros serviços de Internet quando necessário. É "
+"O daemon Internet superserver (normalmente chamado inetd) inicia\n"
+"uma variedade de outros serviços de Internet conforme necessário. É "
 "responsável\n"
 "pela inicialização de vários serviços, incluindo telnet, ftp, rsh e rlogin. "
-"Desactivando o inetd, todos os serviços pelos quais é responsável \n"
-"também são desactivados."
+"Desactivando o inetd, desactiva todos os serviços pelos quais é responsável."
 
 #: services.pm:40
 #, c-format
@@ -14532,8 +15074,8 @@ msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
 msgstr ""
-"Inicie o filtro de pacotes para Linux núcleo 2.2, para criar \n"
-"uma firewall afim de proteger a sua máquina de ataques de rede."
+"Execute o filtro de pacotes para Linux núcleo 2.2, para definir \n"
+"uma firewall para proteger a sua máquina de ataques da rede."
 
 #: services.pm:42
 #, c-format
@@ -14552,13 +15094,13 @@ msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
-"Regeneração automática do cabeçalho do núcleo em /boot \n"
+"Regeneração automática do cabeçalho do kernel em /boot \n"
 "para /usr/include/linux/{autoconf,version}.h"
 
 #: services.pm:47
 #, c-format
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr "Detecção e configuração automática de material no arranque."
+msgstr "Detecção e configuração automática de hardware no arranque."
 
 #: services.pm:48
 #, c-format
@@ -14575,10 +15117,9 @@ msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
-"lpd é o demónio de impressão obrigatório para o lpr funcionar "
+"lpd é o daemon de impressão requerido para que o lpr funcione "
 "correctamente.\n"
-"Ele é basicamente um servidor que controla os trabalhos para a(s) impressora"
-"(s)."
+"É basicamente um servidor que controla os trabalhos para a(s) impressora(s)."
 
 #: services.pm:52
 #, c-format
@@ -14586,8 +15127,8 @@ msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
-"Linux Virtual Server, usado para criar um servidor de alta\n"
-"desempenho e disponibilidade."
+"Linux Virtual Server, usado para criar um servidor de alta performance\n"
+"e grande disponibilidade."
 
 #: services.pm:54
 #, c-format
@@ -14595,8 +15136,8 @@ msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
 msgstr ""
-"named (BIND) é um Servidor de Nome de Domínio (DNS) que é usado para "
-"transformar nomes de anfitrião em endereços IP."
+"named (BIND) é um Domain Name Server (DNS) que é usado para resolver nomes "
+"de anfitrião (hosts) para endereços IP."
 
 #: services.pm:55
 #, c-format
@@ -14604,8 +15145,8 @@ msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"Monta e desmonta todos os pontos de montagem do Network File\n"
-"System (NFS), SMB (Gestor de Rede/Windows) e NCP (NetWare)."
+"Monta e desmonta todos os pontos de montagem Network File\n"
+"System (NFS), SMB (Gestor Lan/Windows), e NCP (NetWare)."
 
 #: services.pm:57
 #, c-format
@@ -14623,8 +15164,8 @@ msgid ""
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
-"NFS é um protocolo popular usado na partilha de ficheiros através\n"
-"de redes TCP/IP. Esse serviço oferece a funcionalidade do servidor NFS, que "
+"NFS é um protocolo popular para partilha de ficheiros através de\n"
+"redes TCP/IP. Este serviço oferece a funcionalidade do servidor NFS, que\n"
 "é configurado através do ficheiro /etc/exports."
 
 #: services.pm:62
@@ -14633,22 +15174,22 @@ msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS é um protocolo popular usado na partilha de ficheiros através de redes\n"
-"TCP/IP. Esse serviço oferece a funcionalidade de bloquear ficheiros NFS."
+"NFS é um protocolo popular para partilha de ficheiros através de redes\n"
+"TCP/IP. Este serviço oferece a funcionalidade de bloquear ficheiros NFS."
 
 #: services.pm:64
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
-"Automaticamente ligar o teclado numérico na consola\n"
-"e XFree no arranque."
+"Automaticamente alterna o estado da tecla numlock na consola\n"
+"e Xorg no arranque."
 
 #: services.pm:66
 #, c-format
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr "Suporte a OKI 4w e 'winimpressoras' compatíveis."
+msgstr "Suporta o OKI 4w e winprinters compatíveis."
 
 #: services.pm:67
 #, c-format
@@ -14658,10 +15199,10 @@ msgid ""
 "have\n"
 "it installed on machines that don't need it."
 msgstr ""
-"Suporte PCMCIA é utilizado normalmente para suportar coisas como\n"
-"ethernet ou modem em portáteis. Ele não será iniciado a não ser que seja "
-"configurado de maneira que\n"
-"seguro estar instalado em máquinas que não precisem dele."
+"O suporte PCMCIA é normalmente usado para suportar coisas como\n"
+"ethernet ou modems nos portáteis. Não será iniciado a não ser que seja "
+"configurado\n"
+"de modo que seja seguro tê-lo instalado em máquinas que não precisem dele."
 
 #: services.pm:70
 #, c-format
@@ -14671,10 +15212,10 @@ msgid ""
 "machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"O portmapper gere ligações RPC, que são usadas por\n"
-"protocolos como NFS ou NIS. O servidor portmap tem que estar a correr nas "
-"máquinas\n"
-"que actuarão como servidores para os protocolos que utilizam o mecanismo RPC."
+"O portmapper gere conexões RPC, que são usadas por\n"
+"protocolos tais como NFS ou NIS. O servidor portmap tem que estar a correr "
+"nas máquinas\n"
+"que actuam como servidores para protocolos que façam uso do mecanismo RPC."
 
 #: services.pm:73
 #, c-format
@@ -14682,8 +15223,8 @@ msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
 "one machine to another."
 msgstr ""
-"Postfix é um Agente de Transporte de Correio, um programa que move mensagens "
-"de correio de uma máquina para outra."
+"Postfix é um Agente de Transporte de Correio Eletrônico, que é o programa "
+"que move mail de uma máquina para outra."
 
 #: services.pm:74
 #, c-format
@@ -14700,8 +15241,8 @@ msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle or DVD players"
 msgstr ""
-"Afecta dispositivos 'raw' a dispositivos de bloco (como partições de\n"
-"disco duro), para o uso de aplicações como Oracle ou leitores de DVD"
+"Atribui dispositivos 'raw' a dispositivos de bloco (como partições de\n"
+"disco rígido), para o uso de aplicações como Oracle ou leitores de DVD"
 
 #: services.pm:78
 #, c-format
@@ -14710,10 +15251,10 @@ msgid ""
 "the RIP protocol. While RIP is widely used on small networks, more complex\n"
 "routing protocols are needed for complex networks."
 msgstr ""
-"O demónio routed permite a actualização automática da tabela IP Router\n"
-"através do protocolo RIP. Enquanto o RIP é usado largamente em pequenas\n"
-"redes, protocolos de 'routing' mais complexos são necessários em redes mais "
-"complexas."
+"O daemon routeado permite a actualização automática da tabela IP Router\n"
+"através do protocolo RIP. Enquanto o RIP é largamente usado em pequenas\n"
+"redes, protocolos de 'routing' mais complexos são necessários para redes\n"
+"mais complexas."
 
 #: services.pm:81
 #, c-format
@@ -14721,8 +15262,8 @@ msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"O protocolo rstat permite que utilizadores da rede recebam\n"
-"informações sobre a velocidade de qualquer máquina naquela rede."
+"O protocolo rstat permite que utilizadores de uma rede recebam\n"
+"informações sobre velocidade para qualquer máquina nessa rede."
 
 #: services.pm:83
 #, c-format
@@ -14737,12 +15278,11 @@ 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 ""
-"O protocolo rwho permite que utilizadores remotos obtenham uma lista de "
-"todos os\n"
-"utilizadores registados (ligados) numa máquina a correr o demónio rwho "
-"(similar ao finger)."
+"O protocolo rwho permite que utilizadores remotos obtenham uma\n"
+"lista de todos os utilizadores conectados numa máquina a correr o\n"
+"daemon rwho (similar ao finger)."
 
 #: services.pm:87
 #, c-format
@@ -14755,8 +15295,9 @@ msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
 "to various system log files.  It is a good idea to always run syslog."
 msgstr ""
-"Syslog é uma capacidade que muitos demónios usam para registar mensagens\n"
-"em vários ficheiros de registo. É uma boa ideia correr sempre o syslog."
+"Syslog é a capacidade que muitos daemons usam para registar mensagens\n"
+"para vários ficheiros de registo do sistema. É boa ideia correr sempre o "
+"syslog."
 
 #: services.pm:90
 #, c-format
@@ -14765,15 +15306,15 @@ msgstr "Carrega os driver para os seus dispositivos usb."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Inicia o Servidor X Font (essencial para o XFree funcionar)"
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Inicia o Servidor X Font (essencial para o Xorg funcionar)"
 
 #: services.pm:117 services.pm:159
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
-"Escolha quais os serviços que devem ser inicializados automaticamente na "
-"altura do arranque"
+"Escolha que serviços devem ser inicializados automaticamente na altura do "
+"arranque"
 
 #: services.pm:129
 #, c-format
@@ -14812,8 +15353,8 @@ msgstr "parado"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
-msgstr "Serviços e demónios"
+msgid "Services and daemons"
+msgstr "Serviços e daemons"
 
 #: services.pm:221
 #, c-format
@@ -14824,858 +15365,1369 @@ msgstr ""
 "Não há informação adicional\n"
 "sobre este serviço, lamento."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
-msgstr "Informação"
+msgstr "Info"
 
 #: services.pm:229
 #, c-format
 msgid "Start when requested"
-msgstr "Arranca quando pedido"
+msgstr "Inicia quando pedido"
 
 #: services.pm:229
 #, c-format
 msgid "On boot"
 msgstr "Ao arrancar"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
-msgstr "Arrancar"
+msgstr "Iniciar"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Parar"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Parabéns por escolher Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>O que é o 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 "Bemvindo ao mundo do Open Source!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Bem-vindo ao <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 ""
-"O seu novo sistema operativo Mandrakelinux e muitas das suas aplicações são "
-"o resultado dos esforços colaborativos entre os desenvolvedores da "
-"MandrakeSoft e os contribuidores do Mandrakelinux espalhados pelo mundo."
+"O Mandrakelinux é uma <b>distribuição Linux</b>que abrange o núcleo do "
+"sistema, chamado de<b>sistema operativo</b> (baseado no kernel Linux) junto "
+"com <b>muitas aplicalçoes</b> que vão de encontro a todas as vossas "
+"necessidades."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Desejamos agradecer a todos aqueles que participaram no desenvolvimento "
-"desta última versão."
+"O Mandrakelinux é a distribuição Lunix que hoje é a mais <b>user-friendly</"
+"b>. É também uma das <b>mais usadas</b> distribuições Linux a nível mundial!"
+
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "<b>Open Source</b>"
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:15
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Bemvindo ao <b>mundo do Open Source</b>!"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
-"A Discovery é a mais fácil e mais user-friendly distribuição de Linux. "
-"Inclui uma selecção escolhida a dedo de software prestigiado para "
-"actividades de Escritório, Multimédia e de Internet."
+"O Mandrakelinux está comprometido com o modelo open source. Isto significa "
+"que as novas versões são o resultado da <b>colaboração</b> entre a <b> "
+"Equipa de programadores da Mandrakesoft</b> e a <b>comunidade mundial</b> de "
+"contribuidores Mandrakelinux."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
-"O menu é orientado por tarefa, com uma única aplicação seleccionada por "
-"tarefa."
+"Gostariamos de <b>agradecer</b> a todos aqueles que participaram no "
+"desenvolvimento desta última versão."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>A escolha KDE</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>O GPL</b>"
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
-"O poderoso e Open Source ambiente de desktop gráfico KDE é o ambiente de "
-"eleição para o Discovery Pack."
+"A maior parte do software incluido na distribuição e todas as ferramentas "
+"Mandraelinux são licensiadas sob a licença <b>GPL</b>."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr "<b>OpenOffice.org</b>: A completa suite de escritório para Linux."
+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 ""
+"O GPL é o coração do modelo open source; garante a toda a gente a "
+"<b>liberdade</b> para usar, estudar, distribuir e melhorar o software como "
+"quiserem, desde que os resultados sejam disponibilizados."
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
-"<b>WRITER</b> é um poderoso processador de texto para a criação de todos os "
-"tipos de documento. Os documentos podem incluir imagens, diagramas e tabelas."
+"O principal benefício disto é que o número de programadores é virtualmente "
+"<b>ilimitado</b>; resultando numa <b>grande qualidade</b> de software."
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Junte-se à Comunidade</b>"
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
-"<b>CALC</b> é uma folha de cálculo artilhada com ferramentas que lhe "
-"permitem computar, analizar e gerir toda a sua informação."
+"O Mandrakelinux tem uma das <b>maiores comunidades</b> de utilizadores e "
+"programadores. O papel de tal comunidade é muito variado, indo de reportar "
+"um erro, à programação de novas aplicações. A comunidade desempenha <b>papel "
+"chave</b> no mundo Mandrakelinux."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
-"<b>IMPRESS</b> é a maneira mais rápida, e mais poderosa, de criar "
-"apresentações multimédia eficazes."
+"Para <b>aprender mais</b> acerca da nossa dinâmica comunidade, por favor "
+"visite <b>www.mandrakelinux.com</b> ou directamente em<b>www. mandrakelinux."
+"com/en/cookerdevel.php3</b> se se quiser <b>envolver</b> na programação."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Versão Download</b>"
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"<b>DRAW</b> é capaz de produzir de tudo, desde simples diagramas a "
-"ilustrações 3D dinâmicas."
+"Está agora a instalar o <b>Mandrakelinux Download</b>. Esta é a versão livre "
+"que o Mandrakesoft quer manter <b>disponivel para toda a gente</b>."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:17
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Navegar na Internet</b>"
+msgid ""
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
+msgstr ""
+"A versão Download <b>não pode incluir</b> todo o software que não é open "
+"source. Portanto, não irá encontrar na versão Download:"
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
-msgstr "Descubra a nova suite de informação pessoal, integrada no KDE, o Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgstr ""
+"\t* <b>Proprietários dos drivers</b> (tal como drivers para NVIDIA®, ATI™, "
+"etc.)."
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"Mais do que um completo cliente de e-mail, o <b>Kontact</b> também inclui um "
-"livro de endereços, um calendário e um programa de agendamento, e ainda uma "
-"ferramenta para tomar notas!"
+"\t* <b>Proprietário do software</b> (tal como Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
-msgstr "Pode também:"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+"Também não irá ter acesso aos <b>serviçõs incluidos</b> nos outros produtos "
+"Mandrakesoft."
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- navegar na Web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "<b>Discovery, O Seu Primeiro Linux Desktop</b>"
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
-msgstr "\t- conversar"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Está agora a instalar o <b>Mandrakelinux Discovery</b>."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- organizar uma video-conferência"
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+"Discovery é a <b>mais fácil</b> e a mais <b>user-friendly</b> distribuição "
+"de Linux. Inclui uma selecção escolhida a dedo de <b>software premium</b> "
+"para as actividades de office/escritório. multimedia e Internet. O seu menu "
+"é feito/orientado conforme as tarefas, com apenas uma aplicação por tarefa."
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- criar o seu próprio Web site"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "<b>PowerPack, O Último Linux Desktop</b>"
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack</b>."
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Multimédia</b>: Software para todas as necessidades!"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
+"PowerPack é o <b>premier</b> Linux desktop da Mandrakesoft. O PowerPack "
+"contém <b>milhares de aplicações</b> tudo desde o mais popular ao mais "
+"avançado."
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Ouça CDs de audio com o <b>KsCD</b>."
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "<b>PowerPack+, A Solução Linux Desktop e Servidores</b>"
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Ouça ficheiros de música e veja vídeos com o <b>Totem</b>."
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Está agora a instalar o <b>Mandrakelinux PowerPack+</b>."
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "Veja e edite imagens e fotos com o <b>GQview</b> e com o <b>The Gimp!</b>"
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
+msgstr ""
+"PowerPack+ é a<b>mais complecta solução Linuxu</b> para pequenas e médias "
+"<b>redes</b>. O PowerPack+ contém <b>milhares de aplicações</b> uma "
+"compreensiva selecção de classe mundial de <b>aplicações para servidores</b>."
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Centro de Controlo Mandrake</b>"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Produtos Mandrakesoft</b>"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
-"O Centro de Controlo Mandrake consiste numa colecção essencial de utilidades "
-"específicas ao Mandrake que simplifiam a configuração do seu computador."
+"<b>Mandrakesoft</b> desenvolveu uma grande variedade de produtos "
+"<b>Mandrakelinux</b>."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Os produtos Mandrakelinux 10.1 são:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* <b>Discovery</b>, O Seu Primeiro Linux Desktop."
+
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* <b>PowerPack</b>, O Último Linux Desktop."
+
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* <b>PowerPack+</b>, A Solução Linux para Desktops e Servidores."
+
+#: 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 ""
-"Irá imediatamente apreciar esta colecção de úteis ferramentas para "
-"configurar facilmente os dispositivos de hardware, definir pontos de "
-"montagem, configurar a Rede e a Internet, ajustar o nível de segurança do "
-"seu computador, e para tudo o resto relacionado com o seu sistema."
+"\t* <b>Mandrakelinux 10.1 para x86-64</b>, A solução Mandrakelinux para "
+"tirar melhor partido do seu processador 64-bit."
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:13
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "<b>Produtos Mandrakesoft (Produtos Nomad)</b>"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
-"Encontre todos os produtos e serviços da MandrakeSoft na <b>MandrakeStore</"
-"b> -- a nossa plataforma completa de serviços de comércio digital."
+"A Mandrakesoft desenvolveu dois produtos que lhe permitem usar o "
+"Mandrakelinux<b>em qualquer computer</b> e sem qualquer necessidade de o "
+"instalar:"
 
-#: 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 "Pare hoje em <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
+msgstr ""
+"\t* <b>Move</b>, uma distribuição Mandrakelinux que corre inteiramente deCD-"
+"Rom de arranque."
 
-#: 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 "Torne-se num membro do <b>MandrakeClub</b>!"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* <b>GlobeTrotter</b>, uma distribuição Mandrakelinux pre-instalada no seu "
+"ultra-compacto “LaCie Mobile Hard Drive”."
 
-#: 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
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "<b>Produtos Mandrakesoft (Soluções Profissionais)</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 ""
-"Tire proveito de valiosos benefícios, produtos e serviços juntando-se ao "
-"MandrakeClub, tais como:"
+"Em baixo estão os produtos Mandrakesoft feitos para as suas <b>necessidades "
+"profissionais</b>:"
+
+#: share/advertising/11.pl:16
+#, c-format
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr "\t* <b>Corporate Desktop</b>, O Desktop Mandrakelinux para Negócios."
 
-#: 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:17
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Acesso completo a aplicações comerciais"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* <b>Corporate Server</b>, A Solução Mandrakelinux para Servidores."
 
-#: 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:18
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
-"\t- Lista especial de mirrors para download exclusiva para membros do "
-"MandrakeClub"
+"\t* <b>Multi-Network Firewall</b>, A Solução Mandrakelinux de Segurança."
 
-#: 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/12.pl:13
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Votar em software a incluir no Mandrakelinux"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>A escolha KDE</b>"
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:15
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- Descontos especiais para produtos e serviços da MandrakeStore"
+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 ""
+"Com o seu Discovery, será introduzido no <b>KDE</b>, o mais avançado e user-"
+"friendly <b>ambiente de trabalho gráfico</b> disponivel."
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/12.pl:17
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- E muito mais"
+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 ""
+"O KDE irá fazer com que os seus <b>primeiros passos</b> com o Linux sejam "
+"tão <b>fáceis</b> que nem irá pensar em correr outro sistema operativo!"
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/12.pl:19
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Para informações adicionais, por favor visite <b>www.mandrakeclub.com</b>"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
+"O KDE também contém muitas <b>aplicações bem integradas</b> tais como o "
+"Konqueror, web browser e o Kontact, gestor de informação pessoal."
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Necessita de assistência?"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Escolha o seu Ambiente de Trabalho Gráfico Favorito</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> é a principal fonte de suporte técnico."
+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 ""
+"Com o PowerPack, irá ter a escolha do <b>ambiente de trabalho gráfico</b>. A "
+"Mandrakesoft escolheu o <b>KDE</b> como padrão."
 
-#: 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 ""
-"Se tiver questões sobre Linux, subscreva à MandrakeExpert em <b>www."
-"mandrakeexpert.com</b>"
+"O KDE ié um dos <b>mais avançados</b> e <b>user-friendly</b> ambientes de "
+"trabalho gráficos  disponivel. Contém muitas aplicaçºoes integradas."
 
-#: 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 ""
-"O Mandrakelinux compromete-se ao Modelo Open Source e respeita por inteiro a "
-"General Public License. Esta nova versão é o resultado da colaboração entre "
-"a equipa de desenvolvedores da MandrakeSoft e a comunidade mundial de "
-"contribuidores do Mandrakelinux."
+"Mas aconselhamos que experimente todos os disponiveis (incluindo o <b>GNOME</"
+"b>, <b>IceWM</b>, etc.) e escolha o seu favorito."
+
+#: 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 ""
+"Com o PowerPack+ irá ter a escolher de um <b>ambiente de trabalho gráfico</"
+"b>. A Mandrakesoft escolheu o <b>KDE</b> como o padrão."
+
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:15
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Junte-se à comunidade Mandrakelinux!</b>"
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Com o Discovery, irá descobrir o <b>OpenOffice.org</b>."
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Se desejar envolver-se, por favor subscreva à mailing list \"Cooker\" "
-"visitiando <b>mandrake-linux.com/cooker</b>"
+"É um <b>complecto pacote office</b> que contém um processador word, folha de "
+"cálculo,apresentação e aplicações de desenho."
 
-#: 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 ""
-"Para saber mais sobre a nossa comunidade dinâmica, por favor visite <b>www."
-"mandrake-linux.com</b>!"
+"OpenOffice.org pode ler e escrever a maior parte dos tipos de documentos "
+"<b>Microsoft® Office</b> tais como ficheiros Word, Excel e PowerPoint®."
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>O que é o 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 ""
-"O Mandrakelinux é uma distribuição Open Source criada a partir de milhares "
-"das melhores aplicações do mundo do Software Livre. O Mandrakelinux é uma "
-"das distribuições de Linux mais utilizadas a nível mundial!"
+"O Discovery contém <b>Kontact</b>, o novo <b>grupo de soluções</b> KDE."
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
-"O Mandrakelinux inclui os famosos ambientes gráficos de desktop KDE e GNOME, "
-"e também as últimas versões das aplicações Open Source mais populares."
+"Mais do que um completo <b>cliente de e-mail</b>, o Kontact também inclui um "
+"<b>livro de endereços</b>, um <b>calendário</b> e uma ferramenta para tomar "
+"<b>notas</b>!"
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
-"O Mandrakelinux é largamente conhecida como a distribuição Linux mais user-"
-"friendly, mais fácil de instalar e mais fácil de usar."
+"É o caminho mais fácil para comunicar com os seus contactos e de organizar o "
+"seu tempo."
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Navegar na Internet</b>"
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:15
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Informe-se sobre as nossas <b>Soluções Pessoais</b>:"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr "O Discovery irá dar-lhe acesso a <b>todos os recursos Internet</b>:"
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
-msgstr ""
-"\t- Descubra o Mandrakelinux através de um CD bootável com <b>MandrakeMove</"
-"b>"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Navegue na <b>Web</b> com o Mozilla e com oKonqueror."
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* <b>Converse/Chat</b> online com os seus amigos usando o Kopete."
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>Transfira</b> ficheiros com o 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 "<b>Aprecie as nossas capacidades Multimedia</b>"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr "O Discovery irá também fazer a <b>multimedia</b> muito fácil para si:"
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* Veja os seus <b>videos</b> favoritos com o Kaffeine."
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* Ouça as suas <b>músicas</b> preferidas com o amaroK."
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Edite e crie <b>imagens</b>com o Gimp."
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "<b>Aprecie o Grande Número de Aplicações Disponiveis</b>"
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
-"\t- Se utiliza o Linux principalmente para tarefas de Escritório, Internet e "
-"Multimédia o <b>Discovery</b> vai de encontro às suas necessidades"
+"No menu Mandrakelinux irá encontrar aplicações <b>fáceis de usar</b>para "
+"todas as suas tarefas:"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr ""
+"\t* Crie, edite e partilhe documentos office com o <b>OpenOffice.org</b>"
+
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Gerencie os seus dados pessoais com as suites de infromação pessoal "
+"integradas <b>Kontact</b> e <b>Evolution</b>."
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Navegue na web com o <b>Mozilla</b> e o <b>Konqueror</b>."
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Participe em conversas/chats online com o <b>Kopete</b>."
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
-"\t- Se necessita de uma solução Linux mais completa e costumizada para "
-"pequenas e média redes, escolha o <b>PowerPack+</b>"
+"\t- Ouça os seus <b>CDs audio</b> e <b>ficheiros de música</b>, e veja os "
+"seus <b>videos</b>."
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Edite e crie imagens com o <b>Gimp</b>."
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/19.pl:13
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Informe-se também sobre as nossas <b>Soluções Empresariais</b>!"
+msgid "<b>Development Environments</b>"
+msgstr "<b>Ambientes de Programação</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 ""
+"O PowerPack dá-lhe as melhores ferramentas para <b>desenvolver</b> as suas "
+"aplicações."
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
-"<b>Corporate Server</b>: é a solução ideal para empresas. É uma completa "
-"solução \"tudo-em-um\" que inclui tudo o que é necessário para rápidamente "
-"lançar aplicações de servidor Linux a  nível mundial."
+"Irá apreciar o poderoso, ambiente de programação integrado do KDE, "
+"<b>KDevelop</b>, que o irá ajudar a programar em várias linguagens."
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
-"<b>Multi Network Firewall</b>: baseado no Linux 2.4 \"kernel seguro\" de "
-"modo a providenciar funcionalidades multi-VPN e multi-DMZ. É a solução "
-"perfeita para alto performance da segurança."
+"O PowerPack vem também com o <b>GCC</b>, o principal compilador linux e "
+"<b>GDB</b>, o depurador associado."
+
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Editores de Programação</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr "O PowerPack deixa-o escolher entre os mais <b>populares editores</b>:"
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b>: um editor costumizável e com display em tempo real"
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
-"<b>MandrakeClustering</b>: o poder e a rapidez de um cluster em Linux "
-"combinado com a estabilidade e facilidade de uso da distribuição "
-"mundialmente famosa Mandrakelinux. Uma combinação única que proporciona um "
-"performance de HPC incomparável."
+"\t* <b>XEmacs</b>: outro editor de texto open source e sistema de "
+"programação de aplicações."
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
-"Descubra todos os produtos MandrakeSoft em <b>MandrakeStore</b> -- a nossa "
-"plataforma completa de serviços de comércio digital."
+"\t* <b>Vim</b>: um editor de texto avançado com mais funções que o Vi padrão."
+
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Linguagens de Programação</b>"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
-"Informe-se também sobre incidentes de suporte se encontrar algum problema, "
-"do suporte standard ao profissional, do 1 aos 50 incidente(s), escolha "
-"aquele que vai de encontro às suas necessidades!"
+"Com todas estas <b>ferramentas poderosas</b>, será capaz de escrever "
+"aplicações em <b>dezenas de linguagens de programação</b>:"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* A famosa <b>Linguagem C</b>."
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Objectivos das linguagens:"
+
+#: share/advertising/21.pl:18
+#, c-format
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
+
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
+
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* Linguagens (Script):"
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/21.pl:21
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Torne-se num membro do MandrakeClub!</b>"
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:22
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Necessita de assistência?</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Nota</b>"
+msgid "\t* And many more."
+msgstr "\t* E muitas mais."
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/22.pl:13
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Este é o mandrakelinux <b>Download version</b>."
+msgid "<b>Development Tools</b>"
+msgstr "<b>Ferramentas de Programação</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
-"A versão gratuita de download não inclui software comercial, e portanto pode "
-"não funcionar com certos modems (como alguns ADSL e RTC) e placas gráficas "
-"(como as ATI® e NVIDIA®)."
+"Com o poderoso ambiente de programação integrado <b>KDevelop</b>e com o "
+"principal compilador Linux <b>GCC</b>, será capaz de criar aplicações em "
+"<b>muitas linguagens diferentes</b> (C, C++, Java™, Perl, Python, etc.)."
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Servidores Groupware</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
-"A sua nova distribuição Mandrakelinux e muitas das suas aplicações são o "
-"resultado dos esforços colaborativos entre os desenvolvedores da "
-"MandrakeSoft e os contribuidores do Mandrakelinux espalhados pelo mundo."
+"O PowerPack+ irá-lhe dar acesso ao <b>Kolab</b>, um complecto <b>servidor "
+"groupware</b> que irá, agradecer ao cliente <b>Kontact</b>, permitindo-lhe:"
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/23.pl:16
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Envia e recebe os seus <b>e-mails</b>."
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/23.pl:17
 #, 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."
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
 msgstr ""
-"O PowerPack+ é uma solução Linux de destaque, costumizada para pequenas e "
-"média redes. o PowerPack+ adiciona ao valor do PowerPack standard uma vasta "
-"selecção de aplicações de servidor a nível mundial."
+"\t* Partilha as suas <b>agendas</b> e os seus <b>livros de endereços</b>."
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/23.pl:18
 #, c-format
-msgid "It is the only Mandrakelinux product that includes the groupware solution."
-msgstr "É o único produto Mandrakelinux que inclui a solução de groupware."
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* Gere os seus <b>memos</b> e a sua <b>lista de tarefas</b>."
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:13
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Escolha o seu ambiente de Desktop gráfico</b>"
+msgid "<b>Servers</b>"
+msgstr "<b>Servidores</b>"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"Quando acede ao seu sistema Mandrakelinux pela primeira vez, pode escolher "
-"por entre uma multiplicidade de ambientes gráficos de desktop populares, "
-"incluindo: KDE, GNOME, WindowMaker, IceWM, e outros."
+"Enriqueça a rede da sua empresa através de <b>soluções premier de servidor</"
+"b> incluindo:"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
-"No menu Mandrakelinux irá encontrar aplicações fáceis de usar para todas as "
-"tarefas:"
+"\t* <b>Samba</b>: Serviços de ficheiros e impressao para clientes Microsoft® "
+"Windows®."
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
-"\t- Crie, edite e partilhe documentos de escritório com o <b>OpenOffice.org</"
-"b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: O servidor Web mais amplamente usado."
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
-"\t- Registe e gerencie as suas informações pessoais com as suites integradas "
-"de informação pessoal: <b>Kontact</b> e <b>Evolution</b>"
+"\t- <b>MySQL</b> e <b>PostgreSQL</b>: As bases de dados Open Source mais "
+"populares a nível mundial."
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Navegue na web com o <b>Mozilla e o Konqueror</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
+msgstr ""
+"\t* <b>CVS</b>: Versões de Sistema Concurrentes, o sistema dominante Open "
+"Source e de rede para controlo de versões de sistema."
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Participe em conversas online com o <b>Kopete</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr ""
+"\t* <b>ProFTPD</b>: o servidor FTP altamente configurável e com licença GPL "
+"para software de servidores FTP."
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:21
 #, c-format
-msgid "\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+msgid ""
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
-"\t- Ouça CDs de audio e ficheiros de música com o <b>KsCD</b> e o <b>Totem</"
-"b>"
+"\t* <b>Postfix</b> e <b>Sendmail</b>: O popular e poderoso servidor de mail."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Edite imagens e fotos com o <b>The Gimp</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Centro de Controlo Mandrakelinux</b>"
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
-"O PowerPack+ inclui tudo o que é necessário para desenvolver e criar o seu "
-"próprio software, incluindo:"
+"O <b>Centro de Controlo Mandrakelinux</b> é uma colecção essencial de  "
+"utilidades específicas do Mandrakelinux para que simplificar a configuração "
+"do seu computador."
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- <b>Kdevelop</b>: um completo, e fácil de usar Ambiente de "
-"Desenvolvimento Integrado (IDE) para programação em C++"
+"Irá imediatamente apreciar esta colecção de <b>mais de 60</b> boas "
+"útilidades para <b>fácilmente configurar o seu sistema</b>: dispositivos "
+"hardware, pontos de montagem, rede e internet, níveis de segurança do seu "
+"computador, etc."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: o famoso GNU Compiler Collection"
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>O Modelo Open Source</b>"
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/26.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: o debugador do projecto GNU"
+msgid ""
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
+msgstr ""
+"Como todos os programas de computador, o software open source <b>requer "
+"tempo e pessoas</b> para programação. Para respeitar a filosofia open "
+"source, as vendas da Mandrakesoft adicionaram valiosos produtos e serviços "
+"para <b>continuar a melhorar o Mandrakelinux</b>. Se quer dar <b>suporte à "
+"filosofia open source</b> e programação do Mandrakelinux, <b>por favor</b> "
+"considere comprar um dos nossos produtos ou serviços!"
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: um editor costumizável e de display em tempo real"
+msgid "<b>Online Store</b>"
+msgstr "<b>Loja Online</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/27.pl:15
 #, c-format
-msgid "\t- <b>Xemacs</b>: open source text editor and application development system"
+msgid ""
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Xemacs</b>: editor de texto e sistema de desenvolvimento de "
-"aplicações Open Source"
+"Para aprender mais acerca dos produtos e serviços Mandrakesoft, pode visitar "
+"a nossa <b>plataforma comercial</b>."
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
-msgstr "\t- <b>Vim</b>: editor de texto avançado com mais funções que o Vi standard"
+msgid "There you can find all our products, services and third-party products."
+msgstr "Aí pode encontrar todos os nossos produtos, serviços e terceiros."
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:19
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>Descubra a solução completa de groupware!</b>"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr ""
+"Esta plataforma acabou de ser <b>redesenhada</b> para melhorar a sua "
+"eficiência e usabilidade."
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:21
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Oferece funções de servidor e de cliente para:"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "Pare por hoje em <b>store.mandrakesoft.com</b>!"
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:13
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Enviar e receber emails"
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
-"\t- Calendário, Lista de Tarefas, Memorandos, Contactos, Solicitações de "
-"Reunião (envio e recepção), Solicitações de Tarefas (envio e recepção)"
+"<b>Mandrakeclub</b> é a <b>companhia perfeita</b> para o seu produto "
+"Mandrakelinux."
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Livro de endereços (servidor e cliente)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgstr ""
+"Tire proveito de <b>valiosos benefícios</b>, juntando-se ao Mandrakeclub, "
+"tais como:"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "Empower your business network with <b>premier server solutions</b> including:"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
-"Enriqueça a rede da sua empresa através de <b>soluções especiais de "
-"servidor</b> incluindo:"
+"\t* <b>Descontos especiais</b> em produtos e serviços da nossa loja online "
+"<b>store.mandrakesoft.com</b>."
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
-"\t- <b>Samba</b>: Serviços de ficheiros e de impressoras para clientes MS-"
-"Windows"
+"\t* Aceda a <b>aplicações coomerciais</b> (por exemplo para drivers NVIDIA® "
+"ou ATI™)."
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: O servidor Web mais amplamente utilizado"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Participação em <b>foruns para utilizadores</b> Mandrakelinuxe."
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: A base de dados Open Source mais popular do mundo"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr ""
+"\t* <b>Acesso em primeira mão e priviligeado, antes da saída pública das "
+"<b>imagens ISO</b> Mandrakelinux."
+
+#: share/advertising/29.pl:13
+#, c-format
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
-"\t- <b>CVS</b>: Sistema de Versões Concurrentes, o sistema Open Source de "
-"controlo de versões mais transparente e mais utilizado"
+"<b>Mandrakeonline</b> é um novo serviço premium que a Mandrakesoft está "
+"orgulhosa de apresentar aos seus clientes!"
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>ProFTPD</b>: o servidor FTP altamente configurável e licensiado "
-"através da GPL"
+"A Mandrakeonline fornece uma grande variadade de valiosos serviçõs para "
+"<b>fácilmente actuaçizar</b> os seus sistemas Mandrakelinux."
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Entre outros"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
+"\t* <b>Perfeito</b> sistema de segurança (actualizações de software "
+"automatizadas)."
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
-"A sua nova distribuição Mandrakelinux é o resultado dos esforços "
-"colaborativos entre os desenvolvedores da MandrakeSoft e os contribuidores "
-"do Mandrakelinux espalhados pelo mundo."
+"\t* <b>Notificação</b> de actualizações (por e-mail ou por um applet no "
+"desktop)."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* Actualizações flexiveis e <b>programadas</b>."
+
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
-"Desejamos agradecer a todos aqueles que participaram no desenvolvimento da "
-"nossa última versão."
+"\t* Gerenciamento de <b>todo o seu sistema Mandrakelinux</b> com uma conta."
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"O PowerPack é o mais prestigiado produto Linux para desktop da MandrakeSoft. "
-"Além de ser a distribuição Linux mais fácil  e mais user-friendly, o "
-"PowerPack inclui centenas de aplicações - de tudo, desde as mais populares "
-"às mais técnicas."
+"Requer <b>assitência?</b> Conheça os tecnicos da Mandrakesoft peritos no "
+"suporte tecnico da nossa plataforma</b> www.mandrakeexpert.com."
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"No menu Mandrakelinux irá encontrar aplicações fáceis de usar para todas as "
-"tarefas:"
+"Obirgado pela ajuda dos <b>peritos qualificados Mandrakelinux</b>, irá "
+"poupar muito tempo."
 
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t- Registe e gerencie as suas informações pessoais com as suites integradas "
-"de informação pessoal <b>Kontact</b> e <b>Evolution</b>"
+"Para qualquer questão relacionada com o Mandrakelinux, tem a possibilidade "
+"de comprar suporte para os incidentes em <b>store.mandrakesoft.com</b>."
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:25
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Navegue na web com o <b>Mozilla</b> e o <b>Konqueror</b>"
+msgid "Office Workstation"
+msgstr "Estação de Trabalho de Escritório"
+
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Programas office: processadores de texto (kword, abiword), folhas de cálculo "
+"(kspread, gnumeric), visualizadores pdf, etc"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"\t- Ouça CDs de audio e ficheiros de música com o <b>KsCD</b> e o <b>Totem</"
-"b>"
+"Programas office: processadores de texto (kword, abiword), folhas de cálculo "
+"(kspread, gnumeric), visualizadores pdf, etc"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:33
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Ferramentas de Desenvolvimento</b>"
+msgid "Game station"
+msgstr "Estação de Jogo"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Estação Multimédia"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Aplicações de som e vídeo reprodução/edição"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Estação de 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 ""
-"O PowerPack inclui tudo o que é necessário para desenvolver e criar o seu "
-"próprio software, incluindo:"
+"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
+"mutt, tin...) e para navegar na Web"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:49
 #, c-format
-msgid "And of course the editors!"
-msgstr "E claro os editores!"
+msgid "Network Computer (client)"
+msgstr "Computador de Rede (cliente)"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para diferentes protocolos incluindo ssh"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Configuração"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Ferramentas para facilitar a configuração do seu computador"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Ferramentas de Consola"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+"Editores, Linha de Comandos (shell), ferramentas de ficheiros, terminais"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C e C++ bibliotecas de programação, programas e ficheiros 'include'"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Documentação"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livros e Howto's sobre o Linux e Software Livre"
+
+#: 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 Padrão Linux (LSB). Suporte de aplicações terceiros."
+
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "Cache"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Grupo"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Servidor Samba"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet gateway"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "Mozilla Forums"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix servidor de correio eletrônico"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Pasta de onde 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"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Informações da Rede GNOME"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Servidor de Impressão"
+
+#: 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 Dados"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Servidor de Base de Dados PostgreSQL ou 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, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Correio Eletrônico"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix servidor de correio eletrônico"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de Base de Dados PostgreSQL ou MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Computador/Servidor de Rede"
+
+#: 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 "Estação de Trabalho KDE"
+
+#: share/compssUsers.pl:147
+#, c-format
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"O ambiente Desktop K, o ambiente gráfico básico com uma colecção de "
+"ferramentas"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Estação de Trabalho Gnome"
+
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
-"\t- <b>Xemacs</b>: outro editor de texto e sistema de desenvolvimento de "
-"aplicações"
+"Um ambiente gráfico com um conjunto de aplicações 'user-friendly' e "
+"ferramentas de ambiente de trabalho."
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Outros Ambientes de Trabalho Gráficos"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Filipinas"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
 #, c-format
-msgid "\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+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 "Configuração do Servidor de Terminal"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Monitarizar Rede"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
-"\t- <b>Vim</b>: um editor de texto avançado com mais funções que o Vi "
-"standard"
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Produtos Mandrakesoft</b>"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Falha ao configurar a impressora \"%s\"!"
 
 #: standalone.pm:21
 #, c-format
@@ -15694,18 +16746,18 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
-" Este programa é livre ; pode redistribuir-lo ou modificar-lo nos\n"
-" termos da licença GNU GPL como publicada pela Fundação dos\n"
-"Programas Livres, seja na versão 2, seja (à sua escolha) qualquer\n"
-"versão ulterior.\n"
+"Este programa é de software livre; pode redistribuir-lo e/ou modifica-lo\n"
+"nos termos da licença GNU GPL como publicado pela Fundação de\n"
+"Software Livre, seja na versão 2, ou (à sua escolha) em qualquer\n"
+"versão anterior.\n"
 "\n"
-" Este programa é distribuído com o objectivo de ser útil, mas sem\n"
-" NENHUMA GARANTIA ; mesmo sem a garantia implícita de VENDA ou de\n"
-" ADEQUAÇÃO A QUALQUER COISA.  Veja a licença GNU Licença Publica\n"
+"Este programa é distribuído na esperança de que seja útil, mas SEM\n"
+"QUALQUER GARANTIA; mesmo sem a garantia implícita de VENDA ou de\n"
+" ADEQUAÇÃO A QUALQUER PORPÓSITO. Veja a licença GNU Licença Publica\n"
 " Geral para mais detalhes.\n"
 "\n"
-" Você deveria ter recebido uma cópia da licença GNU GPL com este\n"
-"programa ; se não, escreva à Fundação Free Software, Inc.,\n"
+" Você devia ter recebido uma cópia da licença GNU GPL com este\n"
+"programa; se não, escreva para Fundação Free Software, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: standalone.pm:40
@@ -15724,14 +16776,14 @@ msgid ""
 "--version             : show version number.\n"
 msgstr ""
 "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
-"Aplicação para Arquivar e Restaurar\n"
+"Aplicação para Bachup e Restauro\n"
 "\n"
-"--default             : grava as directorias por omissão.\n"
-"--debug               : mostra todas as mensagens.\n"
-"--show-conf           : lista dos ficheiros ou directorias a arquivar.\n"
+"--default             : grava as directorias padrão.\n"
+"--debug               : mostra todas as mensagens erro.\n"
+"--show-conf           : lista de ficheiros ou directorias para bachup.\n"
 "--config-info         : explica as opções dos ficheiros de configuração "
-"(para os utilizadores sem X).\n"
-"--daemon              : utiliza a configuração do demónio. \n"
+"(para utilizadores sem X).\n"
+"--daemon              : utiliza a configuração do daemon. \n"
 "--help                : mostra esta mensagem.\n"
 "--version             : mostra o numero da versão.\n"
 
@@ -15746,9 +16798,10 @@ msgid ""
 msgstr ""
 "[--boot] [--splash]\n"
 "OPÇÕES:\n"
-"  --boot              - active para configurar o boot loader\n"
-"  --splash        - active para configurar o tema de boot\n"
-"modo por defeito: perguntar para configurar a função autologin"
+"  --boot              - permite configurar o carregador de arranque (boot "
+"loader)\n"
+"  --splash        - permite configurar o tema de arranque\n"
+"modo padrão: oferecer para configurar a função autologin"
 
 #: standalone.pm:57
 #, c-format
@@ -15757,15 +16810,15 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 "[OPÇOES] [NOME_DO_PROGRAMA]\n"
 "\n"
 "OPÇOES:\n"
 "  --help            - mostra esta mensagem de ajuda.\n"
-"  --report          - o programa deveria uma das ferramentas mandrake\n"
-"  --incident        - o programa deveria uma das ferramentas mandrake"
+"  --report          - o programa deve ser um das ferramentas mandrakelinux\n"
+"  --incident        - o programa deve ser um das ferramentas mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -15778,10 +16831,10 @@ msgid ""
 "  --wizard          - like --add"
 msgstr ""
 "[--add]\n"
-"  --add             - assistente \"adicionar uma interface de rede\"\n"
-"  --del              - assistente \"apagar uma interface de rede\"\n"
-"  --skip-wizard     - gerir conexões\n"
-"  --internet        - configurar internet\n"
+"  --add             - assistente \"adiciona um interface de rede\"\n"
+"  --del              - assistente \"apaga um interface de rede\"\n"
+"  --skip-wizard     - gere as conexões\n"
+"  --internet        - configura a internet\n"
 "  --wizard          - o mesmo que --add"
 
 #: standalone.pm:69
@@ -15793,7 +16846,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"
@@ -15802,25 +16855,25 @@ msgid ""
 "                 : and gs for ghostscript for only this one."
 msgstr ""
 "\n"
-"Aplicação para a monitorização e importação de tipos de letra\n"
+"Aplicação para importar e monitorizar os tipos de letra\n"
 "\n"
 "OPÇÕES:\n"
-"--windows_import : importa a partir de todas as partições windows.\n"
-"--xls_fonts : mostra todos os tipos de letra que já existem a partir do xls\n"
-"--strong         : verificação forte do tipo de letra.\n"
+"--windows_import : importa a partir de todas as partições windows "
+"disponiveis.\n"
+"--xls_fonts : mostra todas os tipos de letra que já existem a partir do xls\n"
 "--install        : aceita qualquer ficheiro de tipo de letra ou directoria.\n"
 "--uninstall      : desinstala qualquer tipo de letra ou directoria.\n"
-"--replace        : sobrepõe todos os tipos de letra que já existem.\n"
+"--replace        : substitui todos os tipos de letra que já existam.\n"
 "--application    : 0 nenhuma aplicação.\n"
 "                 : 1 todas as aplicações disponíveis suportadas.\n"
-"                 : nome_da_aplicação como só para staroffice \n"
-"                 : e gs para ghostscript para só estas."
+"                 : nome_da_aplicação como so para staroffice \n"
+"                 : e gs para ghostscript apenas para esta."
 
 #: standalone.pm:84
 #, 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"
@@ -15834,18 +16887,18 @@ msgid ""
 "IP, nbi image name)"
 msgstr ""
 "[OPÇÕES]...\n"
-"Configurador do Servidor de Terminais Mandrake\n"
-"--enable         : liga o STM\n"
-"--disable        : desliga o STM\n"
-"--start          : arranca o STM\n"
+"Configurador do Servidor de Terminais Mandrakelinux\n"
+"--enable         : activa o STM\n"
+"--disable        : desactiva o STM\n"
+"--start          : inicia o STM\n"
 "--stop           : pára o STM\n"
-"--adduser        : adiciona um utilizador do sistema ao STM (exige o nome do "
+"--adduser        : adiciona um utilizador do sistema ao STM (requer nome do "
 "utilizador)\n"
-"--deluser        : apaga um utilizador do sistema do STM (exige o nome do "
+"--deluser        : apaga um utilizador do sistema do STM (requer nome do "
 "utilizador)\n"
-"--addclient      : adiciona uma máquina cliente ao STM (exige os endereços "
+"--addclient      : adiciona uma máquina cliente ao STM (requer endereços "
 "MAC, IP, e o nome da imagem nbi)\n"
-"--delclient      : apaga uma máquina cliente do STM (exige os endereços MAC, "
+"--delclient      : apaga uma máquina cliente do STM (requer endereços MAC, "
 "IP, e o nome da imagem nbi)"
 
 #: standalone.pm:96
@@ -15856,7 +16909,8 @@ msgstr "[teclado]"
 #: standalone.pm:97
 #, c-format
 msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
-msgstr "[--file=meuficheiro] [--word=minhapalavra] [--explain=regexp] [--alert]"
+msgstr ""
+"[--file=meuficheiro] [--word=minhapalavra] [--explain=regexp] [--alert]"
 
 #: standalone.pm:98
 #, c-format
@@ -15872,14 +16926,14 @@ msgid ""
 "--quiet : don't be interactive. To be used with (dis)connect."
 msgstr ""
 "[OPÇÕES]\n"
-"Aplicação de controlo duma ligação Rede e Internet\n"
+"Aplicação de conexão e monitorização de uma Rede & Internet\n"
 "\n"
-"--defaultintf dispositivo : mostra este dispositivo por omissão\n"
-"--connect : liga ao internet se ainda não está ligado\n"
-"--disconnect : desliga do internet se já está ligado\n"
-"--force : utilizado com (dis)connect : força a (des)ligação.\n"
-"--status : mostra 1 se está ligado, 0 senão, e sai.\n"
-"--quiet : não é interactivo. Para utilizar com (dis)connect."
+"--defaultintf interface : mostra esta interface por omissão\n"
+"--connect : conecta à internet se ainda não estiver conectado\n"
+"--disconnect : desliga da internet se já estiver ligado\n"
+"--force : usado com (dis)connect : força a (des)conexão.\n"
+"--status : mostra 1 se está ligado, 0 caso contrário, e sai.\n"
+"--quiet : não é interactivo. Para ser usado com (dis)connect."
 
 #: standalone.pm:107
 #, c-format
@@ -15897,14 +16951,14 @@ msgid ""
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
-"[OPTION]...\n"
-"  --no-confirmation      não faz a primeira pergunta de confirmação em modo "
+"[OPÇÃO]...\n"
+"  --no-confirmation      não pede pela primeira confirmação em modo "
 "MandrakeUpdate\n"
 "  --no-verify-rpm        não verifica as assinaturas dos pacotes\n"
 "  --changelog-first      mostra o registo das mudanças antes da lista dos "
-"ficheiros na janela das descrições\n"
-"  --merge-all-rpmnew     propõe de incluir todos os ficheiros .rpmnew/."
-"rpmsave encontrados"
+"ficheiros na janela de descrições\n"
+"  --merge-all-rpmnew     propõe fundir todos os ficheiros .rpmnew/.rpmsave "
+"encontrados"
 
 #: standalone.pm:113
 #, c-format
@@ -15924,9 +16978,9 @@ msgid ""
 msgstr ""
 " [tudo]\n"
 "       XFdrake [--noauto] ecrã \n"
-"       XFdrake definição"
+"       XFdrake resolução"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -15937,108 +16991,106 @@ msgstr ""
 "Uso : %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Por favor saía e depois utilize Ctrl-Alt-BackSpace"
+msgstr "Por favor saía (log out) e depois utilize Ctrl-Alt-BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Tem que se desligar e voltar a ligar-se para tomar em conta as mudanças"
+msgstr ""
+"Precisa de sair (log out) e voltar (log in) para que as mudanças tenham "
+"efeito."
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Inútil sem Servidor de Terminais"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
-msgstr "%s: %s exige um nome de utilizador...\n"
+msgstr "%s: %s requer um nome de utilizador...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
-"%s: %s exige o nome de anfitrião, o endereço MAC, IP, nbi-image, 0/1 para "
+"%s: %s requer nome de anfitrião,endereço MAC, IP, nbi-image, 0/1 para "
 "THIN_CLIENT, 0/1 para Local Config...\n"
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
-msgstr "%s: %s exige o nome de anfitrião...\n"
-
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
+msgstr "%s: %s requer nome de anfitrião...\n"
 
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Configuração do Servidor de Terminal"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
-msgstr "Activar o servidor"
+msgstr "Activar Servidor"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
-msgstr "Desactivar o servidor"
+msgstr "Desactivar Servidor"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
-msgstr "Arrancar o Servidor"
+msgstr "Iniciar Servidor"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
-msgstr "Para o Servidor"
+msgstr "Parar Servidor"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Disquete/ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Imagens de Arranque na Rede"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
-msgstr "Adicionar/Suprimir utilizadores"
+msgstr "Adicionar/Apagar Utilizadores"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
-msgstr "Adicionar/Suprimir Clientes"
+msgstr "Adicionar/Apagar Clientes"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
-msgstr "Assistente de Primeira Vez"
+msgstr "Assistente para Primeira Vez"
 
-#: 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 "o %s está definido como dm, adicionando utilizador gdm a /etc/passwd$$CLIENT$$"
+msgstr ""
+"o %s está definido como dm, adicionando utilizador gdm a /etc/passwd$$CLIENT$"
+"$"
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -16056,10 +17108,10 @@ msgid ""
 msgstr ""
 "\n"
 " Esta rotina do assistente irá:\n"
-" \t1) Pedir-lhe que escolha entre clientes 'magros' ou 'gordos'.\n"
-"\t2) Configurar o dhcp.\n"
+" \t1) Pedir-lhe que escolha clientes 'magros' ou 'gordos'.\n"
+"\t2) Configurar DHCP.\n"
 "\t\n"
-"Depois desses passos, o assistente irá:\n"
+"Depois de executar estes passos, o assistente irá:\n"
 "\t\n"
 "    a) Compilar todos os "
 "nbis.                                                                \n"
@@ -16067,27 +17119,29 @@ msgstr ""
 "servidor.                                                          \n"
 "    c) Iniciar o "
 "servidor.                                                     \n"
-"    d) Sincronizar os ficheiros shadow para que todos os utilizadores, incluindo o root, \n"
-"       sejam adicionados ao ficheiro shadow$$CLIENT$$.                                              \n"
+"    d) Sincronizar os ficheiros shadow para que todos os utilizadores, "
+"incluindo o root, \n"
+"       sejam adicionados ao ficheiro shadow$$CLIENT$"
+"$.                                              \n"
 "    e) Pedir-lhe que faça uma disquete de arranque.\n"
-"    f) No caso dos clientes magros, pedir-lhe-á para reiniciar o KDM.\n"
+"    f) Se forem clientes 'magros', pergunta-lhe se quer reiniciar o KDM.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
-msgstr "Cancelar o assistente"
+msgstr "Cancelar Assistente"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Pff guarde a configuração do dhcpd!"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
-msgstr "Utilizar Clientes Magros"
+msgstr "Use Clientes 'Magros'"
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16095,49 +17149,55 @@ msgid ""
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
-"Por favor selecione o tipo de cliente por defeito.\n"
-"    Clientes 'magros' correm tudo a partir do CPU/RAM do servidor, utilizando o display do cliente.\n"
-"    Clientes 'gordos' utilizam o seu próprio CPU/RAM mas o sistema de ficheiros do servidor."
+"Por favor selecione o tipo de cliente padrão.\n"
+"    Clientes 'magros' correm tudo a partir do CPU/RAM do servidor, usando o "
+"display do cliente.\n"
+"    Clientes 'gordos' usam o seu próprio CPU/RAM mas o sistema de ficheiros "
+"do servidor."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr "Sincronizar as preferências do teclado do cliente X com o servidor."
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
-msgstr "Criando novas imagens de arranque para todos os kernels"
+msgstr "A criar novas imagens de arranque para todos os kernels"
 
-#: 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 "Isto vai tomar alguns minutos."
+msgstr "Isto irá levar alguns minutos."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Feito!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
-msgstr "Sincronizando a lista de utilizadores do servidor com a do cliente, incluindo o root."
+msgstr ""
+"A sincronizar a lista de utilizadores do servidor com a do cliente, "
+"incluindo o 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 "Para que as alterações feitas para os clientes magros se apliquem, o gestor de display tem de ser reiniciado. Reiniciar agora?"
+msgstr ""
+"Para activar as alterações feitas para os clientes magros, o gestor de "
+"ecrâtem que ser reiniciado. Reiniciar agora?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Apresentação do Servidor de Terminal"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16152,17 +17212,20 @@ msgid ""
 "        \tdhcpd.conf, you should create the etherboot images for at least "
 "one full kernel."
 msgstr ""
-"        - Criar Imagens de Arranque Etherboot :\n"
-"        \tPara arrancar um núcleo por etherboot, uma imagem núcleo/initrd "
+"        - Criar Imagens de Arranque Etherboot:\n"
+"        \tPara arrancar um kernel via etherboot, uma imagem kernel/initrd "
 "especial deve ser criada.\n"
-"        \tmkinitrd-net faz isso e drakTermServ é só um interface gráfico\n"
-"        \tpara ajudar a gerir/personalizar essas imagens. Para criar o\n"
-"        \tficheiro /etc/dhcpd.conf.etherboot-pcimap.include que é metido\n"
-"        \tdentro como uma inclusão em dhcpd.conf, você deveria criar as\n"
-"        \tImagens de Arranque Etherboot para pelo menos um núcleo\n"
-"        \tcompleto."
+"        \tmkinitrd-net faz a maior parte do trabalho e o drakTermServ é só o "
+"interface \n"
+"        \tgráfico para ajudar a gerir/personalizar essas imagens. Para criar "
+"o ficheiro \n"
+"        \t/etc/dhcpd.conf.etherboot-pcimap.include que é metido como um "
+"include em \n"
+"        \tdhcpd.conf, deve criar as imagens de arranque Etherboot para ao "
+"menos \n"
+"        \tum kernel complecto."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16183,21 +17246,22 @@ msgid ""
 msgstr ""
 "        - Gestão de /etc/dhcpd.conf:\n"
 "        \t\tPara os clientes que arrancam na rede, cada um precisa duma "
-"entrada no dhcpd.conf, \n"
-"        \t\tpara atribuir o endereço IP e a imagem de arranque rede da "
+"entrada em dhcpd.conf, \n"
+"        \t\ta atribuir o endereço IP e a imagem de arranque rede da "
 "máquina.\n"
-"        \t\tdrakTermServ ajuda a criar/apagar estas entradas.\n"
+"        \t\tO drakTermServ ajuda a criar/apagar estas entradas.\n"
 "\t\t\t\n"
-"        \t\t(as placas PCI podem passar-se da imagem - Etherboot vai pedir "
-"a  imagem correcta. Você deveria \n"
-"        \t\ttambém pensar que quando Etherboot procura uma imagem, ele "
-"espera nomes como\n"
-"        \t\tboot-3c59x.nbi, e não boot-3c59x.2.4.19-16mdk.nbi).\n"
+"        \t\t(as placas PCI podem omitir a imagem - Etherboot vai pedir a "
+"imagem correcta. Você deve \n"
+"        \t\ttambém considerar que quando o Etherboot procura por imagens,ele "
+"espera \n"
+"        \t\tnomes como boot-3c59x.nbi, em vez de boot-3c59x.2.4.19-16mdk."
+"nbi).\n"
 "\t\t\t \n"
 "        \t\tUma entrada típica no dhcpd.conf para aceitar um cliente sem "
-"disco :"
+"disco, parece-se com:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16208,14 +17272,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"
@@ -16235,30 +17299,32 @@ msgid ""
 "        Note: You must stop/start the server after adding or changing "
 "clients."
 msgstr ""
-"\t\t\tMesmo se pode utilizar uma zona de endereços IP, em vez de uma entrada "
-"para cada \n"
-"\t\t\tmaquina cliente, o uso de um endereço fixo facilita a utilização de "
-"ficheiros de \n"
-"\t\t\tconfiguração específicos por cliente que ClusterNFS propõe.\n"
+"\t\t\tMesmo que possa usar uma zona de endereços IP, em vez de configurar "
+"uma entrada  \n"
+"\t\t\tespecifica para uma maquina cliente, usando esquena de endereço fixo "
+"facilita usando\n"
+"\t\t\tfuncionalidade de configuração específica por cliente que o ClusterNFS "
+"fornece.\n"
 "\t\t\t\n"
-"\t\t\tNota : A entrada \"#type\" só é utilizada por drakTermServ.  Os "
+"\t\t\tNota : A entrada \"#type\" é apenas usada por drakTermServ. Os "
 "clientes podem ser \"thin\"\n"
-"\t\t\tou 'fat'.  Os clientes Thin utilizam a maioria dos programas no "
-"servidor por xdmcp, enquanto os \n"
-"\t\t\tclientes Fat lançam os programas na maquina cliente. Um inittab "
-"especial, \n"
+"\t\t\tou 'fat'.  Os clientes Thin correm a maioria do software no servidor "
+"por XDMCP, enquanto os \n"
+"\t\t\tclientes Fat correm a maior parte do software na maquina cliente. Um "
+"inittab especial, \n"
 "\t\t\t%s é\n"
 "\t\t\tcriado para os clientes Thin. Os ficheiros de configuração do sistema "
 "xdm-config, kdmrc, e gdm.conf \n"
-"\t\t\tsão modificados se são utilizados clientes magros, para activar o "
-"xdmcp. Como há problemas de \n"
-"\t\t\tsegurança com xdmcp, hosts.deny e hosts.allow são modificados para "
-"limitar o acesso à rede local.\n"
+"\t\t\tsão modificados se são usados clientes magros, para activar o XDMCP. "
+"Como há problemas de \n"
+"\t\t\tsegurança no uso de XDMCP, hosts.deny e hosts.allow são modificados "
+"para limitar \n"
+"\t\t\to acesso à subrede local.\n"
 "\t\t\t\n"
 "\t\t\tNota : É preciso reiniciar o servidor depois de adicionar ou mudar os "
 "clientes."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16276,20 +17342,20 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 "        - Gestão de /etc/exports:\n"
-"        \t\tClusternfs permite de exportar o sistema de ficheiros raíz para "
-"os clientes sem disco.\n"
-"        \t\tdrakTermServ configura a boa entrada para permitir um acesso "
-"anonimo ao sistema de ficheiros \n"
-"        \t\tda raíz aos clientes sem disco.\n"
+"        \t\tClusternfs permite exportar o sistema de ficheiros root para "
+"clientes sem disco.\n"
+"        \t\tO drakTermServ configura a entrada correcta para permitir um "
+"acesso anonimo ao \n"
+"        \t\tsistema de ficheiros root dos clientes sem disco.\n"
 "\n"
-"        \t\tUma entrada típica no exports para ClusterNFS é :\n"
+"        \t\tUma entrada de exportação típica para ClusterNFS é :\n"
 "        \t\t\n"
 "        \t/\t\t\t\t\t(ro,all_squash)\n"
 "        \t/home\t\t\t\tSUBNET/MASK(rw,root_squash)\n"
 "\t\t\t\n"
 "\t\t\tCom SUBNET/MASK definidos a partir da sua rede."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16301,12 +17367,13 @@ msgid ""
 msgstr ""
 "        - Gestão de %s:\n"
 "        \t\tPara que os utilizadores se possam ligar ao sistema a partir dum "
-"cliente sem disco, a entrada deles \n"
-"        \t\tem /etc/shadow precisa ser duplicada em %s. drakTermServ ajuda\n"
-"        \t\tnisto adicionando e apagando o utilizadores do sistema a partir "
-"deste ficheiro."
+"cliente sem disco, a sua \n"
+"        \t\tentrada em /etc/shadow precisa ser duplicada em %s. "
+"drakTermServ\n"
+"        \t\tajuda nisto ao adicionar ou remover utilizadores do sistema a "
+"partir deste ficheiro."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16317,13 +17384,14 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 "        - Ficheiro %s por cliente :\n"
-"        \t\tPor ClusterNFS, cada cliente sem disco pode ter o seu próprio "
+"        \t\tPelos ClusterNFS, cada cliente sem disco pode ter o seu único "
 "ficheiro de configuração do X \n"
-"        \t\túnico no sistema de ficheiros raíz do servidor. No futuro "
-"drakTermServ vai ajudar a criar \n"
-"        \t\teste ficheiro."
+"        \t\tno sistema de ficheiros root do servidor. Ao permitir a "
+"configuração do hardware do cliente local,\n"
+"drakTermServ irá ajudar a criar \n"
+"        \t\to drakTermServ irá ajudar a cria estes ficheiros."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16343,22 +17411,23 @@ msgid ""
 "machine is configured."
 msgstr ""
 "        - Ficheiros de configuração sistema por cliente :\n"
-"        \tPor clusternfs, cada cliente sem disco pode ter os seus próprios "
+"        \tPelos clusternfs, cada cliente sem disco pode ter o seu único "
 "ficheiros de configuração \n"
-"        \túnicos no sistema de ficheiros raíz do servidor. Ao permitir a "
-"configuração local do material,\n"
-"        \tos clientes vão poder personalizar ficheiros como /etc/modules."
-"conf, /etc/sysconfig/mouse, \n"
-"        \t/etc/sysconfig/keyboard numa base por cliente.\n"
+"        \tno sistema de ficheiros root do servidor. Ao permitir a "
+"configuração do hardware,\n"
+"        \tdo cliente local, os clientes podem personalizar ficheiros tais "
+"como /etc/modules.conf, /etc/sysconfig/mouse, \n"
+"        \t/etc/sysconfig/mouse, /etc/sysconfig/keyboard numa base por "
+"cliente.\n"
 "\n"
-"        Nota : Permitir a configuração local do material activa a ligação do "
-"root ao servidor de terminais\n"
-"        em cada máquina que tem esta opção activada.  A configuração local "
-"pode ser desactivada,\n"
-"        guardando os ficheiros de configuração, quando o cliente está "
-"configurado."
+"        Nota : Permitir a configuração local do hardware, activa o login do "
+"root no servidor de terminal\n"
+"        em cada máquina cliente que tem esta opção activada.  A configuração "
+"local pode ser,\n"
+"        desactivada, retendo os ficheiros de configuração, assim que o "
+"cliente esteja configurado."
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16368,7 +17437,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"
@@ -16388,13 +17457,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 "        - /etc/xinetd.d/tftp :\n"
-"        \t\tdrakTermServ vai configurar este ficheiro para trabalhar com as "
-"imagens criadas por \n"
-"        \t\tmkinitrd-net, e as entradas em /etc/dhcpd.conf, para enviar a "
-"imagem de arranque \n"
-"        \t\tpara cada cliente sem disco.\n"
+"        \t\to drakTermServ irá configurar este ficheiro para trabalhar em "
+"conjunto com as\n"
+"         \t\timagens criadas por mkinitrd-net, e entradas em /etc/dhcpd."
+"conf, para servir acima\n"
+"        \t\tda imagem de arranque para cada cliente sem disco.\n"
 "\n"
-"        \t\tUm ficheiro de configuração típico de tftp :\n"
+"        \t\tUm ficheiro típico de configuração TFTP :\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16412,13 +17481,13 @@ msgstr ""
 "        \t\te o caminho para /var/lib/tftpboot, onde mkinitrd-net mete as "
 "imagens."
 
-#: 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"
@@ -16429,177 +17498,178 @@ msgid ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
-"        - Criação de disquetes/CDs etherboot :\n"
-"        \tOs clientes que arrancam sem disco precisam ou de uma imagens ROM "
-"na NIC, ou de uma disquete ou CD \n"
-"        \tde arranque para iniciar a máquina.  drakTermServ irá ajudar a "
-"criar estas\n"
-"        \timagens baseando-se no NIC da máquina cliente.\n"
+"        - Criar disquetes/CDs etherboot :\n"
+"        \tAs maquinas cliente sem disco precisam de imagens ROM no NIC, ou  "
+"uma disquete\n"
+"        \tde arranque ou CD para iniciar a sequência de arranque.  O "
+"drakTermServ irá\n"
+"        \tajudar a gerar estas imagens, baseado no NIC no cliente da "
+"máquina.\n"
 "        \t\t\n"
-"        \tUm exemplo básico para criar uma disquete de arranque para uma "
+"        \tUm exemplo básico de criação duma disquete de arranque para uma "
 "3Com 3c509 manualmente :\n"
 "        \t\t\n"
 "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disquete de Arranque"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "ISO de Arranque"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Imagem PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
-msgstr "Versão do kernel por defeito"
+msgstr "Versão do kernel padrão"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
-msgstr "Construir todo o núcleo -->"
+msgstr "Compilar todo o kernel -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
-msgstr "Nenhum núcleo foi escolhido !"
+msgstr "Nenhum kernel seleccionado !"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
-msgstr "Construir uma só NIC -->"
+msgstr "Compilar um só NIC -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
-msgstr "Nenhuma placa de rede seleccionada!"
+msgstr "Nenhum NIC seleccionado!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
-msgstr "Construir todos os núcleos -->"
+msgstr "Compilar Todos os Kernels -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Apagar"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Apagar todos os NBIs"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
 " the one in the Terminal Server database.\n"
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
-"!!! Indica que a senha no sistema é diferente da senha no\n"
-"Servidor de Terminais.\n"
-"Apague/re-adicione o utilizador no Servidor de Terminais\n"
-"para permitir a ligação."
+"!!! Indica que a senha no sistema de base de dados é diferente do\n"
+"que a senha da base de dados do Servidor de Terminal.\n"
+"Apague/re-adicione o utilizador para o Servidor de Terminais\n"
+"para permitir a login/inicio de sessão."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Adicionar utilizador -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
-msgstr "<-- Suprimir Utilizador"
+msgstr "<-- Apagar Utilizador"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "tipo: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "configuraçao local : %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr ""
 "Permitir a configuração\n"
-"do material local."
+"local do hardware."
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Nenhuma imagem de arranque na rede criada!"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
-msgstr "Cliente Magro"
+msgstr "Cliente Magro(thin)"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
-msgstr "Permitir Clientes Magros"
+msgstr "Permitir Clientes Magros(thin)"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Adicionar Cliente -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "tipo: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
-msgstr "tipo: magro"
+msgstr "tipo: magro(thin)"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "configuração local : falso"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "configuração local : sim"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Editar Cliente"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
-msgstr "Desactiva a Configuração Local"
+msgstr "Desactivar Configuração Local"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
-msgstr "Suprimir Cliente"
+msgstr "Apagar Cliente"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
-msgstr "Configuração do dhcpd..."
+msgstr "Configuração dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16608,184 +17678,180 @@ msgstr ""
 "É preciso reiniciar o Gestor de Sessões para tomar em conta as mudanças. \n"
 "(service dm restart - na linha de comando)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
-msgstr "Os clientes thin não funcionarão com o autologin. Desactivar autologin?"
+msgstr ""
+"Os clientes thin não irão funcionar com o autologin. Desactivar autologin?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Todos os clientes irão usar %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
-msgstr "Subrede :"
+msgstr "Subnet:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
-msgstr "Roteiros :"
+msgstr "Routers:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
-msgstr "Máscara de Subrede"
+msgstr "Máscara de Subnet"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
-msgstr "Endereço de Broadcast :"
+msgstr "Endereço de Transmissão:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Nome do domínio:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Servidores de Nomes :"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
-msgstr "Principio da Zona IP :"
+msgstr "Inicio da extensão IP:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
-msgstr "Fim da Zona IP :"
+msgstr "Fim da extensão IP:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Anexar TS Includes à Configuração Existente"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
-msgstr "Escrever a configuração"
+msgstr "Escrever Configuração"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Configuração do Servidor dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
 "from your running system.\n"
 "You can modify as needed."
 msgstr ""
-"O maioria destes valores foram pegados\n"
-"no seu sistema actual.\n"
-"Pode mudar-los se for preciso."
+"A maior parte destes valores foram extraidos\n"
+"do seu sistema actual.\n"
+"Pode modifica-los conforme necessário."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
-msgstr "Zona de endereço IP dinâmico :"
+msgstr "Combinação de Endereço IP Dinâmico :"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
-msgstr "Insira uma disquete:"
+msgstr "Por favor, insira uma disquete:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Não consegui aceder à disquete !"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "A disquete pode ser removida agora"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
-msgstr "Nenhum leitor de disquete disponível !"
+msgstr "Nenhum drive de disquete disponível !"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "A imagem PXE é %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Erro ao escrever %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "A imagem ISO Etherboot é %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
-msgstr "Algo errou ! - Estará mkisofs instalado ?"
+msgstr "Algo correu mal! - Os mkisofs estão instalados?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
-msgstr "É preciso criar /etc/dhcpd.conf primeiro !"
+msgstr "É preciso criar primeiro /etc/dhcpd.conf"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
-msgstr "má passwd de %s no Servidor de Terminal - reescrevendo...\n"
+msgstr "má passwd %s no Servidor de Terminal - reescrever...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s não é um utilizador..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
-msgstr "%s já é um utilizador do Servidor de Terminal\n"
+msgstr "%s é já um utilizador do Servidor de Terminal\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "A adição de %s ao Servidor de Terminal falhou!\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s foi adicionado ao Servidor de Terminal\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
-msgstr "%s foi apagado...\n"
+msgstr "%s apagado...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s não encontrado...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s já está utilizado\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 e /etc/hosts.deny já estão configurados - não os mudo"
+msgstr ""
+"/etc/hosts.allow e /etc/hosts.deny já estão configurados - não alterados"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "A configuração mudou - reiniciar clusternfs/dhcpd?"
@@ -16803,7 +17869,7 @@ msgstr "Não consigo encontrar o ficheiro imagem '%s'."
 #: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
-msgstr "Configurador da auto-instalação"
+msgstr "Auto Instalar Configurador"
 
 #: standalone/drakautoinst:42
 #, c-format
@@ -16820,20 +17886,24 @@ msgid ""
 "\n"
 "Press ok to continue."
 msgstr ""
-"Está prestes a configurar uma disquete de Auto-instalação. Esta ferramenta é consideravelmente perigosa e deve ser utilizada com precaução.\n"
+"Está prestes a configurar uma disquete de Auto instalação. Esta "
+"caracteristicaé de alguma maneira perigosa e deve ser usada "
+"circunspectamente.\n"
 "\n"
-"Com isto, vai poder reproduzir a instalação que fez neste computador, "
-"sendo interactivamente questionado em alguns campos, de modo a alterar os valores dos mesmos.\n"
+"Com esta caracteristica, irá poder repetir a instalação que fez neste "
+"computador, sendo-lhe perguntado por alguns passos, para que possa mudar os "
+"seus valores.\n"
 "\n"
-"Para um máximo de segurança, as mudanças nas partições e a formatagem nunca "
-"serão feitas automaticamente, mesmo que o escolha ao instalar neste computador.\n"
+"Para uma segurança máxima, o particionamento e a formatação nunca serão "
+"executadas automáticamente, seja qualfor a escolha durante a instalaçao "
+"neste computador.\n"
 "\n"
-"Clique em ok para continuar."
+"Prima em ok para continuar."
 
 #: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
-msgstr "refazer"
+msgstr "repetir"
 
 #: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
@@ -16843,7 +17913,7 @@ msgstr "manual"
 #: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
-msgstr "Configuração das Etapas Automáticas"
+msgstr "Passos de Configuração Automáticos"
 
 #: standalone/drakautoinst:65
 #, c-format
@@ -16851,8 +17921,8 @@ msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
 msgstr ""
-"Por favor escolha para cada passo se o deseja como nesta instalação, ou "
-"feito manualmente"
+"Por favor escolha para cada passo se irá repetir como na instalação, ou se "
+"será manual"
 
 #: standalone/drakautoinst:77 standalone/drakautoinst:78
 #: standalone/drakautoinst:92
@@ -16868,7 +17938,7 @@ msgstr "Insira outra disquete vazia na drive %s (para o disco de drivers)"
 #: standalone/drakautoinst:91
 #, c-format
 msgid "Creating auto install floppy (drivers disk)"
-msgstr "Criando disquete de auto-instalação (disco de drivers)"
+msgstr "A criar disquete de auto-instalação (disco de drivers)"
 
 #: standalone/drakautoinst:158
 #, c-format
@@ -16883,8 +17953,8 @@ msgstr ""
 "\n"
 "Os parametros da auto-instalação estão disponíveis nas secções à esquerda"
 
-#: 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 "Parabéns!"
@@ -16895,23 +17965,23 @@ msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
-"A geração da disquete foi feita.\n"
-"Pode agora refazer a sua instalação."
+"A disquete foi criada com sucesso.\n"
+"Pode agora repetir a sua instalação."
 
 #: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
-msgstr "Auto Instalação"
+msgstr "Auto Instalar"
 
 #: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
-msgstr "Adicionar um elemento"
+msgstr "Adicionar um item"
 
 #: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
-msgstr "Suprimir o ultimo elemento"
+msgstr "Remover o ultimo item"
 
 #: standalone/drakbackup:88
 #, c-format
@@ -16923,171 +17993,170 @@ msgstr "hd"
 msgid "tape"
 msgstr "cassete"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Nenhum dispositivo encontrado"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
-"Expect é uma extensão dos scripts Tcl que permite sessões interactivas sem "
-"intervenção do utilizador."
+"Expect é uma extensão par a linguagem de scripts TCL que permite sessões "
+"interactivas sem intervenção do utilizador."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
-msgstr "Guardar a password deste sistema na configuração do drakbackup."
+msgstr "Guardar a password para este sistema na configuração do 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 ""
-"Para um CD multisessão, só a primeira sessão vai apagar o cdrw. Senão o cdrw "
-"vai ser apagado antes de cada operação de arquivo."
+"Para um CD multisessão, apenas a primeira sessão irá apagar o cdrw. Em "
+"contrário o cdrw é apagado antes de cada backup."
 
-#: 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 ""
-"Esta opção vai arquivar os ficheiros que mudaram. O comportamento exacto "
-"depende se utiliza o modo por incrementação ou por diferença."
+"Esta opção irá guardar ficheiros que foram alterados. O comportamento exacto "
+"depende se é usado o modo incremental ou diferencial."
 
-#: 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 ""
-"Os arquivos por incrementação só guardam os ficheiros que mudaram ou que são "
-"novos desde o último arquivo."
+"Os backups por incrementação só guardam ficheiros que mudaram ou são novos "
+"desde o último backup."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr ""
-"Backups adicionais apenas salvaguardam ficheiros que tenham sido modificados "
-"ou criados posteriormente ao backup 'base'."
+"Backups diferenciais apenas guardam ficheiros que tenham sido modificados ou "
+"são novos desde o original backup 'base'."
 
-#: 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 "Isto deveria ser um utilizador local ou um endereço de correio para o qual deseja enviar os resultados do backup. Necessitará de definir um servidor de correio funcional."
+msgstr ""
+"Isto devia ser um utilizador local ou um endereço de correio para onde quer "
+"que os resultados do backup sejam enviados. Irá precisar de definir um "
+"servidor de correio eletrônico funcional."
 
-#: 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 ""
-"Ficheiros ou wildcards referenciados num ficheiro .backupignore no topo da "
-"árvore de uma directoria não serão restaurados."
+"Ficheiros ou asteriscos listados num ficheiro .backupignore no topo de uma "
+"árvore de directórios não será salvo para bakup."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
 "moved to the other media.  Enabling this option will remove the hard drive "
 "tar files after the backup."
 msgstr ""
-"Para efectuar backups noutro tipo de média, os ficheiros são 1º criados no "
-"disco, e depois movidos para a outa média. Seleccionando esta opção os "
-"ficheiros tar serão removidos após o backup."
+"Para backups para outra media, os ficheiros serão na mesma criados no disco, "
+"e então serão movidos para essa outra media. Ao activar esta opção não irá "
+"remover os ficheiros tar do disco a seguir ao backup."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
 "than using a directory path, you would use the 'module' name for the service "
 "path."
 msgstr ""
-"Alguns protocolos, como rsync, podem ser configurados do lado do servidor.  "
-"Ao invés de utilizar um caminho de directoria, vai poder utilizar o nome do "
-"'módulo' para o caminho do serviço."
+"Alguns protocolos, como rsync, podem ser configurados no fim do servidor. do "
+"lado do servidor.  É preferivel a usar o path da directoria, deveria usar o "
+"'módulo' nome para o path do serviço."
 
-#: 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 ""
-"Personalizado permite-lhe de indicar o seu próprio dia e hora. As outras "
-"opções utilizamrun-parts em /etc/crontab."
+"Personalizado permite-lhe especificar o seu prõprio dia e hora. As outras "
+"opções usam partes executáveis em /etc/crontab."
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
-msgstr "Nenhuma mídia seleccionada para a operação cron"
+msgstr "Nenhuma media seleccionada para a operação cron"
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Nenhum intervalo seleccionado para a operação cron"
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
-msgstr "O Intervalo Cron não está disponível para usuários não-root"
+msgstr "O Intervalo Cron não está disponível para utilizadores não-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\" não é nem um e-mail válido nem um utilizador local existente!"
+msgstr "\"%s\" não é um e-mail válido nem um utilizador local existente!"
 
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
 "a complete email address!"
-msgstr "o \"%s\" é um utilizador local, porém não selecionou um smtp local, portanto terá de usar um endereço de e-mail completo!"
+msgstr ""
+"o \"%s\" é um utilizador local, mas não selecionou um smtp local, então deve "
+"usar um endereço de e-mail completo!"
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
-"A lista dos utilizadores válidos mudou, sobrecarrego o ficheiro de "
-"configuração."
+"A lista dos utilizadores válidos mudou, reescreva o ficheiro de configuração."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
-msgstr "Lista dos antigos utilizadores :\n"
+msgstr "Antiga lista de utilizadores :\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
-msgstr "Nova lista dos utilizadores :\n"
+msgstr "Nova lista de utilizadores :\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
 msgstr ""
 "\n"
-"                      Jornal do DrakBackup \n"
+"                      Relatório do DrakBackup \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 "\n"
-"                      Relatório do Demónio DrakBackup\n"
+"                      Relatório do Daemon DrakBackup\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17096,17 +18165,17 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"                    Detalhes do Jornal do DrakBackup\n"
+"                    Detalhes do Relatório do DrakBackup\n"
 "\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 "Progressão total"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17114,47 +18183,47 @@ msgid ""
 "If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
-"a chave %s existe, apagar?\n"
+"%s existe, apagar?\n"
 "\n"
-"Se já fez isto vai provavelmente ter que limpar\n"
+"Se já alguma vez fez este processo irá provavelmente ter que limpar\n"
 "a entrada das chaves autorizadas no servidor."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
-msgstr "Pode tomar um momento a criar as chaves."
+msgstr "Isto pode levar algum tempo a gerar as chaves."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
-msgstr "Impossível fazer spawn do %s."
+msgstr "Impossível fazer spawn %s."
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Nenhum pedido de senha em %s na porta %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Senha errada em %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Permissão recusada ao transferir %s para %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Não consigo encontrar %s em %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s não responde"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17164,93 +18233,93 @@ msgid ""
 "\n"
 "without being prompted for a password."
 msgstr ""
-"Consegui transferir\n"
-"Para verificar pode ligar-se ao servidor com :\n"
+"Transferência com sucesso\n"
+"Pode querer verificar se pode iniciar a sessão/login no servidor com :\n"
 "\n"
 "ssh -i %s %s@%s\n"
 "\n"
 "sem que lhe seja pedido uma senha."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
-msgstr "O servidor WebDAV distante já está a sincronizar!"
+msgstr "O servidor WebDAV remoto já está a sincronizado!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
-msgstr "O transferimento WebDAV falhou!"
+msgstr "O transferência WebDAV falhou!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
-msgstr "Nenhum CDR/DVDR no dispositivo!"
+msgstr "Nenhum CDR/DVDR no drive!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
-msgstr "Não parece ser um média que se pode gravar!"
+msgstr "Não parece ser uma media gravável!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
-msgstr "Não é um média que se pode apagar!"
+msgstr "Impossivel apagar media!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
-msgstr "Vai tomar um momento para apagar o média."
+msgstr "Isto pode levar algum tempo a apagar a media."
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
-msgstr "Problema de permissões ao aceder ao CD."
+msgstr "Problema de permissões ao aceder o CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Nenhuma cassete em %s!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
-"Quota de arquivo ultrapassado !\n"
-"%d MB utilizados sobre %d MB permitidos."
+"Quota de backup excedido!\n"
+"%d MB utilizados em %d MB permitidos."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
-msgstr "A arquivar os ficheiros do sistema..."
+msgstr "Cópia de segurança dos ficheiros do sistema..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Cópia de segurança dos ficheiros do disco rígido..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Cópia de segurança dos ficheiros do utilizador..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
-msgstr "Cópia de segurança d'outros ficheiros..."
+msgstr "Cópia de segurança de outros ficheiros..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
-msgstr "A arquivar o disco rígido..."
+msgstr "Cópia de segunrança do disco em progresso..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
-msgstr "Nenhuma mudança nos arquivos!"
+msgstr "Nenhuma alteração para backup!"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17258,10 +18327,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Drakbackup trabalha com %s:\n"
+"Actividades do Drakbackup via %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17269,20 +18338,23 @@ msgid ""
 "FTP.\n"
 msgstr ""
 "\n"
-" Problema na ligação FTP : Não foi possível enviar o seus ficheiros de "
-"arquivo por FTP.\n"
+" Problema na conexão FTP : Não foi possível enviar o seus ficheiros backup "
+"por FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
-msgid "Error during sending file via FTP. Please correct your FTP configuration."
-msgstr "Erro ao enviar os ficheiros por FTP. Por favor corrija a sua configuração FTP."
+msgid ""
+"Error during sending file via FTP. Please correct your FTP configuration."
+msgstr ""
+"Erro ao enviar os ficheiros por FTP. Por favor corrija a sua configuração "
+"FTP."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "lista dos ficheiros enviada por FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17290,10 +18362,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Operações Drakbackup por CD:\n"
+"Actividades Drakbackup via CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17301,248 +18373,252 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Operações Drakbackup por cassete:\n"
+"Actividades Drakbackup via cassete:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr "Erro ao enviar o correio. O seu correio de relatório não foi enviado."
+msgstr ""
+"Erro ao enviar correio eletrônico. O e-mail do seu relatório não foi enviado."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
-msgstr " Erro ao enviar o correio. \n"
+msgstr " Erro enquanto a enviar correio eletrônico. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Não consigo criar o catalogo!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
 "Please check all options that you need.\n"
 msgstr ""
 "\n"
-"Por favor escolha todas as opções que precise.\n"
+"Por favor marque todas as opções que precise.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
-msgid "These options can backup and restore all files in your /etc directory.\n"
-msgstr "Estas opções podem arquivar e restaurar todos os ficheiros na pasta /etc.\n"
+msgid ""
+"These options can backup and restore all files in your /etc directory.\n"
+msgstr ""
+"Estas opções podem arquivar (backup) e restaurar todos os ficheiros na "
+"directoria /etc.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
-msgstr "Arquivar os ficheiros do sistema. (pasta /etc)"
+msgstr "Arquive (backup) os ficheiros do sistema. (directoria /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 "Utilizar arquivos por incrementação (não esmaga os antigos arquivos)"
+msgstr "Usar backups com Diferencial (não substitui os backups antigos)"
 
-#: 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 "Utilizar Backups Incrementais"
+msgstr "Usar Backups com Incrementação"
 
-#: 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 "Utilizar arquivos por diferença"
+msgstr "Usar backups com Diferencial"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
-msgstr "Não incluir os ficheiros importantes (senhas, grupos, fstab)"
+msgstr "Não incluir ficheiros criticos (senhas, grupos, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr ""
 "Com esta opção vai poder restaurar qualquer versão\n"
-" da sua pasta /etc."
+" da sua directoria /etc."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
-"Por favor escolha todos os utilizadores que quer incluir na cópia de "
-"segurança."
+"Por favor marque todos os utilizadores que quer incluir na sua cópia de "
+"segurança(backup)."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
-msgstr "Não incluir o cache do navegador"
+msgstr "Não inclua a cache do browser"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
-msgstr "Escolha os ficheiros e pastas e carregue em 'OK'"
+msgstr "Escolha os ficheiros ou directorias e clique em 'OK'"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
-msgstr "Remover selecção"
+msgstr "Remover Seleccionados"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Utilizadores"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
-msgstr "Utilizar uma ligação à rede para a cópia de segurança"
+msgstr "Usar uma conexão à rede para arquivar(backup)"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
-msgstr "Método de Rede :"
+msgstr "Método Rede:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
-msgstr "Utilizar Expect para SSH"
+msgstr "Usar Expect para SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
-msgstr "Criar/Transferir senhas de arquivo para SSH"
+msgstr "Criar/Transferir senhas de backup para SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Transferir Agora"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
-msgstr "Outras chaves (não do drakbackup) já no sítio"
+msgstr "Outras chaves (não drakbackup) já estão no sítio"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Nome do anfitrião ou IP"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
-msgstr "Pasta (ou modulo) para meter o arquivo neste anfitrião."
-
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Nome de identificação"
+msgstr "Directoria (ou modulo) para meter o backup neste anfitrião."
 
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
-msgstr "Lembrar a senha"
+msgstr "Lembrar esta senha"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Preciso do nome de anfitrião, do nome do utilizador e da senha !"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
-msgstr "Utilizar CD/DVDROM para arquivar"
+msgstr "Usar CD/DVDROM para arquivar(backup)"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Escolha o dispositivo CD/DVD"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
-msgstr "Escolha o tamanho do CD/DVD"
+msgstr "Escolha o tamanho da media do CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "CD multi-sessão"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "média CDRW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
-msgstr "Apagar o média RW (1ra Sessão)"
+msgstr "Apagar o média RW (1ª Sessão)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Apagar Agora "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
-msgstr "média DVD+RW"
+msgstr "media DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
-msgstr "média DVD-R"
+msgstr "media DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "Dispositivo DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
-msgstr "Nenhum periférico CD definido !"
+msgstr "Nenhum dispositivo CD definido !"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
-msgstr "Utilizar um leitor de cassetes para arquivar"
+msgstr "Usar um leitor de cassetes para arquivar(backup)"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
-msgstr "Nome do dispositivo a utilizar para arquivar"
+msgstr "Nome do dispositivo a usar para arquivar(backup)"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "Efectuar o backup directamente para a fita"
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Não rebobinar a cassete depois do backup"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
-msgstr "Apagar a cassete antes de arquivar"
+msgstr "Apagar cassete antes de arquivar(backup)"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
-msgstr "Ejectar a cassete depois de arquivar"
+msgstr "Ejectar cassete depois de arquivar(backup)"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
-msgstr "Por favor indique a pasta onde gravar:"
+msgstr "Indique a pasta para onde gravar:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
-msgstr "Salvar no directório"
+msgstr "Directoria onde gravar"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17551,325 +18627,327 @@ msgstr ""
 "Tamanho máximo\n"
 " permitido para Drakbackup (MB)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
-msgstr "CDROM / DVDROM"
+msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disco Rígido / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
-msgstr "todas as horas"
+msgstr "horáriamente"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
-msgstr "todos os dias"
+msgstr "diáriamente"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
-msgstr "todas as semanas"
+msgstr "semanalmente"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
-msgstr "todos os meses"
+msgstr "mensalmente"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "personalizado"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Janeiro"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Fevereiro"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Março"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Abril"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Maio"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Junho"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Julho"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Agosto"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Setembro"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Outubro"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Novembro"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Dezembro"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Domingo"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
-msgstr "Segunda-feira"
+msgstr "Segunda"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
-msgstr "Terça-feira"
+msgstr "Terça"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Quinta"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Sexta"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Sábado"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
-msgstr "Utilizar um demónio"
+msgstr "Usar um daemon"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Por favor escolha o intervalo de tempo entre cada cópia de segurança"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Entrada crontab personalizada :"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Minuto"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Hora"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Dia"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Mês"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Dia da Semana"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
-msgstr "Por favor escolha o média a utilizar para arquivar."
+msgstr "Por favor escolha a media a usar para arquivar(backup)."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
-msgstr "Assegure-se que o demónio cron esta incluído nos seus serviços."
+msgstr "Assegure-se que o daemon cron está incluído nos seus serviços."
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
-msgstr "Note que por agora todos os médias 'rede' também utilizam o disco rígido."
+msgstr "Note que por agora todos os médias 'rede' também usam o disco rígido."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Por favor escolha o tipo de compressão"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
-msgstr "Utilizar os ficheiros .backupignore"
+msgstr "Usar os ficheiros .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
-msgstr "Enviar um resumo por correio após cada operação para :"
+msgstr "Enviar por correio eletrônico o relatório após cada backup para:"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
-msgstr "Servidor SMTP para o correio:"
+msgstr "Servidor SMTP para correio eletrônico:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
-msgstr "Apagar os ficheiros tar no disco rígido depois de arquivar noutro média."
+msgstr ""
+"Apagar os ficheiros tar no disco rígido depois de arquivar(backup) a outra "
+"media."
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "O quê"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Onde"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Quando"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Mais Opções"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Destino do backup não configurado..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Configuração de Drakbackup"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
-msgstr "Por favor escolha onde quer fazer a cópia de segurança"
+msgstr "Por favor escolha onde quer fazer a cópia de segurança (backup)"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
-msgstr "Disco Rígido utilizado para preparar os backups para todas as mídias."
+msgstr "Disco Rígido usado para preparar backups para todas as medias."
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "Através da Rede"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
-msgstr "no CDROM"
+msgstr "No CD-R"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
-msgstr "no dispositivo Cassete"
+msgstr "No Dispositivo Gravador (cassetes)"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
-msgstr "Arquiva os Utilizadores"
+msgstr "Backup dos Utilizadores"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
-msgstr " (Por omissão é todos os utilizadores)"
+msgstr " (Padrão é todos os utilizadores)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
-msgstr "Por favor escolha o que quer na cópia de segurança"
+msgstr "Por favor escolha o que quer arquivar(backup)"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
-msgstr "Cópia de segurança do sistema"
+msgstr "Backup do sistema"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Escolher o utilizador manualmente"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
-msgstr "Por favor escolha os dados que quer na cópia de segurança..."
+msgstr "Por favor escolha que dados quer arquivar(backup)..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 "\n"
-"Fontes de Arquivo : \n"
+"Backup das Fontes (Sources): \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
 "- System Files:\n"
 msgstr ""
 "\n"
-"- Ficheiros do sistema :\n"
+"- Ficheiros do Sistema :\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -17878,7 +18956,7 @@ msgstr ""
 "\n"
 "- Ficheiros dos Utilizadores :\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -17887,7 +18965,7 @@ msgstr ""
 "\n"
 "- Outros Ficheiros:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -17896,69 +18974,64 @@ msgstr ""
 "\n"
 "- Grava no Disco Rígido no caminho : %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tLimitar a utilização do disco em %s MB\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 "\n"
-"- Apagar os ficheiros tar no disco rígido depois de arquivar.\n"
+"- Apagar os ficheiros tar no disco rígido depois de arquivar(backup).\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NÃO"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "SIM"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 "\n"
-"- Grava no CD"
+"- Gravar no 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 "no dispositivo : %s"
+msgstr " no dispositivo: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (multi-sessão)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 "\n"
-"- Grava na cassete no dispositivo : %s"
+"- Grava para a cassete no dispositivo : %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tApaga=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\t Arquivar/Backup directamente para a fita\n"
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -17967,7 +19040,7 @@ msgstr ""
 "\n"
 "- Grava por %s no anfitrião : %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17976,7 +19049,7 @@ msgstr ""
 "\t\t nome do utilizador : %s\n"
 "\t\t no caminho : %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -17985,91 +19058,91 @@ msgstr ""
 "\n"
 "- Opções:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tNão incluir os ficheiros do sistema\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
-msgstr "\tOs arquivos utilizam tar e bzip2\n"
+msgstr "\tOs arquivos/backups usam tar e bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
-msgstr "\tOs arquivos utilizam tar e gzip\n"
+msgstr "\tOs arquivos/backup usam tar e gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
-msgstr "\tOs backups apenas utilizam tar\n"
+msgstr "\tOs arquivos/backups apenas usam tar\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
-msgstr "\tUtilizar os ficheiros .backupignore\n"
+msgstr "\tUsar os ficheiros .backupignore\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
-msgstr "\tEnviar o correio para %s\n"
+msgstr "\tEnviar correio eletrônico para %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "\tUtilizando servidor SMTP %s\n"
+msgstr "\tUsando servidor SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 "\n"
-"- Demónio, %s por :\n"
+"- Daemon, %s por :\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disco Rígido.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Cassete \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Rede por FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Rede por SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Rede por rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Rede por webdav.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "Nenhuma configuração, carregue por favor em Assistente ou Avançado.\n"
+msgstr "Nenhuma configuração, por favor clique em Assistente ou Avançado.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18078,780 +19151,787 @@ msgstr ""
 "Lista dos dados a restaurar :\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Restaurar Ficheiros do Sistema.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - da data: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Restaurar Ficheiros dos Utilizadores: \n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Restaurar Outros Ficheiros: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
-"Lista dos dados estragados :\n"
+"Lista dos dados danificados:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
-msgstr "Por favor desligue ou suprima-o na próxima vez."
+msgstr "Por favor desmarque ou remova-o na próxima vez."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
-msgstr "Os ficheiros arquivados estão estragados"
+msgstr "Os ficheiros arquivados/backup estão danificados"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Todos os dados seleccionados foram          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
-msgstr "          Bem Restaurada em %s       "
+msgid "          Successfully Restored on %s       "
+msgstr "          Restaurado com Sucesso em %s       "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Restaurar Configuração       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "OK para restaurar os outros ficheiros."
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
-"Lista dos utilizadores a restaurar (só a data mais recente por utilizador é "
-"importante)"
+"Lista dos utilizadores a restaurar (só os dados mais recentes por utilizador "
+"são importantes)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
-msgstr "Por favor seleccione os dados a restaurar:"
+msgstr "Por favor escolha os dados a restaurar:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Restaurar a partir do Disco Rígido."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
-msgstr "Indique a pasta onde os arquivos são gravados"
+msgstr "Indique a pasta onde os arquivos/backups são gravados"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
-msgstr "Directório com backups"
+msgstr "Pasta com backups"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
-msgstr "Escolha outro média de onde restaurar"
+msgstr "Escolha outra media para onde restaurar"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
-msgstr "Outro Média"
+msgstr "Outra Media"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
-msgstr "Restaurar o sistema"
+msgstr "Restaurar Sistema"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
-msgstr "Restaurar os Utilizadores"
+msgstr "Restaurar Utilizadores"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
-msgstr "Restaurar os Outros"
+msgstr "Restaurar Outros"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
-msgstr "escolha o caminho onde restaurar (no lugar de /)"
+msgstr "Escolha o caminho onde restaurar (em vez de /)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
-msgstr "Restaurar a partir da directoria"
+msgstr "Camicho para onde Restaurar"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
-msgstr "Arquivar de novo antes de restaurar (só para os arquivos por incrementação)"
+msgstr ""
+"Faça novo arquiv/backup antes de restaurar (apenas para os arquivos por "
+"incrementação)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
-msgstr "Apagar as pastas do usuários antes de restaurar."
+msgstr "Remover as pastas do utilizador de restaurar."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "Subcadeia do texto a encontrar no nome de ficheiro (cadeia em branco encontra tudo):"
+msgstr ""
+"String do texto do nome do fiehciro a procurar por (string vazia combina com "
+"tudo):"
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
-msgstr "Procurar nos Arquivos"
+msgstr "Procurar Arquivos/Backups"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Nenhum resultado encontrado..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
-msgstr "Restaurar os Seleccionados"
+msgstr "Restaurar Seleccionados"
 
-#: 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 ""
-"Clique em data/hora para ver os ficheiros de backup.\n"
-"Ctrl-Clique nos ficheiros para selecionar vários."
+"Clique em data/hora para ver os ficheiros backup.\n"
+"Ctrl-Clique nos ficheiros para selecionar vários ficheiros."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
-"Restaurar a Zona do\n"
+"Restaurar Entrada de\n"
 "Catalogo Seleccionada"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr ""
-"Restaurar os Ficheiros\n"
+"Restaurar Ficheiros\n"
 "Seleccionados"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
-msgstr "Guardar o ficheiros não encontrados em %s"
+msgstr "Arquivar/BAckup ficheiros não encontrados em %s"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
-msgstr "Restaurar a partir do CD"
+msgstr "Restaurar do CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
-"Insira o CD cujo nome é %s\n"
-" no leitor de CD montado em /mnt/cdrom"
+"Insira o CD com a etiqueta %s\n"
+" no drive de CD no ponto de montagem /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
-msgstr "Não é o bom nome de CD. O disco chama-se %s."
+msgstr "Não é a etiqueta de CD correcta. O disco é rotulado de %s."
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
-msgstr "Restaurar a partir duma Cassete"
+msgstr "Restaurar da Cassete"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
-"Insira a cassete cujo nome é %s\n"
-" no dispositivo leitor %s"
+"Insira a cassete com a etiqueta %s\n"
+" no drive leitor de cassetes %s"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
-msgstr "Não é o bom nome de cassete. A cassete chama-se %s."
+msgstr "Não é a etiqueta/cassete correcta. A cassete está etiquetada por %s."
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
-msgstr "Restaurar pela Rede"
+msgstr "Restaurar Via Rede"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
-msgstr "Restaurar Pelo Protocolo de Rede : %s"
+msgstr "Restaurar Via Protocolo de Rede: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Nome de Anfitrião"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Caminho do Anfitrião ou Modulo"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
-msgstr "Senha necessária"
+msgstr "Requer Senha"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
-msgstr "Nome de utilizador requiso"
+msgstr "Requer Nome de utilizador"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
-msgstr "Anfitrião requiso"
+msgstr "Requer Nome de Anfitrião"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
-msgstr "Caminho ou Modulo exigidos"
+msgstr "Requer Caminho ou Modulo"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Ficheiros Restaurados..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
-msgstr "A restauração falhou"
+msgstr "Restauração Falhada"
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s não encontrado..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
-msgstr "Procurar os ficheiros a restaurar"
+msgstr "Procurar os ficheiros para restaurar"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
-msgstr "Restaurar todos os arquivos"
+msgstr "Restaurar todos os arquivos/backups"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Restauração Personalizada"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Restaurar a partir do Catálogo"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
-msgstr "Impossível de encontrar os dados a restaurar...\n"
+msgstr "Não consegue encontrar os backups para restaurar...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
-msgstr "Verifique que %s é o caminho exacto"
+msgstr "Verifique que %s é o caminho correcto"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
-msgstr " e o CD está no leitor"
+msgstr " e o CD está no drive"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
-msgstr "Arquivos num média não montável. - Utilize catálogo para restaurar"
+msgstr "Backups em média não montável. - Use o catálogo para restaurar"
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD no sitio - continue."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
-msgstr "Navegar para um novo sitio de restauração."
+msgstr "Procure um novo repositório de restauração."
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
-msgstr "Restaurar a partir do directório"
+msgstr "Pasta de onde Restaurar"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Progressão da Restauração"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Gravar"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
-msgstr "Construir a cópia de segurança"
+msgstr "Construir arquivo/backup"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Restaurar"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
-msgstr "Os seguintes pacotes precisam de ser instalados :\n"
+msgstr "Os seguintes pacotes precisam ser instalados :\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Por favor escolha os dados a restaurar..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
-msgstr "Arquivar os ficheiros do sistema"
+msgstr "Arquivar/Backup os ficheiros do sistema"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
-msgstr "Cópia de segurança dos ficheiros dos utilizadores"
+msgstr "Arquivo/Backup dos ficheiros dos utilizadores"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
-msgstr "Cópia de segurança dos outros ficheiros"
+msgstr "Arquivo/Backup dos outros ficheiros"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Progressão Total"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
-msgstr "A enviar os ficheiros por FTP"
+msgstr "A enviar ficheiros por FTP"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
-msgstr "A enviar os ficheiros..."
+msgstr "A enviar ficheiros..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
-msgstr "Fazer uma cópia de segurança agora a partir do ficheiro de configuração"
+msgstr "Arquivar/Backup agora a partir do ficheiro de configuração"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
-msgstr "Ver a configuração da cópia de segurança"
+msgstr "Ver Configuração do Arquivo/Backup"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Assistente de Configuração"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Configuração Avançada"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Ver Configuração"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
-msgstr "Ver o último registo"
+msgstr "Ver Último Registo"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Arquivar agora"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 "Nenhum ficheiro de configuração encontrado \n"
-"Por favor carregue em Assistente ou Avançado."
+"Por favor clique em Assistente ou Avançado."
 
-#: 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 "Escolha do tema do arranque gráfico"
+msgstr "Selecção do tema de arranque gráfico"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Modo do 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 "/_Ficheiro"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Ficheiro/_Sair"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
-msgstr "<control>S"
+msgstr "<control>Q"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Instalar temas"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Criar um novo tema"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
-msgstr "Utilizar arranque gráfico"
+msgstr "Usar arranque gráfico"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
-msgstr "O seu gestor de arranque não se encontra no modo framebuffer. Para activar o arranque gráfico, selecione um modo de vídeo gráfico a partir do utilitário de configuração do gestor de arranque."
+msgstr ""
+"O seu gestor de arranque não se encontra no modo framebuffer. Para activar o "
+"arranque gráfico, selecione o modo de vídeo gráfico a partir do utilitário "
+"de configuração do gestor de arranque."
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Quere-o configurar agora ?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Tema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
 "under console"
 msgstr ""
-"Mostrar o tema na\n"
-"linha de commando"
+"Mostrar o tema\n"
+"sob a consola"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
-msgstr "Iniciar o Ambiente Gráfico na inicialização"
+msgstr "Execute o Ambiente Gráfico quando o seu sistema iniciar"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
-msgstr "Não, eu não quero autoligação"
+msgstr "Não, eu não quero autologin"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Sim, eu quero autoligação com este (utilizador, ambiente de trabalho)"
+msgstr "Sim, eu quero autologin com este (utilizador, ambiente de trabalho)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
-msgstr "Utilizador por omissão"
+msgstr "Utilizador padrão"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
-msgstr "Ecrã por omissão"
-
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "A Instalação do %s falhou. Ocorreram os seguintes erros:"
+msgstr "Ecrã padrão"
 
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
-"Para comunicar um erro, carregue no botão erro.\n"
-"Isto vai abrir uma janela de navegador web em %s\n"
-"onde vai encontrar um formulario a preencher. As informações indicadas "
-"acima \n"
-"vão ser transferidas a este servidor."
+"Por favor escolha o modo video, será aplicado para cada uma das entradas de "
+"arranque,\n"
+"escolhidas em baixo.\n"
+"Certifique-se que a sua placa de video suporta o modo escolhido."
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Ferramenta Mandrake para Comunicar Erros"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Ferramenta Mandrakelinux para Reportar Erros"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Centro de Controlo Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Centro de Controlo Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Ferramenta de sincronização"
 
-#: 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 "Ferramentas exteriores"
+msgstr "Ferramentas Autônomas"
 
-#: 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 Em Linha"
+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 "Controlo Remoto"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
-msgstr "Gestor de Pacotes"
+msgstr "Gestor de Software"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Ferramenta de Migração 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 "Assistentes de Configuração"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-"Para comunicar um erro, carregue no botão erro, que vai abrir uma janela do\n"
-"navegador web por omissão em Anthill onde vai poder enviar as informações\n"
-"indicadas acima como uma comunicação de erro."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Aplicação:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Pacote: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
-msgstr "Núcleo :"
+msgstr "Kernel:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Versão: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
 "or Full Path:"
 msgstr ""
-"Nome do Programa\n"
+"Nome da Aplicação\n"
 "ou Caminho Completo :"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
-msgstr "Encontrar Pacote"
+msgstr "Procurar Pacote"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
-msgstr "Sumário : "
+msgstr "Sumário: "
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
-msgstr "O SEU TEXTO AQUI"
+msgid "Bug Description/System Information"
+msgstr "Descrição do Erro/Informação do Sistema"
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
-msgstr "Descrição do Erro/Informações sobre o Sistema"
+msgid "YOUR TEXT HERE"
+msgstr "O SEU TEXTO AQUI"
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
-msgstr "Enviar a versão do núcleo"
+msgstr "Submeter a versão do kernel"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
-msgstr "Enviar cpuinfo"
+msgstr "Submeter cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
-msgstr "Enviar lspci"
+msgstr "Submeter lspci"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"Para submeter o relário de um erro, click no botão de reportar.\n"
+"Isto irá abrir uma janela do web browser em %s\n"
+"onde irá encontrar um formulario a preencher. As informações mostradas "
+"acima \n"
+"serão transferidas para este servidor."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
-msgstr "Detalhes"
+msgstr "Relato"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Não instalado"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Pacote não instalado"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "NÃO ENCONTRADO"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
-msgstr "a ligar-se a %s ..."
+msgid "connecting to %s..."
+msgstr "a conectar-se a %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
-msgstr "Nenhum navegador disponível! Instale um por favor"
+msgstr "Nenhum browser disponível! Por favor instale um"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
-msgstr "Por favor indique um nome de pacote."
+msgstr "Por favor digite um nome de pacote."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
-msgstr "Por favor escreva o texto de resumo."
+msgstr "Por favor digite o texto do sumário."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "não definido"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Alterar Fuso Horário"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Fuso Horário - 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 "O relógio do hardware está com hora GMT?"
+msgstr "O relógio do hardware está definido com hora GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Protocolo Horário de Rede (NTP)"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -18860,50 +19940,55 @@ msgstr ""
 "O seu computador pode sincronizar o relógio\n"
 "com um servidor horário remoto usando NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Activar Protocolo Horário de Rede"
 
-#: 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 "Não pode sincronizar com %s."
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
-msgstr "Reset"
+msgstr "Restaurar"
 
-#: 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 ""
-"É necessário instalar o pacote ntp \n"
+"Precisamos instalar o pacote ntp \n"
 "para activar o Protocolo Horário de Rede\n"
 "\n"
 "Deseja instalar o pacote ntp ?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Configuração de Rede (%d adaptadores)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
-msgstr "Ponte:"
+msgstr "Gateway:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interface:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Espere por favor"
@@ -18913,12 +19998,8 @@ msgstr "Espere por favor"
 msgid "Interface"
 msgstr "Interface"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Driver"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Estado"
@@ -18926,14 +20007,14 @@ msgstr "Estado"
 #: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
-msgstr "Anfitrião: "
+msgstr "Hostname: "
 
 #: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
-msgstr "Configurar o nome de anfitrião..."
+msgstr "Configurar o nome de anfitrião (hostname)..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Configuração LAN"
@@ -18943,8 +20024,8 @@ msgstr "Configuração LAN"
 msgid "Configure Local Area Network..."
 msgstr "Configurar Rede de Área Local..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
@@ -18954,431 +20035,472 @@ msgstr "Aplicar"
 msgid "Manage connections"
 msgstr "Gerir conexões"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Dispositivo seleccionado"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "Configuração do IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Servidores DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Procurar Domínio"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "estático"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Metrico"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
-msgstr "Controlo do fluxo"
+msgstr "Controle do fluxo"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
-msgstr "Término da linha"
+msgstr "Términação da linha"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
-msgstr "Tempo limite do modem"
+msgstr "Intervalo de tempo do modem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
-msgstr "Utilizar ficheiro de bloqueio"
+msgstr "Usar ficheiro lock"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Aguardar pelo tom de chamada antes de marcar"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "Espera ocupada"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Som do modem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Activar"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Desactivar"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Classe Média"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Nome do Módulo"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Endereço 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 "sitio no bus"
+msgstr "Posição no 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 "
 "hardware configuration tool."
 msgstr ""
-"Nenhum adaptador de rede foi encontrado no seu sistema. Por favor execute a "
-"ferramenta de configuração de hardware."
+"Nenhum adaptador de rede ethernet foi detectado no seu sistema. Por favor "
+"execute a ferramenta de configuração de hardware."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
-msgstr "Remover uma interface de rede"
+msgstr "Remova uma interface de rede"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Escolha a interface de rede a remover:"
 
-#: 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 ""
-"Ocorreu um problema ao apagar a interface de rede \"%s\":\n"
+"Ocorreu um arro ao apagar a interface de rede \"%s\":\n"
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
-msgid "Congratulations, the \"%s\" network interface has been succesfully deleted"
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Parabéns, a interface de rede \"%s\" foi apagada com sucesso"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr "Nenhum IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Nenhuma máscara"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "cima"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "baixo"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
-msgstr "Ligado"
+msgstr "Conectado"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
-msgstr "Não ligado"
+msgstr "Não conectado"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
-msgstr "Desligar..."
+msgstr "Desconectar..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
-msgstr "Ligar..."
+msgstr "Conectar..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
-msgstr "Cuidado, outra ligação Internet foi detectada, talvez usando a sua rede"
+msgstr ""
+"Cuidado, foi detectada outra conexão Internet, talvez a usar a sua rede"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Desactivar agora"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Activar agora"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 "Não tem nenhum interface configurado.\n"
-"Para configurar primeiro clique em 'Configurar'"
+"Configure-os primeiro ao clicar em 'Configurar'"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Configuração LAN"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adaptador %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocolo de Arranque"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
-msgstr "Iniciado ao arrancar"
+msgstr "Iniciado no arranque"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
-"Este interface ainda não foi configurada.\n"
-"Utilize o assistente \"Add an interface\" a partir do Centro de Controlo Mandrake"
+"Este interface ainda não foi configurado.\n"
+"Use o assistente \"Adicionar um interface\" a partir do Centro de Controlo "
+"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 ""
-"Não tem nenhuma ligação à Internet configurada.\n"
-"Por favor corra \"Internet access\" no centro de controlo."
+"Não tem qualquer conexão Internet configurada.\n"
+"Execute o assistente \"Adicionar uma conexão\" a partir do Centro de "
+"Controlo Mandrakelinux"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
-msgstr "Configuração da Ligação à Internet"
+msgstr "Configuração da conexão internet"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
-msgstr "Servidor DNS terciário (opcional)"
+msgstr "Terceiro Servidor DNS (opcional)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
-msgstr "Configuração da Ligação à Internet"
+msgstr "Configuração da Conexão Internet"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Acesso Internet"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
-msgstr "Tipo de Ligação:"
+msgstr "Tipo de conexão:"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Estado:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (GNOME Display Manager)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (KDE Display Manager)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Mandrakelinux Display Manager)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X Display Manager)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "A escolher um gestor de ecrã"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
 "into your system with the X Window System running and supports running\n"
 "several different X sessions on your local machine at the same time."
 msgstr ""
-"O Gestor de Ecrã X11 permite-lhe de ligar-se graficamente\n"
-"ao seu sistema com o sistema X Window lançado e permite de ter\n"
-"várias sessoes X diferentes na sua máquina local ao mesmo tempo."
+"O Gestor de Ecrã X11 permite-lhe ligar-se graficamente\n"
+"ao seu sistema com o sistema X Window lançado e suporta executar várias\n"
+"sessoes X diferentes na sua máquina local ao mesmo tempo."
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
-msgstr "A mudança foi feita, deseja reiniciar o serviço dm ?"
+msgid "The change is done, do you want to restart the dm service?"
+msgstr "A alteração foi feita, deseja reiniciar o serviço 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 ""
+"Irá fechar todos os programas activos e perder a sua sessão actual. Tem "
+"certeza que quer reiniciar o serviço dm ?"
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Criação de disquete de arranque"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Geral"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Dispositivo"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
-msgstr "Versão do núcleo"
+msgstr "Versão do kernel"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Preferências"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Preferências avançadas"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Tamanho"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Argumentos opcionais do mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "forçar"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "omitir módulos raid"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "se necessário"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "omitir módulos scsi"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Adicionar um módulo"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Remover um módulo"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
-msgstr "Verifique que há um média no dispositivo %s"
+msgstr "Certifique-se que uma media está presente para o dispositivo %s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
-"Não há nenhum média ou ele está protegido em escritura no dispositivo %s.\n"
-"Por favor meta algum."
+"Não há nenhuma media ou ele está protegida contra escrita para o dispositivo "
+"%s.\n"
+"Por favor insira um."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
-msgstr "Incapaz de forcar: %s"
+msgstr "Incapaz de bifurcar: %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
-msgstr "Criação da disquete feita"
+msgstr "Criação de disquete completa"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
-msgstr "A criação da disquete de arranque acabou bem \n"
+msgstr "A criação da disquete de arranque foi completa com sucesso \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"
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 msgstr ""
-"Incapaz de fechar bem mkbootdisk:\n"
+"Incapaz de fechar correctamente mkbootdisk:\n"
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
 #: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
-msgstr "Procurar as fontes instaladas"
+msgstr "Procurar os tipos de letra instalados"
 
 #: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
-msgstr "Deseleccionar as fontes instaladas"
+msgstr "Desmarque os tipos de letra instalados"
 
 #: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
-msgstr "percorrer todas as fontes"
+msgstr "analisar todos os tipos de letra"
 
 #: standalone/drakfont:210
 #, c-format
 msgid "No fonts found"
-msgstr "Não foram encontradas fontes"
+msgstr "Nenhum tipo de letra encontrado"
 
 #: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
 #: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
@@ -19390,37 +20512,38 @@ msgstr "feito"
 #: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
-msgstr "Não foi encontrada nenhuma fonte nas suas partições montadas"
+msgstr ""
+"Não conseguiu encontrar nenhum tipo de letra nas suas partições montadas"
 
 #: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
-msgstr "Re-seleccionar as polícias correctas"
+msgstr "Re-seleccionar os correctos tipos de letra"
 
 #: standalone/drakfont:259
 #, c-format
 msgid "Could not find any font.\n"
-msgstr "Não foi encontrada nenhuma fonte.\n"
+msgstr "Não conseguiu encontrar nenhum tipo de letra.\n"
 
 #: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
-msgstr "Procura polícias na lista das instaladas"
+msgstr "Procura tipos de letra na lista instalada"
 
 #: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
-msgstr "conversão das polícias %s"
+msgstr "conversão dos tipos de letra %s"
 
 #: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
-msgstr "Cópia de polícias"
+msgstr "Cópia dos tipos de letra"
 
 #: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
-msgstr "Instalação das polícias True Type"
+msgstr "Instalação de tipos de letra True Type"
 
 #: standalone/drakfont:333
 #, c-format
@@ -19430,37 +20553,37 @@ msgstr "por favor aguarde enquanto ttmkfdir..."
 #: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
-msgstr "Instalação de True Type feita"
+msgstr "Instalação do tipo de letra True Type feita"
 
 #: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
-msgstr "construção de type1inst"
+msgstr "compilar de type1inst"
 
 #: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
-msgstr "Referencia no Ghostscript"
+msgstr "Referenciar Ghostscript"
 
 #: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
-msgstr "Apagar os ficheiros temporários"
+msgstr "Suprimir Ficheiros Temporários"
 
 #: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
-msgstr "Relançar XFS"
+msgstr "Reiniciar XFS"
 
 #: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
-msgstr "Apagar os Ficheiros de Polícia"
+msgstr "Suprimir os Ficheiros dos Tipos de Letra"
 
 #: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
-msgstr "relançar xfs"
+msgstr "reiniciar xfs"
 
 #: standalone/drakfont:428
 #, c-format
@@ -19471,11 +20594,11 @@ msgid ""
 "-You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"Antes de instalar qualquer polícia, assegure-se que tem o direito de a usar "
-"e de a instalar no seu sistema.\n"
+"Antes de instalar qualquer tipo de letra, certifique-se que tem o direito de "
+"as usar e instalar no seu sistema.\n"
 "\n"
-"-Você pode instalar as fontes de maneira normal. Em casos raros, fontes "
-"erradas podem bloquear o servidor X."
+"-Pode instalar os tipos de letra de maneira normal. Em raros casos, tipos de "
+"letras falsas podem bloquear o servidor do X."
 
 #: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
@@ -19485,14 +20608,14 @@ msgstr "DrakFont"
 #: standalone/drakfont:487
 #, c-format
 msgid "Font List"
-msgstr "Lista das Polícias"
+msgstr "Lista dos Tipos de Letra"
 
 #: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "Acerca de"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Desinstalar"
@@ -19502,10 +20625,11 @@ msgstr "Desinstalar"
 msgid "Import"
 msgstr "Importar"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19514,7 +20638,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Copyright (C) 2001-2002 por MandrakeSoft \n"
+"Copyright © 2001-2002 por Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (versão original)\n"
@@ -19523,7 +20647,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"
@@ -19542,22 +20666,23 @@ msgid ""
 " along with this program; if not, write to the Free Software\n"
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-" Este programa é livre; pode redistribui-lo e/ou modificá-lo sob os\n"
-" termos da licença GNU GPL como publicada pela Free Sofware\n"
-"Foundation, seja na versão 2, seja numa versão posterior (à sua escolha).\n"
+" Este programa é software livre; pode redistribui-lo e/ou modificá-lo sob "
+"os\n"
+" termos da licença GNU GPL como publicada pela Fundação Free Sofware;\n"
+" seja na versão 2 ou (como optar) qualquer versão posterior.\n"
 "\n"
 "\n"
-" Este programa é distribuído com o objectivo de ser útil, mas sem\n"
-" NENHUMA GARANTIA; mesmo sem a garantia implícita de VENDA ou de\n"
-" ADEQUAÇÃO A QUALQUER COISA.  Veja a licença GNU General Public\n"
+" Este programa é distribuído na esperança que irá ser útil, mas SEM\n"
+" QUALQUER GARANTIA; mesmo sem a garantia implícita de VENDA ou de\n"
+" ADEQUAÇÃO A QUALQUER PORPÓSITO.  Veja a licença GNU General Public\n"
 "License para mais detalhes.\n"
 "\n"
 "\n"
-" Você deve ter recebido uma cópia da licença GNU GPL com este\n"
-"programa; se não, escreva à Free Software Foundation, Inc.,\n"
+" Deve ter recebido uma cópia da licença GNU GPL com este programa;\n"
+" se não, escreva para Free Software Foundation, Inc.,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19578,22 +20703,23 @@ msgstr ""
 "\n"
 "    -  pfm2afm:   \n"
 "\t por Ken Borgendale:\n"
-"\t    Converte um ficheiro .pfm de Windows para um ficheiro .afm (Adobe Font Metrics)\n"
+"\t    Converte um ficheiro .pfm Windows para um ficheiro .afm (Adobe Font "
+"Metrics)\n"
 "\n"
 "    -  type1inst:\n"
 "\t por James Macnicol: \n"
-"\t    o type1inst produz ficheiros fonts.dir fonts.scale & Fontmap.\n"
+"\t    o type1inst gera ficheiros fonts.dir fonts.scale & Fontmap.\n"
 "\n"
 "    -  ttf2pt1:   \n"
 "\t  por Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
-"             Converte ficheiros de fonte ttf para fontes afm e pfb\n"
+"             Converte ficheiros de tipos de letra ttf para afm e pfb\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
-msgstr "Escolha os programas que vão aceitar as polícias :"
+msgstr "Escolha as aplicações que irão suportar os tipos de letra:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19602,173 +20728,178 @@ msgid ""
 "You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"Antes de instalar qualquer fonte, assegure-se de que tem o direito de a usar "
-"e de a instalar no seu sistema.\n"
+"Antes de instalar qualquer tipo de letra, certifique-se que tem o direito de "
+"uso e instalar estes tipos de letra no seu sistema.\n"
 "\n"
-"Pode instalar as fontes de maneira normal. Em casos raros, fontes "
-"erradas podem bloquear o servidor X."
+"Pode instalar os tipos de letra de uma maneira normal. Em raros casos tipos "
+"de letra falsos podem bloquear o servidor do 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 "Impressoras Genéricas"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
-msgstr "Escolha o ficheiro de polícia e carregue em 'Adicionar'"
+msgstr "Escolha o ficheiro dos tipos de letra e clique em 'Adicionar'"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Selecção de Ficheiros"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
-msgstr "Não escolheu nenhum tipo de letra"
+msgstr "Não escolheu qualquer tipo de letra"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
-msgstr "Importar fontes"
+msgstr "Importar tipos de letra"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
-msgstr "Instalar fontes"
+msgstr "Instalar tipos de letra"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
-msgstr "carregue aqui se tem a certeza."
+msgstr "clique aqui se tem certeza."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "aqui se não."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
-msgstr "Deseleccionar Tudo"
+msgstr "Desmarcar Tudo"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Seleccionar Tudo"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
-msgstr "Suprimir a lista"
+msgstr "Remover Lista"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
-msgstr "Importando fontes"
+msgstr "Importar tipos de letra"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Testes iniciais"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
-msgstr "Cópia das polícias no seu sistema"
+msgstr "Copiar tipos de letra no seu sistema"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
-msgstr "Instalar e converter polícias"
+msgstr "Instalar & converter tipos de letra"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Pós-instalação"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
-msgstr "Remover as fontes do seu sistema"
+msgstr "Remover tipos de letra no seu sistema"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
-msgstr "Pós-supressão"
+msgstr "Pós Desinstalação"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
-msgstr "Partilha da Ligação à Internet"
+msgstr "Partilha da Conexão Internet"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "A Partilha da Ligação à Internet está actualmente desactivada"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Desculpe, só suportamos versões do kernel superiores ou iguais a 2.4."
 
 #: standalone/drakgw:125
 #, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr "A Partilha da Conexão Internet está actualmente desactivada"
+
+#: standalone/drakgw:126
+#, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"A configuração da partilha da ligação à Internet já foi feita.\n"
-"Está neste momento desactivada.\n"
+"A configuração da partilha da conexão Internet já foi feita.\n"
+"Está actualmente desactivada.\n"
 "\n"
 "Que deseja fazer?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "activar"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "reconfigurar"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
-msgstr "libertar"
+msgstr "demitir"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "A activar servidores..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
-msgstr "Partilha da Ligação à Internet está agora activa."
+msgstr "Partilha da Conexão Internet está agora activa."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
-msgstr "A Partilha da Ligação à Internet está activa"
+msgstr "A Partilha da Conexão Internet está activa"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -19776,27 +20907,27 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"A configuração da Partilha da Ligação à Internet já foi feita.\n"
-"Está neste momento activa.\n"
+"A configuração da Partilha da Conexão Internet já foi feita.\n"
+"Está actualmente activa.\n"
 "\n"
-"O que deseja fazer?"
+"Que deseja fazer?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "desactivar"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "A desactivar servidores..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
-msgstr "Partilha da Ligação à Internet está agora desactivada."
+msgstr "Partilha da Conexão Internet está agora desactivada."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19809,37 +20940,37 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"Estás prestes a configurar o seu computador para partilhar a Ligação à "
+"Estás prestes a configurar o seu computador para partilhar a Conexão "
 "Internet.\n"
-"Com esta função, outros computadores na sua rede local poderão utilizar a "
-"ligação à Internet deste computador\n"
+"Com esta caracteristica, outros computadores na sua rede local poderão usar "
+"a conexão internet deste computador.\n"
 "\n"
-"Verifique que já configurou o acesso à Rede/Internet com drakconnect antes "
-"de continuar. \n"
+"Certifique-se que já configurou o seu acesso Rede/Internet com drakconnect "
+"antes de proseguir. \n"
 "Nota: precisa um Adaptador de Rede dedicado para configurar uma Rede de Área "
 "Local (LAN)."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (a usar módulo %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interface %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Nenhum adaptador de rede no seu sistema!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Interface de rede"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19854,21 +20985,26 @@ msgstr ""
 "\n"
 "Estou prestes a configurar a sua Rede de Área Local com esse adaptador."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Escolha a interface de rede"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
-"Por favor escolha qual adaptador de rede que estará ligado a sua Rede de "
-"Área Local."
+"Por favor escolha que adaptador de rede estará ligado a sua Rede de Área "
+"Local."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
-msgstr "A placa rede já está configurada"
+msgstr "O interface de rede já está configurado"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19877,33 +21013,33 @@ msgid ""
 "\n"
 "You can do it manually but you need to know what you're doing."
 msgstr ""
-"Cuidado, o adaptador rede (%s) já está configurado.\n"
+"Aviso, o adaptador de rede (%s) já está configurado.\n"
 "\n"
 "Deseja uma re-configuração automática ?\n"
 "\n"
-"Pode fazer-la manualmente mas precisa de saber o que está fazendo."
+"Pode faze-la manualmente, mas precisa saber o que está a fazer."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Reconfiguração automática"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Não (só para peritos)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
-msgstr "Mostra a configuração actual da placa"
+msgstr "Mostrar a configuração do interface actual"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Configuração actual do interface"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19915,12 +21051,12 @@ msgid ""
 msgstr ""
 "Configuração actual de `%s':\n"
 "\n"
-"Rede : %s\n"
-"Endereço IP : %s\n"
+"Rede: %s\n"
+"Endereço IP: %s\n"
 "Atribuição IP : %s\n"
-"Piloto : %s"
+"Driver: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19936,23 +21072,23 @@ msgid ""
 "\n"
 msgstr ""
 "Posso conservar a sua configuração actual e assumir que já configurou um "
-"servidor DHCP, nesse caso verifique por favor que eu li bem a Rede que "
-"utiliza na sua rede local ; não vou reconfigurar-la e não vou tocar na "
+"servidor DHCP, nesse caso verifique por favor que li correctamente a Rede "
+"que usa na sua rede local ; não vou reconfigura-la e não vou tocar na "
 "configuração do seu servidor DHCP.\n"
 "\n"
-"O valor por omissão do DNS é o Servidor de Nomes configurado no Pára-fogo. "
-"Pode mudar-lo para o IP do DNS do seu FAI, por exemplo.\n"
+"O entrada padrão DNS é o Servidor de Nomes em Cache configurado na Firewall. "
+"Pode substituir isso com o seu ISP DNS ISP, por exemplo.\n"
 "\t\t      \n"
 "Senão, posso reconfigurar o seu interface e (re)configurar um servidor DHCP "
 "para si.\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Endereço da Rede Local"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19962,78 +21098,77 @@ msgid ""
 msgstr ""
 "Configuração do Servidor DHCP.\n"
 "\n"
-"Aqui pode alterar as diferentes opções da configuração do servidor "
-"DHCP.\n"
-"Se desconhecer o significado de uma opção, não a altere."
+"Aqui pode escolher as diferentes opções para a configuração do servidor\n"
+"DHCP. Se desconhecer o significado de uma opção, deixe-a como está."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
-msgstr "IP deste servidor DHCP"
+msgstr "(Este) IP do servidor DHCP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
-msgstr "IP do servidor DNS"
+msgstr "O IP do Servidor DNS"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
-msgstr "Nome do domínio interno"
+msgstr "O nome interno do domínio"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
-msgstr "O inicio dos valores DHCP"
+msgstr "O inicio da extensão DHCP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
-msgstr "O fim dos valores DHCP"
+msgstr "O fim da extensão DHCP"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
-msgstr "A duração por omissão (em segundos)"
+msgstr "A duração padrão (em segundos)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "A duração máxima (em segundos)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Re-configurar o interface e o servidor DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "A rede local não acaba com '.0', a parar."
+msgstr "A rede local não terminou com '.0', a caucionar."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Potencial conflito de endereços LAN encontrado na configuração actual de %"
 "s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "A configurar..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "A configurar scripts, a instalar software, iniciando servidores..."
+msgstr "A configurar scripts, a instalar software, iniciar servidores..."
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Problemas a instalar o pacote %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20042,24 +21177,25 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 "Tudo foi configurado.\n"
-"Pode agora partilhar a sua Ligação à Internet com outros computadores na sua "
-"Rede Local, usando a configuração de rede automática (DHCP).e um servidor Transparente Proxy Cache (SQUID)."
+"Pode agora partilhar a sua Conexão Internet com outros computadores na sua "
+"Rede Local, usando a configuração de rede automática (DHCP).e um servidor "
+"Transparente Proxy Cache (SQUID)."
 
 #: standalone/drakhelp:17
 #, 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"
-"Este programa é livre e pode ser redistribuido sob o licença GNU GPL.\n"
+"Copyright © 2003-2004 Mandrakesoft.\n"
+"Iste é software livre e pode ser redistribuido sob a licença GNU GPL.\n"
 "\n"
-"Uso : \n"
+"Uso: \n"
 
 #: standalone/drakhelp:22
 #, c-format
@@ -20068,9 +21204,10 @@ msgstr " --help                - mostra esta ajuda   \n"
 
 #: standalone/drakhelp:23
 #, c-format
-msgid " --id <id_label>       - load the html help page which refers to id_label\n"
+msgid ""
+" --id <id_label>       - load the html help page which refers to id_label\n"
 msgstr ""
-" --id <id_label>       - carrega a página html de ajuda que corresponde ao "
+" --id <id_label>       - carrega a página html de ajuda que se referem ao "
 "id_label\n"
 
 #: standalone/drakhelp:24
@@ -20079,63 +21216,68 @@ msgid ""
 " --doc <link>          - link to another web page ( for WM welcome "
 "frontend)\n"
 msgstr ""
-" --doc <link>          - liga para outra página web ( para o interface WM de "
-"bemvinda )\n"
+" --doc <link>          - ligação para outra página web ( para o interface WM "
+"bemvindo )\n"
+
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Centro de Ajuda Mandrakelinux"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 "%s não pode ser mostrado \n"
-". Não há Ajuda deste tipo\n"
+". Nenhuma entrada de Ajuda deste tipo\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
 "browse the help system"
 msgstr ""
-"Nenhum navegador está instalado no seu sistema. Por favor instale um se "
-"deseja navegar no sistema de ajuda"
+"Nenhum browser está instalado no seu sistema. Por favor instale um se quer "
+"navegar no sistema de ajuda"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
-msgstr "Configuração do sistema"
+msgstr "Definições do sistema"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
-msgstr "Configuração personalizada"
+msgstr "Definições personalizadas"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
-msgstr "Personalização e configuração do sistema"
+msgstr "Definições do sistema & personalizadas"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
-msgstr "Mudável"
+msgstr "Editavel"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
-msgstr "Caminho"
+msgstr "Path"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Utilizador"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Grupo"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Permissões"
@@ -20147,9 +21289,10 @@ msgid ""
 "groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"Aqui pode ver os ficheiros utilizados para definir permissões, donos, e grupos através do msec.\n"
-"Pode também editar as suas próprias regras que se sobrepõem às regras por "
-"omissão."
+"Aqui pode ver ficheiros para usar para corrigir as permissões, donos, e "
+"grupos via msec.\n"
+"Pode também editar as suas próprias regras que iráo sobrepor as regras "
+"padrão."
 
 #: standalone/drakperm:110
 #, c-format
@@ -20158,7 +21301,7 @@ msgid ""
 "Select permissions to see/edit"
 msgstr ""
 "O nível de segurança actual é %s.\n"
-"Escolha as permissões a ver/editar"
+"Seleccione permissões para ver/editar"
 
 #: standalone/drakperm:121
 #, c-format
@@ -20168,7 +21311,7 @@ msgstr "Subir"
 #: standalone/drakperm:121
 #, c-format
 msgid "Move selected rule up one level"
-msgstr "Subir a regra seleccionada de um nível"
+msgstr "Mover a regra seleccionada um nível acima"
 
 #: standalone/drakperm:122
 #, c-format
@@ -20178,7 +21321,7 @@ msgstr "Descer"
 #: standalone/drakperm:122
 #, c-format
 msgid "Move selected rule down one level"
-msgstr "Descer a regra actual de um nível"
+msgstr "Mover a regra seleccionada um nível abaixo"
 
 #: standalone/drakperm:123
 #, c-format
@@ -20188,7 +21331,7 @@ msgstr "Adicionar uma regra"
 #: standalone/drakperm:123
 #, c-format
 msgid "Add a new rule at the end"
-msgstr "Adicionar uma nova regra ao fim"
+msgstr "Adicionar uma nova regra no fim"
 
 #: standalone/drakperm:124
 #, c-format
@@ -20196,9 +21339,9 @@ msgid "Delete selected rule"
 msgstr "Apagar a regra selecionada"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "Editar"
@@ -20206,103 +21349,121 @@ msgstr "Editar"
 #: standalone/drakperm:125
 #, c-format
 msgid "Edit current rule"
-msgstr "Editar a regra actual"
+msgstr "Editar regra actual"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
-msgstr "navegar"
+msgstr "browse"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "utilizador"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "grupo"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "outro"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Ler"
 
-#: 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 "Autorizar \"%s\" a ler o ficheiro"
+msgstr "Permita \"%s\" a ler o ficheiro"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Escrever"
 
-#: 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 "Active \"%s\" para escrever o ficheiro"
+msgstr "Permita \"%s\" para escrever o ficheiro"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
-msgstr "Execução"
+msgstr "Execute"
 
-#: 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 "Autoriza \"%s\" a executar o ficheiro"
+msgstr "Permita \"%s\" a executar o ficheiro"
 
-#: 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"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
-"Usado para as pastas :\n"
-" só o proprietário da pasta ou dos ficheiros nela os pode apagar"
+"Usado para a pasta :\n"
+" apenas o dono da pasta ou ficheiro nesta pasta pode apagar"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Definir UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
-msgstr "Usar o id do proprietário para a execução"
+msgstr "Usar o id do dono para a execução"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Definir GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "Usar o id do grupo para a execução"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Utilizador :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
-msgstr "Grupo :"
+msgid "Group:"
+msgstr "Grupo:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Utilizador actual"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
-msgstr "Quando marcado, o utilizador e o grupo não vão ser mudados"
+msgstr "Quando marcado, o dono e o grupo não serão mudados"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
-msgstr "Selecção do caminho"
+msgstr "Selecção do patch(caminho)"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Propriedades"
@@ -20333,19 +21494,21 @@ msgid ""
 "(LAN)."
 msgstr ""
 "Estás prestes a configurar o seu computador para instalar um servidor PXE \n"
-"como servidor DHCP e um servidor TFTP para fazer um servidor de instalação.\n"
-"Com esta função, outros computadores na sua rede local poderão ser\n"
-"instalados a partir deste computador.\n"
+"como um servidor DHCP e um servidor TFTP para compilar um servidor de\n"
+"instalação. Com esta caracteristica, outros computadores na sua rede local\n"
+"serão instalados usando este computador como fonte(source).\n"
+"\n"
+"Certifique-se que configurou o seu acesso Rede/Internet usando o "
+"drakconnect\n"
+"antes de proseguir.\n"
 "\n"
-"Verifique que já configurou o acesso à Rede/Internet com drakconnect antes "
-"de continuar. \n"
 "Nota: precisa um Adaptador de Rede dedicado para configurar uma Rede de Área "
 "Local (LAN)."
 
 #: standalone/drakpxe:143
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
-msgstr "Por favor escolha o adaptador de rede que quer utilizar para o servidor dhcp."
+msgstr "Por favor escolha o adaptador de rede será usado para o servidor dhcp."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -20361,21 +21524,21 @@ msgid ""
 "The network address is %s using a netmask of %s.\n"
 "\n"
 msgstr ""
-"O servidor DHCP vai permitir a outros computadores de arrancar utilizando "
-"PXE na zona de endereços dada.\n"
+"O servidor DHCP irá permitir que outros computadores arranquem usando PXE na "
+"extensão de endereços dada.\n"
 "\n"
-"O endereço rede é %s com uma máscara %s.\n"
+"O endereço da rede é %s usando uma máscara de %s.\n"
 "\n"
 
 #: standalone/drakpxe:173
 #, c-format
 msgid "The DHCP start ip"
-msgstr "O inicio dos ip DHCP"
+msgstr "O IP de inicio do DHCP"
 
 #: standalone/drakpxe:174
 #, c-format
 msgid "The DHCP end ip"
-msgstr "O fim dos ip DHCP"
+msgstr "O IP do fim do DHCP"
 
 #: standalone/drakpxe:187
 #, c-format
@@ -20386,16 +21549,15 @@ msgid ""
 "contents.\n"
 "\n"
 msgstr ""
-"Por favor indique onde vai estar disponível a imagem da instalação.\n"
+"Por favor indique onde irá estar disponível a imagem de instalação.\n"
 "\n"
-"Se não tiver preparado nenhuma directoria, por favor copie o conteúdo dos CD "
-"ou DVD.\n"
+"Se não tiver uma pasta existente, por favor copie o conteúdos do CD ou DVD.\n"
 "\n"
 
 #: standalone/drakpxe:192
 #, c-format
 msgid "Installation image directory"
-msgstr "directoria da imagem da instalação"
+msgstr "Pasta da imagem de instalação"
 
 #: standalone/drakpxe:196
 #, c-format
@@ -20404,9 +21566,10 @@ msgstr "Nenhuma imagem encontrada"
 
 #: standalone/drakpxe:197
 #, c-format
-msgid "No CD or DVD image found, please copy the installation program and rpm files."
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
 msgstr ""
-"Nenhuma imagem encontrada de CD ou DVD, por favor copie o programa de "
+"Nenhuma imagem de CD ou DVD encontrada, por favor copie o programa de "
 "instalação e os ficheiros rpm."
 
 #: standalone/drakpxe:210
@@ -20417,9 +21580,9 @@ msgid ""
 "Leave it blank if you do not want to set up automatic installation mode.\n"
 "\n"
 msgstr ""
-"Por favor indique onde está o ficheiro auto_install.cfg.\n"
+"Por favor indique onde o ficheiro auto_install.cfg está localizado.\n"
 "\n"
-"Deixe branco se não quiser activar o modo de instalação automática.\n"
+"Deixe branco se não quiser configurar o modo de instalação automático.\n"
 "\n"
 
 #: standalone/drakpxe:215
@@ -20427,54 +21590,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Localização do ficheiro auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "TODOS"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "por omissão"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "ignorar"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "no"
-msgstr "não"
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "sim"
-
-#. -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 "
@@ -20508,112 +21659,117 @@ msgid ""
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 msgstr ""
-"Aqui, você pode configurar o nível de segurança e o administrador da \n"
+"Aqui, pode configurar o nível de segurança e o administrador da sua "
 "máquina.\n"
 "\n"
-"O administrador da máquina é quem recebe as alertas de segurança\n"
-"se a opção 'Alertas de Segurança' é pedida. Pode ser um nome de\n"
+"\n"
+"O <span weight=\"bold\">Administrador de Segurança </span> é quem irá "
+"receber os alertas de segurança se\n"
+"a opção '<span weight=\"bold\">Alerta de Segurança</span>' é definida. Pode "
+"ser um nome de\n"
 "utilizador ou um endereço de correio electrónico.\n"
 "\n"
 "\n"
-"O menu Nível de Segurança permite-lhe de escolher um dos seis\n"
-"nivéis de segurança fornecidos com o msec. Vão dum nível baixo e\n"
-"fácil de utilizar, a uma configuração paranóica, indicada para servidores\n"
-"muito sensiveis :\n"
-"<span foreground=\"royalblue3\">Baixa</span> : Este é um nível de segurança "
-"completamente\n"
-"inseguro mas fácil de utilizar. Só deveria ser escolhido para máquinas\n"
-"que não estão ligadas a uma rede e que não estão acessiveis a toda\n"
-"a gente.\n"
+"O menu '<span weight=\"bold\">Nível de Segurança</span>' permite-lhe "
+"escolher um dos seis\n"
+"pré-configurados nivéis de segurança fornecidos com o msec. Esta extensão\n"
+"de níveis desde 'segurança <span weight=\"bold\">pobre</span>' e de fácil "
+"uso, até uma configuração\n"
+"'<span weight=\"bold\">paranoica</span>' apropriada a um servidor de "
+"aplicações de grande\n"
+"sensibilidade:\n"
+"\n"
+"\n"
+"<span foreground=\"royalblue3\">Pobre</span> : Este é o nível de segurança "
+"totalmente\n"
+"inseguro mas de fácil uso. Deveria ser apenas usado por máquinas não "
+"conectadas\n"
+"a qualquer rede e que não estejam acessiveis a toda a gente.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Padrão</span> : Este é o nível de segurança "
 "padrão\n"
-"aconselhado para um computador que vai ser utilizado para se ligar \n"
-"como cliente ao Internet.\n"
-"\n"
+"recomendado para um computador que seja usado para conectar à internet a\n"
+"como cliente\n"
 "\n"
-"<span foreground=\"royalblue3\">Alto</span> : Já há mais restrições, e\n"
-"mais verificações automáticas são feitas todas as noites.\n"
+"<span foreground=\"royalblue3\">Alta</span>: Há já algumas restrições,\n"
+"e mais verificações automáticas são executadas todas as noites.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Superior</span> : A segurança é agora\n"
-"suficiente para utilizar o sistema como um servidor que pode\n"
-"aceitar ligações de muitos clientes. Se a sua máquina só é cliente no\n"
-"Internet, você deveria escolher um nível mais baixo.\n"
+"suficiente\n"
+"para o uso do sistema como um servidor que pode aceitar conexões de vários "
+"clientes.\n"
+"Se a sua máquina é apenas um cliente na Internet, você deve escolher um "
+"nível mais baixo.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Paranoide<span> : Este é similar ao "
+"<span foreground=\"royalblue3\">Paranoica<span> : Esta é similar ao nivel "
 "anterior,\n"
-"mas o sistema é completamente fechado e as opções de\n"
-"segurança estão ao máximo."
+"mas o sistema é inteiramente fechado e as opções de segurança estão ao\n"
+"seu máximo."
+
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Descrição dos campos:\n"
+"\n"
 
-#: standalone/draksec:129
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
-msgstr "(valor por omissão: %s)"
+msgstr "(valor padrão: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Nível de Segurança:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Alertas de Segurança:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
-msgstr "Administrador da Segurança:"
+msgstr "Administrador de Segurança:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
-msgstr "Opções Simples"
-
-#: 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 ""
-"As opções seguintes podem ser definidas para personalizar\n"
-"a segurança do seu sistema. Se necessitar de explicações,\n"
-"veja as dicas de ajuda.\n"
+msgstr "Opções Básicas"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Opções de Rede"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Opções do Sistema"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Verificações Periódicas"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
-msgstr "Por favor aguarde, configuração do nível de segurança..."
+msgstr "Por favor aguarde, definir nível de segurança..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
-msgstr "Por favor aguarde, configuração das opções de segurança..."
+msgstr "Por favor aguarde, definir opções de segurança..."
 
 #: standalone/draksound:47
 #, c-format
 msgid "No Sound Card detected!"
 msgstr "Nenhuma Placa de Som detectada!"
 
-#: 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-"
@@ -20625,16 +21781,16 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"Nenhuma placa de som foi encontrada na sua máquina. Por favor verifique que "
-"uma placa sonora suportada por Linux está bem ligada.\n"
+"Nenhuma placa de som foi detectad na sua máquina. Por favor verifique que a "
+"placa de som suportada pelo Linux está bem ligada.\n"
 "\n"
 "\n"
-"Pode visitar a nossa base de dados de material em :\n"
+"Pode visitar a nossa base de dados de hardware em :\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -20646,8 +21802,8 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"Nota: se tem uma placa som ISA PnP, vai ter de utilizar o programa alsaconf ou o "
-"sndconfig.  Basta escrever \"alsaconf\" ou \"sndconfig\" num terminal."
+"Nota: se tem uma placa som ISA PnP, irá ter de usar o programa alsaconf ou o "
+"sndconfig.  Basta digitar \"alsaconf\" ou \"sndconfig\" numa consola."
 
 #: standalone/draksplash:21
 #, c-format
@@ -20655,9 +21811,8 @@ msgid ""
 "package 'ImageMagick' is required to be able to complete configuration.\n"
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
-"o pacote 'ImageMagick' é necessário para funcionar bem.\n"
-"Carregue em \"Ok\" para instalar 'ImageMagick' ou\n"
-"\"Anular\" para sair."
+"o pacote 'ImageMagick' é necessário para permitir completar a configuração.\n"
+"Clique em \"Ok\" para instalar o 'ImageMagick' ou \"Cancelar\" para sair."
 
 #: standalone/draksplash:68
 #, c-format
@@ -20687,7 +21842,7 @@ msgstr "Navegar"
 #: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
-msgstr "Configurar a imagem de início"
+msgstr "Configurar a imagem de arranque"
 
 #: standalone/draksplash:96
 #, c-format
@@ -20695,8 +21850,8 @@ msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr ""
-"posição horizontal da caixa\n"
-"de texto em numero de letras"
+"coordenada x da caixa de\n"
+"texto em numero de caracteres"
 
 #: standalone/draksplash:97
 #, c-format
@@ -20704,8 +21859,8 @@ msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr ""
-"posição vertical da caixa\n"
-"de texto em numero de letras"
+"coordenada y da caixa de\n"
+"texto em numero de caracteres"
 
 #: standalone/draksplash:98
 #, c-format
@@ -20723,8 +21878,8 @@ msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr ""
-"a posição horizontal do canto\n"
-"superior esquerdo da barra"
+"coordenada x da barra de progresso\n"
+"do seu canto superior esquerdo"
 
 #: standalone/draksplash:101
 #, c-format
@@ -20732,8 +21887,8 @@ msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr ""
-"a posição vertical do canto\n"
-"superior esquerdo da barra"
+"coordenada y da barra de progresso\n"
+"do seu canto superior esquerdo"
 
 #: standalone/draksplash:102
 #, c-format
@@ -20753,37 +21908,37 @@ msgstr "a cor da barra de progressão"
 #: standalone/draksplash:119
 #, c-format
 msgid "Preview"
-msgstr "pré-visualização"
+msgstr "Pré-visualizar"
 
 #: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
-msgstr "gravar tema"
+msgstr "Gravar tema"
 
 #: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
-msgstr "escolha a cor"
+msgstr "Escolher cor"
 
 #: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
-msgstr "Mostrar o logo na linha de commando"
+msgstr "Mostrar o logo na consola"
 
 #: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
-msgstr "Não mostrar as mensagens do núcleo por omissão"
+msgstr "Tornar a mensagem do kernel \"quiet\" por omissão"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
-msgstr "Nota"
+msgstr "Notificar"
 
-#: 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 "Este tema ainda não tem nenhuma imagem de arranque em %s !"
 
 #: standalone/draksplash:167
@@ -20794,196 +21949,210 @@ msgstr "escolha uma imagem"
 #: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
-msgstr "a gravar o tema de arranque..."
+msgstr "a gravar tema de arranque..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
-msgstr "Escolha da cor da Barra de Progressão"
+msgstr "Selecção da cor da Barra de Progresso"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
-msgstr "Você deve escolher um ficheiro imagem primeiro!"
+msgstr "Deve escolher um ficheiro imagem primeiro!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
-msgstr "A criar a pré-visualização"
+msgid "Generating preview..."
+msgstr "A gerar pré-visualização"
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash (%s) pré-visualização"
 
-#: 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 ""
+"A imagem \"%s\" não pode ser carregada devido ao seguinte problema:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Conectado através de uma porta de série ou de um cabo usb"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Adicionar um dispositivo UPS"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 "Bem vindo ao utilitário de configuração do UPS.\n"
 "\n"
-"Aqui, poderá adicionar um novo UPS ao seu sistema.\n"
+"Aqui, irá poder adicionar um novo UPS ao seu 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 ""
-"Será adicionado um dispositivo UPS.\n"
+"Vamos adicionar um dispositivo UPS.\n"
 "\n"
-"Prefere autodetectar os dispositivos UPS conectados a esta máquina ou  ?"
+"Quer que os dispositivos UPS conectados a esta máquina sejam auto detectados "
+"ou sejam manualmente seleccionados ?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Autodetecção"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Detecção em progresso"
 
-#: 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 "Parabéns"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr "O assistente adicionou com sucesso os seguintes dispositivos UPS:"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
-msgstr "Não foi encontrado nenhum dispositivo UPS novo"
+msgstr "Nenhum dispositivo UPS novo foi encontrado"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Configuração do driver UPS"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
-msgstr "Por favor selecione o seu modelo UPS"
+msgstr "Por favor escolha o seu modelo UPS"
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Fabricante / Modelo:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
-"Está a ser configurado o UPS \"%s\" a partir de \"%s\".\n"
-"Por favor indique o seu nome, driver e porta."
+"Estamos a configurar o UPS \"%s\" a partir de \"%s\".\n"
+"Por favor preencha o seu nome, driver e porta."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "O nome do seu ups"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
-msgstr "O driver que gere a sua UPS"
+msgid "The driver that manages your ups"
+msgstr "O driver que gere o seu UPS"
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Porta:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
 msgstr "A porta na qual está conectado o seu ups"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "O assistente configurou com sucesso o novo dispositivo UPS \"%s\"."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Dispositivos UPS"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "Utilizadores UPS"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Listas de Controlo de Acesso"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
-msgstr "Filtro IP"
+msgstr "Mascara IP"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Regras"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Acção"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Nível"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
-msgstr "Nome do ACL"
+msgstr "Nome 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 "Bemvindo às ferramentas de configuração da UPS"
+msgstr "Bemvindo às ferramentas de configuração UPS"
 
 #: standalone/drakvpn:73
 #, c-format
@@ -20993,7 +22162,7 @@ msgstr "DrakVPN"
 #: standalone/drakvpn:95
 #, c-format
 msgid "The VPN connection is enabled."
-msgstr "A conexão  VPN está agora activa."
+msgstr "A conexão  VPN está agora activada."
 
 #: standalone/drakvpn:96
 #, c-format
@@ -21002,18 +22171,18 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "A configuração da conexão VPN já foi feita.\n"
 "\n"
-"Está neste momento activa.\n"
+"Está actualmente activa.\n"
 "\n"
-"O que deseja fazer?"
+"Que deseja fazer?"
 
 #: standalone/drakvpn:105
 #, c-format
 msgid "Disabling VPN..."
-msgstr "Desactivando a VPN..."
+msgstr "A desactivar VPN..."
 
 #: standalone/drakvpn:114
 #, c-format
@@ -21023,7 +22192,7 @@ msgstr "A conexão VPN está agora desactivada."
 #: standalone/drakvpn:121
 #, c-format
 msgid "VPN connection currently disabled"
-msgstr "A conexão VPN está, de momento, desactivada"
+msgstr "Conexão VPN actualmente desactivada"
 
 #: standalone/drakvpn:122
 #, c-format
@@ -21032,28 +22201,28 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "A configuração da conexão VPN já foi feita.\n"
 "\n"
-"Está neste momento desactivada.\n"
+"Está actualmente desactivada.\n"
 "\n"
 "Que deseja fazer?"
 
 #: standalone/drakvpn:135
 #, c-format
 msgid "Enabling VPN..."
-msgstr "Activando a VPN..."
+msgstr "A activar VPN..."
 
 #: standalone/drakvpn:141
 #, c-format
 msgid "The VPN connection is now enabled."
-msgstr "A conexão VPN está agora activa."
+msgstr "A conexão VPN está agora activada."
 
 #: standalone/drakvpn:155 standalone/drakvpn:183
 #, c-format
 msgid "Simple VPN setup."
-msgstr "Configuração simples do VPN"
+msgstr "Simples configuração VPN"
 
 #: standalone/drakvpn:156
 #, c-format
@@ -21070,17 +22239,17 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
-"Está prestes a configurar o seu computador para utilizar uma conexão VPN.\n"
+"Está prestes a configurar o seu computador para usar uma conexão VPN.\n"
 "\n"
-"Desta maneira, os computadores na sua rede privada local e os computadores\n"
-"em algumas redes privadas remotas, poderão partilhar recursos, utilizando\n"
-"as suas firewalls, através da Internet, de uma maneira segura. \n"
+"Com esta opção, computadores na sua rede privada local e computadores\n"
+"em algumas redes privadas remotas, podem partilhar recursos, atravez das\n"
+"suas respectivas firewalls, através da Internet, de uma maneira segura. \n"
 "\n"
 "A comunicação através da Internet é encriptada. Os computadores locais\n"
-"e remotos ver-se-ão uns aos outros como se estivessem na mesma rede.\n"
+"e remotos aparecem como se estivessem na mesma rede.\n"
 "\n"
-"Certifique-se de que configurou o seu acesso à Rede/Internet através\n"
-"do drakconnect antes de prosseguir."
+"Certifique-se que configurou o seu acesso à Rede/Internet usando o\n"
+"drakconnect antes de prosseguir."
 
 #: standalone/drakvpn:184
 #, c-format
@@ -21112,22 +22281,22 @@ msgstr ""
 #: standalone/drakvpn:196
 #, c-format
 msgid "Kernel module."
-msgstr "Módulo de kernel."
+msgstr "Módulo 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"
 "This kernel has '%s' support."
 msgstr ""
-"O kernel necessita de suporte a ipsec.\n"
+"O kernel necessita ter suporte ipsec.\n"
 "\n"
 "Está a correr uma versão %s do kernel.\n"
 "\n"
-"Este kernel tem suporte a '%s'."
+"Este kernel tem suporte '%s'."
 
 #: standalone/drakvpn:292
 #, c-format
@@ -21137,7 +22306,7 @@ msgstr "Políticas de Segurança"
 #: standalone/drakvpn:292
 #, c-format
 msgid "IKE daemon racoon"
-msgstr "racoon (demónio de IKE)"
+msgstr "IKE daemon racoon"
 
 #: standalone/drakvpn:295 standalone/drakvpn:306
 #, c-format
@@ -21147,19 +22316,19 @@ msgstr "Ficheiro de configuração"
 #: 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 ""
 "Passo de configuração !\n"
 "\n"
-"É necessário definir as Políticas de Segurança  para então\n"
-"configurar o demónio de troca de chave automática (IKE). \n"
-"O demónio KAME IKE utilizado chama-se 'racoon'.\n"
+"Precisa definir as Políticas de Segurança e depois\n"
+"configurar o daemon (IKE) de troca de chave automática.\n"
+"O daemon KAME IKE que estamos a usar chama-se 'racoon'.\n"
 "\n"
 "Que deseja configurar ?\n"
 
@@ -21171,10 +22340,10 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
-"De seguida, confugurar-se-á o ficheiro %s.\n"
+"Próximo, iremos configurar o ficheiro %s.\n"
 "\n"
 "\n"
-"Clique simplesmente em Seguinte.\n"
+"Simplesmente clique em Seguinte.\n"
 
 #: standalone/drakvpn:325 standalone/drakvpn:685
 #, c-format
@@ -21187,19 +22356,19 @@ 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 ""
 "O conteúdo do ficheiro %s\n"
 "está dividido em secções.\n"
 "\n"
 "Agora pode :\n"
 "\n"
-"  - ver, adicionar, editar, ou remover secções, e\n"
+"  - ver, adicionar, editar, ou remover secções, e depois \n"
 "  - submeter as alterações\n"
 "\n"
 "Que deseja fazer ?\n"
@@ -21209,7 +22378,7 @@ msgstr ""
 msgid ""
 "_:display here is a verb\n"
 "Display"
-msgstr "Exibir"
+msgstr "Mostrar"
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
 #, c-format
@@ -21222,7 +22391,7 @@ msgstr "Submeter"
 msgid ""
 "_:display here is a verb\n"
 "Display configuration"
-msgstr "Exibir configuração"
+msgstr "Mostrar configuração"
 
 #: standalone/drakvpn:352
 #, c-format
@@ -21235,7 +22404,7 @@ msgid ""
 msgstr ""
 "O ficheiro %s não existe.\n"
 "\n"
-"A configuração deve ser nova.\n"
+"Esta deve ser uma configuração nova.\n"
 "\n"
 "Terá de retroceder e escolher 'adicionar'.\n"
 
@@ -21249,7 +22418,7 @@ msgstr "entradas ipsec.conf"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -21260,14 +22429,14 @@ msgid ""
 msgstr ""
 "O ficheiro %s contém secções diferentes.\n"
 "\n"
-"Segue-se a sua estrutura :\t'config setup' \n"
+"Aqui está o seu esqueleto:\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"
 "\n"
 "Agora pode adicionar uma destas secções.\n"
 "\n"
-"Escolha a secção que deseja adicoonar.\n"
+"Escolha a secção que deseja adicionar.\n"
 
 #: standalone/drakvpn:376
 #, c-format
@@ -21277,7 +22446,7 @@ msgstr "config setup"
 #: standalone/drakvpn:376
 #, c-format
 msgid "conn %default"
-msgstr "conn por defeito %d"
+msgstr "conn %default"
 
 #: standalone/drakvpn:376
 #, c-format
@@ -21286,8 +22455,8 @@ msgstr "normal conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
-msgstr "Existe !"
+msgid "Exists!"
+msgstr "Existe!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -21298,11 +22467,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
-"Já existe uma secção com este nome.\n"
-"Os nomes das secções têm de ser únicos.\n"
+"Uma secção com este nome já existe.\n"
+"Os nomes de secção têm que ser únicos.\n"
 "\n"
 "Terá de retroceder e adicionar outra secção\n"
-"ou alterar o seu nome.\n"
+"ou mudar o seu nome.\n"
 
 #: standalone/drakvpn:400
 #, c-format
@@ -21318,7 +22487,7 @@ msgstr ""
 "Esta secção tem de estar no topo do\n"
 "ficheiro %s.\n"
 "\n"
-"Certifique-se de que todas as outras secções seguem esta\n"
+"Certifique-se que todas as outras secções seguem esta\n"
 "secção 'config setup'.\n"
 "\n"
 "Escolha continuar ou retroceder quando estiver pronto.\n"
@@ -21368,9 +22537,9 @@ msgstr ""
 "Esta é a primeira secção após a 'config\n"
 "setup'.\n"
 "\n"
-"Aqui pode definir as preferências por defeito. \n"
-"Todas as outras secções suceder-se-ão a esta.\n"
-"As opções da esquerda são opcionais. Se não as\n"
+"Aqui pode definir as preferências padrão. \n"
+"Todas as outras secções iráo seguir esta.\n"
+"As definições esquerdas são opcionais. Se não as\n"
 "definir aqui, globalmente, poderá defini-las em cada\n"
 "secção.\n"
 
@@ -21427,15 +22596,15 @@ msgid ""
 "You can now add a new section.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"O ficheiro %s contém varias secções, ou conexões.\n"
+"O ficheiro %s tem varias secções, ou conexões.\n"
 "\n"
 "Pode agora adicionar uma nova secção.\n"
-"Escolha continuar quando estiver pronto para guardar as alterações.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:491
 #, c-format
 msgid "section name"
-msgstr "Nome da secção"
+msgstr "nome da secção"
 
 #: standalone/drakvpn:492
 #, c-format
@@ -21445,7 +22614,7 @@ msgstr "authby"
 #: standalone/drakvpn:493
 #, c-format
 msgid "auto"
-msgstr "automático"
+msgstr "auto"
 
 #: standalone/drakvpn:499
 #, c-format
@@ -21481,11 +22650,11 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
-"Já existe uma secção com este nome.\n"
+"Uma secção com este nome já existe.\n"
 "Os nomes das secções têm de ser únicos.\n"
 "\n"
 "Terá de retroceder e adicionar outra secção\n"
-"ou alterar o nome da secção.\n"
+"ou mudar o nome da secção.\n"
 
 #: standalone/drakvpn:543
 #, c-format
@@ -21500,7 +22669,7 @@ msgstr ""
 "\n"
 "Pode agora adicionar uma Política de Segurança.\n"
 "\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Eescolha continuar quanto estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:576 standalone/drakvpn:826
 #, c-format
@@ -21515,10 +22684,10 @@ msgid ""
 "You can choose here below the one you want to edit \n"
 "and then click on next.\n"
 msgstr ""
-"O ficheiro %s contém varias secções ou conexões.\n"
+"O seu ficheiro %s tem várias secções ou conexões.\n"
 "\n"
-"Escolha, da lista abaixo, a secção que pretende editar\n"
-"e clique em seguinte.\n"
+"Pode escolher aqui abaixo a que quer editar\n"
+"e depois clique em seguinte.\n"
 
 #: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
 #: standalone/drakvpn:877
@@ -21528,23 +22697,23 @@ msgstr "Nomes das secções"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
-msgstr "Impossível editar !"
+msgid "Can't edit!"
+msgstr "Não consegue editar !"
 
 #: standalone/drakvpn:591
 #, c-format
 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 ""
 "Não pode editar esta secção.\n"
 "\n"
-"Esta secção é obrigatória para o Freswan 2.X.\n"
-"É necessário especificar a versão 2.0 no topo\n"
+"Esta secção é obrigatória para Freswan 2.X.\n"
+"Uma tem que especificar a versão 2.0 no topo\n"
 "do ficheiro %s, e eventualmente, desactivar ou\n"
 "activar a encriptação adequada.\n"
 
@@ -21556,10 +22725,10 @@ msgid ""
 "You can now edit the config setup section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"O ficheiro %s contém várias secções.\n"
+"O seu ficheiro %s tem várias secções.\n"
 "\n"
 "Pode agora editar as entradas da secção config setup.\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:611
 #, c-format
@@ -21569,10 +22738,10 @@ msgid ""
 "You can now edit the default section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"O ficheiro %s contém várias secções ou conexões.\n"
+"O seu ficheiro %s tem várias secções.\n"
 "\n"
-"Pode agora editar as entradas da secção default.\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Pode agora editar as entradas da secção config setup.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:624
 #, c-format
@@ -21583,18 +22752,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"O ficheiro %s contém várias secções ou conexões.\n"
+"O ficheiro %s tem várias secções ou conexões.\n"
 "\n"
-"Pode agora editar as entradas da secção normal.\n"
+"Pode agora editar as entradas normais da secção.\n"
 "\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:645
 #, c-format
 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 ""
@@ -21602,7 +22771,7 @@ msgstr ""
 "\n"
 "Pode agora adicionar uma Política de Segurança.\n"
 "\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:656 standalone/drakvpn:873
 #, c-format
@@ -21617,10 +22786,10 @@ msgid ""
 "You can choose here below the one you want to remove\n"
 "and then click on next.\n"
 msgstr ""
-"O ficheiro %s contém varias secções ou conexões.\n"
+"O seu ficheiro %s tem varias secções ou conexões.\n"
 "\n"
-"Escolha, da lista abaixo, a secção que pretende remover\n"
-"e clique em seguinte.\n"
+"Pode agora escolher em baixo aquela que quer remover\n"
+"e depois clique em seguinte.\n"
 
 #: standalone/drakvpn:686
 #, c-format
@@ -21628,14 +22797,14 @@ 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"
 "  - remove \t\t (remove an existing section)\n"
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
-"Ficheiro de configuração racoon.conf.\n"
+"O ficheiro de configuração racoon.conf.\n"
 "\n"
 "O conteúdo deste ficheiro está dividido em secções.\n"
 "Pode agora :\n"
@@ -21643,7 +22812,7 @@ msgstr ""
 "  - adicionar\t\t\t (adicionar uma secção)\n"
 "  - editar \t\t\t (modificar os parâmetros de uma secção)\n"
 "  - remover \t\t (remover uma secção existente)\n"
-"  - submeter \t\t (guardar as alterações no ficheiro em si)"
+"  - submeter \t\t (escrever as alterações o ficheiro real)"
 
 #: standalone/drakvpn:714
 #, c-format
@@ -21656,21 +22825,21 @@ msgid ""
 msgstr ""
 "O ficheiro %s não existe\n"
 "\n"
-"A configuração deve ser nova.\n"
+"Esta deve ser uma nova configuração.\n"
 "\n"
 "Terá de retroceder e escolher configurar.\n"
 
 #: standalone/drakvpn:728
 #, c-format
 msgid "racoonf.conf entries"
-msgstr "entradas do racoonf.conf"
+msgstr "entradas racoonf.conf"
 
 #: standalone/drakvpn:729
 #, c-format
 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"
@@ -21679,9 +22848,9 @@ msgid ""
 msgstr ""
 "O passo 'adicionar' secções.\n"
 "\n"
-"Abaixo encontra-se a estrutura do ficheiro racoon.conf :\n"
+"Aqui em baixo está o esqueleto do ficheiro racoon.conf :\n"
 "\t'endereço'\n"
-"\t'remota'\n"
+"\t'remoto'\n"
 "\t'sainfo' \n"
 "\n"
 "Escolha a secção que deseja adicionar.\n"
@@ -21689,12 +22858,12 @@ msgstr ""
 #: standalone/drakvpn:735
 #, c-format
 msgid "path"
-msgstr "endereço"
+msgstr "path"
 
 #: standalone/drakvpn:735
 #, c-format
 msgid "remote"
-msgstr "remota"
+msgstr "remoto"
 
 #: standalone/drakvpn:735
 #, c-format
@@ -21712,39 +22881,39 @@ msgid ""
 msgstr ""
 "O passo 'adicionar secção de endereço'.\n"
 "\n"
-"As secções de endereço têm de estar no topo do ficheiro racoon.conf.\n"
+"As secções path têm de estar no do seu ficheiro racoon.conf.\n"
 "\n"
-"Coloque o rato sobre a entrada de certificado para obter ajuda online."
+"Ponha o seu rato sobre a entrada de certificado para obter ajuda online."
 
 #: standalone/drakvpn:746
 #, c-format
 msgid "path type"
-msgstr "tipo de endereço"
+msgstr "tipo de path"
 
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
-"path include path : especifíca um endereço para incluir\n"
+"path include path : especifíca um caminho para incluir\n"
 "um ficheiro. Ver File Inclusion.\n"
 "\tExemplo: path include '/etc/racoon'\n"
 "\n"
@@ -21752,7 +22921,7 @@ msgstr ""
 "uma chave(s) pré-partilhada(s) para vários ID(s). Ver Pre-shared key File.\n"
 "\tExemplo: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : o racoon(8) irá procurar este directório\n"
+"path certificate path: o racoon(8) irá procurar este directório\n"
 "se um certificado ou um pedido de certificado for recebido.\n"
 "\tExemplo: path certificate '/etc/cert' ;\n"
 "\n"
@@ -21778,7 +22947,7 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
-"Certifique-se de que já possui as secções de endereço\n"
+"Certifique-se que já possui as secções path\n"
 "no topo de seu ficheiro racoon.conf.\n"
 "\n"
 "Pode agora escolhar as definições remotas.\n"
@@ -21793,7 +22962,7 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
-"Certifique-se de que já possui as secções de endereço\n"
+"Certifique-se de que já possui as secções path\n"
 "no topo de seu ficheiro %s.\n"
 "\n"
 "Pode agora escolhar as definições sainfo.\n"
@@ -21807,10 +22976,10 @@ msgid ""
 "You can choose here in the list below the one you want\n"
 "to edit and then click on next.\n"
 msgstr ""
-"O ficheiro %s contém varias secções ou conexões.\n"
+"O seu ficheiro %s tem varias secções ou conexões.\n"
 "\n"
-"Escolha, da lista abaixo, a secção que pretende editar\n"
-"e clique em seguinte.\n"
+"Pode escolher aqui da lista abaixo aquela que quer\n"
+"editar e clique em seguinte.\n"
 
 #: standalone/drakvpn:838
 #, c-format
@@ -21822,12 +22991,12 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"O ficheiro %s contém várias secções.\n"
+"O seu ficheiro %s contém várias secções.\n"
 "\n"
 "\n"
 "Pode agora editar as entradas da secção remota.\n"
 "\n"
-"Quando acabar escolha continuar para guardar as alterações.\n"
+"Escolha continuar quando estiver pronto para escrever os dados.\n"
 
 #: standalone/drakvpn:847
 #, c-format
@@ -21843,7 +23012,7 @@ msgstr ""
 "\n"
 "Pode agora editar as entradas da secção sainfo.\n"
 "\n"
-"Quando acabar escolha continuar para guardar as alterações."
+"Escolha continuar quando estiver pronto para escrever os dados."
 
 #: standalone/drakvpn:855
 #, c-format
@@ -21858,11 +23027,11 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
-"Esta secção tem de estar no topo do\n"
+"Esta secção tem de estar no topo do seu\n"
 "ficheiro %s.\n"
 "\n"
-"Certifique-se de que todas as outras secções\n"
-"sucedem a estas secções de endereço.\n"
+"Certifique-se que todas as outras secções\n"
+"seguem estas secções path.\n"
 "\n"
 "Pode agora editar as entradas de endereço.\n"
 "\n"
@@ -21884,18 +23053,18 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
-"Foi tudo configurado correctamente.\n"
+"Foi tudo configurado.\n"
 "\n"
 "Pode agora partilhar recursos através da Internet,\n"
 "de uma maneira segura, utilizando uma conexão VPN.\n"
 "\n"
-"Deve certificar-se de que a secção tunnels shorewall\n"
-"se encontra configurada."
+"Deve certificar-se que a secção tunnels shorewall\n"
+"está configurada."
 
 #: standalone/drakvpn:923
 #, c-format
 msgid "Sainfo source address"
-msgstr "Endereço de origem do sainfo"
+msgstr "Sainfo endereço de origem"
 
 #: standalone/drakvpn:924
 #, c-format
@@ -21908,7 +23077,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"
@@ -21919,18 +23088,18 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.1.0/24 is the source address"
 msgstr ""
-"sainfo (id_origem id_destino | anonymous) { declarações }\n"
-"define os paretros da fase2 do IKE\n"
+"sainfo (source_id id_destino | anonymous) { declarações }\n"
+"define os parâmetros da fase2 do IKE\n"
 "(estabelecimento IPsec-SA).\n"
 "\n"
-"id_origem e id_destino são construidos assim:\n"
+"source_id e id_destino são construidos como:\n"
 "\n"
 "\taddress address [/ prefixo] [[porta]] ul_proto\n"
 "\n"
 "Exemplos : \n"
 "\n"
 "sainfo anonymous (aceita todas as conexões)\n"
-"\tdeixe esta entrada em branco se desejar anonymous\n"
+"\tdeixe esta entrada em branco se desejar anonimo\n"
 "\n"
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\t203.178.141.209 é o endereço de origem\n"
@@ -21941,7 +23110,7 @@ msgstr ""
 #: standalone/drakvpn:941
 #, c-format
 msgid "Sainfo source protocol"
-msgstr "Protocolo de origem sainfo"
+msgstr "Sainfo protocolo de origem"
 
 #: standalone/drakvpn:942
 #, c-format
@@ -21954,7 +23123,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"
@@ -21963,25 +23132,25 @@ msgid ""
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
 "sainfo (id_origem id_destino | anonymous) { declarações }\n"
-"define os paretros da fase2 do IKE\n"
+"define os parâmetros da fase2 do IKE\n"
 "(estabelecimento IPsec-SA).\n"
 "\n"
-"id_origem e id_destino são construidos assim:\n"
+"id_origem e id_destino são construidos como:\n"
 "\n"
 "\taddress address [/ prefixo] [[porta]] ul_proto\n"
 "\n"
 "Exemplos : \n"
 "\n"
-"sainfo anonymous (aceita todas as conexões)\n"
-"\tdeixe esta entrada em branco se desejar anonymous\n"
+"sainfo anonymous (aceita todas as conexões de qualquer lado)\n"
+"\tdeixe esta entrada em branco se desejar anonimo\n"
 "\n"
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\to primeiro 'any' permite qualquer protocolo à origem"
+"\to primeiro 'any' permite qualquer protocolo da origem"
 
 #: standalone/drakvpn:956
 #, c-format
 msgid "Sainfo destination address"
-msgstr "Endereço de destino do sainfo"
+msgstr "Sainfo Endereço de destino"
 
 #: standalone/drakvpn:957
 #, c-format
@@ -21994,7 +23163,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"
@@ -22006,7 +23175,7 @@ msgid ""
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
 "sainfo (id_origem id_destino | anonymous) { declarações }\n"
-"define os paretros da fase2 do IKE\n"
+"define os parâmetros da fase2 do IKE\n"
 "(estabelecimento IPsec-SA).\n"
 "\n"
 "id_origem e id_destino são construidos assim:\n"
@@ -22016,7 +23185,7 @@ msgstr ""
 "Exemplos : \n"
 "\n"
 "sainfo anonymous (aceita todas as conexões)\n"
-"\tdeixe esta entrada em branco se desejar anonymous\n"
+"\tdeixe esta entrada em branco se desejar anonimo\n"
 "\n"
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\t203.178.141.218 é o endereço de destino\n"
@@ -22027,7 +23196,7 @@ msgstr ""
 #: standalone/drakvpn:974
 #, c-format
 msgid "Sainfo destination protocol"
-msgstr "Protocolo de destino sainfo"
+msgstr "Sainfo protocolo de destino"
 
 #: standalone/drakvpn:975
 #, c-format
@@ -22040,7 +23209,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"
@@ -22049,7 +23218,7 @@ msgid ""
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
 "sainfo (id_origem id_destino | anonymous) { declarações }\n"
-"define os paretros da fase2 do IKE\n"
+"define os parâmetros da fase2 do IKE\n"
 "(estabelecimento IPsec-SA).\n"
 "\n"
 "id_origem e id_destino são construidos assim:\n"
@@ -22059,10 +23228,10 @@ msgstr ""
 "Exemplos : \n"
 "\n"
 "sainfo anonymous (aceita todas as conexões)\n"
-"\tdeixe esta entrada em branco se desejar anonymous\n"
+"\tdeixe esta entrada em branco se desejar anonimo\n"
 "\n"
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
-"\to último 'any' permite qualquer protocolo ao destino"
+"\to último 'any' permite qualquer protocolo do destino"
 
 #: standalone/drakvpn:989
 #, c-format
@@ -22075,13 +23244,13 @@ 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 ""
 "define o grupo de exponenciações Diffie-Hellman.\n"
-"No caso de não requerer PFS pode omitir esta directiva.\n"
-"Qualquer proposta será aceite se não especificar nenhuma.\n"
-"o grupo é um dos seguintes: modp768, modp1024, modp1536.\n"
+"Se não requerer PFS, então pode omitir esta directiva.\n"
+"Qualquer proposta será aceite se não especificar uma.\n"
+"O grupo é um dos seguintes: modp768, modp1024, modp1536.\n"
 "Ou pode definir 1, 2, ou 5 como o número de grupo DH."
 
 #: standalone/drakvpn:996
@@ -22094,11 +23263,11 @@ msgstr "Número de tempo-de-vida"
 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"
@@ -22109,13 +23278,13 @@ msgid ""
 "\n"
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
-"define um tempo-de-vida de uma certa duração que será\n"
-"proposto na fase 1 das negociações.  Qualquer proposta será\n"
-"aceite, e o(s) atributo(s) não serão propostos ao peer se não\n"
-"os especificar.  Os atributos podem ser especificados individualmente\n"
-"em cada proposta.\n"
+"define um tempo de vida de um certa tempo que será\n"
+"proposto nas negociações da fase 1.  Qualquer proposta\n"
+"será aceite, e o(s) atributo(s) não serão propostos ao peer\n"
+"se não os especificar.  Os atributos podem ser especificados\n"
+"individualmente em cada proposta.\n"
 "\n"
-"Exemplos : \n"
+"Exemplos: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -22124,38 +23293,38 @@ msgstr ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"Portanto, aqui, os números do tempo-de-vida são 1, 1, 30, 30, 60 e 12.\n"
+"Então, aqui, os números do tempo de vida são 1, 1, 30, 30, 60 e 12.\n"
 
 #: standalone/drakvpn:1013
 #, c-format
 msgid "Lifetime unit"
-msgstr "Unidade de lifetime"
+msgstr "Unidade de tempo de vida"
 
 #: standalone/drakvpn:1015
 #, c-format
 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"
 msgstr ""
-"define um tempo-de-vida de uma certa duração que será\n"
-"proposto na fase 1 das negociações.  Qualquer proposta será\n"
-"aceite, e o(s) atributo(s) não serão propostos ao peer se não\n"
-"os especificar.  Os atributos podem ser especificados individualmente\n"
+"define um tempo-de-vida de um certo tempo que será proposto\n"
+"na fase 1 das negociações.  Qualquer proposta será aceite, e\n"
+"o(s) atributo(s) não serão propostos ao peer se não os especificar.\n"
+"Os atributos podem ser especificados individualmente\n"
 "em cada proposta.\n"
 "\n"
 "Exemplos : \n"
@@ -22167,7 +23336,8 @@ msgstr ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"Portanto, aqui, as unidades do tempo-de-vida são 'min', 'min', 'seg', 'seg', 'seg' e 'hora'.\n"
+"Então, aqui, as unidades do tempo de vida são 'min', 'min', 'seg', 'seg', "
+"'seg' e 'hora'.\n"
 
 #: standalone/drakvpn:1031 standalone/drakvpn:1116
 #, c-format
@@ -22203,16 +23373,16 @@ 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]"
 msgstr ""
-"remote (endereço | anonymous) [[porta]] { declarações }\n"
-"especifíca  os parâmetros para a fase 1 do IKE para cada nó remoto.\n"
-"A porta por defeito é a 500.  Se for declarado anónimo, as declarações\n"
-"aplicam-se a todos os peers que não se assemelham a nenhuma outra\n"
-"directiva remota.\n"
+"remoto (endereço | anonimo) [[porta]] { declarações }\n"
+"especifíca os parâmetros para a fase 1 do IKE para cada nó remoto.\n"
+"A porta padrão é a 500.  Se especificado anonimo anónimo, as decla-\n"
+"rações aplicam-se a todos os peers que não combinem qualquer\n"
+"outra directiva remota.\n"
 "\n"
 "Exemplos : \n"
 "\n"
@@ -22234,11 +23404,11 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
-"define o modo de partilha para a fase 1 quando o racoon é o iniciador.\n"
-"Também define o modo de partilha aceite quando o racoon está em\n"
-"resposta. Pode-se especificar mais do que um modo separando-os com\n"
-"uma vírgula. Todos os  modos são aceitáveis. O primeiro modo de partilha é\n"
-"aquele que o racoon utiliza quando é o iniciador.\n"
+"define o modo de troca para a fase 1 quando o racoon é o iniciador.\n"
+"Também define o modo de troca aceite quando o racoon é o que\n"
+"responde. Mais do que um modo pode ser especificado ao separá-\n"
+"-los com uma vírgula. Todos os modos são aceitáveis. O primeiro\n"
+"modo de troca é o que o racoon usa quando é o iniciador.\n"
 
 #: standalone/drakvpn:1060
 #, c-format
@@ -22273,19 +23443,19 @@ msgid ""
 "tiator and the responder.  This directive is ignored in\n"
 "the initiator case.  The default value is off."
 msgstr ""
-"Esta directiva é para o respondente.  Desta maneira\n"
-"deve activar a passividade de modo a que apenas o\n"
-"racoon(8) se torne num respondente.  Se o respondente\n"
-"não tiver nenhuma policiamento SPD durante a fase 2 da\n"
-"negociação, e a directiva estiver activada , então o racoon(8)\n"
-"irá escolher a primeira proposta no payload SA do iniciador, e\n"
-"gerará entradas de policiamento para a proposta.  É útil negociar\n"
-"com o cliente que está com atribuição de endereço IP dinâmico\n"
-"  Note-se que o iniciador pode instalar policiamento inapropriado\n"
-"no SPD do respondente.  Em tal caso outras comunicações podem\n"
-"falhar se tais policiamentos forem instalados,.o que se deve a\n"
-"diferenças entre o policiamento do iniciador e do respondente.  Esta\n"
-"directiva é ignorada no caso do iniciador.  O valor por defeito é desligado."
+"Esta directiva é para o que responde.  Então deve definir o\n"
+"modo passivo de modo que o racoon(8) se torne no que\n"
+"responde.  Se o que responde não tem qualquer política em\n"
+"SPD durante negociação da fase 2, e a directiva está definida\n"
+"para activa, então o racoon(8) irá escolher a primeira propos-\n"
+"ta no payload SA do iniciador, e gerar entradas de politica da\n"
+"proposta.  É útil negociar com o cliente que está dinamicamen-\n"
+"te alocado com um endereço IP.  Note-se que politícas inapro-\n"
+"priadas podem ser instaladas no que dá respostas SPD pelo\n"
+"iniciador.  Para que outra comunidade possa falhar se tais po-\n"
+"litícas instaladas devido a algum desencontro entre politícas\n"
+"do iniciador e do que responde.  Esta directiva é ignorada no\n"
+"caso de ser o iniciadoro.  O valor padrão é desligado."
 
 #: standalone/drakvpn:1076
 #, c-format
@@ -22299,14 +23469,14 @@ msgid ""
 "to on.  The default value is off.  It is useful for a\n"
 "server."
 msgstr ""
-"Se não desejar iniciar a autonegociação, defina isto\n"
-"para ligado.  O valor por defeito é desligado.  É útil\n"
+"Se não quiser iniciar a negociação, defina isto\n"
+"para ligado.  O valor padrã é desligado.  É útil\n"
 "para um servidor."
 
 #: standalone/drakvpn:1081
 #, c-format
 msgid "Certificate type"
-msgstr "Tipo do certificado"
+msgstr "Tipo de certificado"
 
 #: standalone/drakvpn:1083
 #, c-format
@@ -22341,7 +23511,7 @@ msgstr "Nome do certificado dos peers"
 #: standalone/drakvpn:1089
 #, c-format
 msgid "Verify cert"
-msgstr "Verificar certificação"
+msgstr "Verificar certificado"
 
 #: standalone/drakvpn:1091
 #, c-format
@@ -22349,8 +23519,8 @@ msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
-"Se não desejar verificar o certificado dos peers por\n"
-"alguma razão, defina isto para desligado.  Por defeito é ligado."
+"Se não quiser verificar o certificado dos peers por\n"
+"alguma razão, defina isto para desligado.  O padrão é ligado."
 
 #: standalone/drakvpn:1093
 #, c-format
@@ -22361,7 +23531,7 @@ msgstr "O meu identificador"
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -22370,7 +23540,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"
@@ -22379,32 +23549,32 @@ 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 ""
-"especifíca o identificador enviado para o anfitrião remoto e o tipo\n"
-"a usar na fase 1 da negociação.  endereço, fqdn,\n"
+"especifíca o identificador enviado para o anfitrião remoto e\n"
+"o tipo a usar na fase 1 da negociação.  endereço, FQDN,\n"
 "user_fqdn, keyid e asn1dn podem ser usados como um idtype.\n"
-"they are used like:\n"
+"eles são usados como:\n"
 "\tmy_identifier address [address];\n"
-"\t\tthe type is the IP address.  This is the default\n"
-"\t\ttype if you do not specify an identifier to use.\n"
+"\t\to tipo é o endereço IP.  Isto é o tipo\n"
+"\t\tpadrão se naõ quiser especificar um identificador para usar.\n"
 "\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"
-"\t\tthe type is a FQDN (fully-qualified domain name).\n"
+"\t\to tipo é um USER_FQDN (nome do dominio de um utilizador\n"
+"\t\tcomplectamente qualificado).\n"
+"\tmy_identifier FQDN string;\n"
+"\t\to tipo é um FQDN (nome de dominio qualificado)\n"
 "\tmy_identifier keyid file;\n"
-"\t\tthe type is a KEY_ID.\n"
+"\t\to tipo é um KEY_ID.\n"
 "\tmy_identifier asn1dn [string];\n"
-"\t\tthe type is an ASN.1 distinguished name.  If\n"
-"\t\tstring is omitted, racoon(8) will get DN from\n"
-"\t\tSubject field in the certificate.\n"
+"\t\to tipo é um ASN.1 nome distinguido.  Se a\n"
+"\t\tstring é omitida, o racoon(8) irá obter o DN do\n"
+"\t\tcampo do Assunto no certificado.\n"
 "\n"
-"Examples : \n"
+"Exemplos: \n"
 "\n"
-"my_identifier user_fqdn \"myemail@mydomain.com\""
+"my_identifier user_fqdn \"meuemail@meudominio.com\""
 
 #: standalone/drakvpn:1114
 #, c-format
@@ -22421,19 +23591,20 @@ msgstr "Proposta"
 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 ""
-"especifique o algorítmo de encriptação utilizado para a\n"
-"fase 1 da negociação. Esta directiva tem de ser definida. \n"
+"especifique o algorítmo de encriptação usado para a\n"
+"fase 1 da negociação. Esta directiva tem de ser definida.\n"
 "o algorítmo é um dos seguintes: \n"
 "\n"
-"des, 3des, blowfish, cast128 para oakley.\n"
+"DES, 3DES, blowfish, cast128 para oakley.\n"
 "\n"
-"Para outras transformações, esta declaração não pode ser usada."
+"Para outras transformações, esta declaração não deve\n"
+"ser usada."
 
 #: standalone/drakvpn:1124
 #, c-format
@@ -22458,12 +23629,12 @@ msgstr "Comando"
 #: standalone/drakvpn:1134
 #, c-format
 msgid "Source IP range"
-msgstr "Zona do IP de origem"
+msgstr "Extensão do IP de origem"
 
 #: standalone/drakvpn:1135
 #, c-format
 msgid "Destination IP range"
-msgstr "Zona do IP de destino"
+msgstr "Exntensão do IP de destino"
 
 #: standalone/drakvpn:1136
 #, c-format
@@ -22527,6 +23698,11 @@ msgstr "requer"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "padrão"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "uso"
 
@@ -22535,116 +23711,117 @@ msgstr "uso"
 msgid "unique"
 msgstr "único"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
-msgstr "USA (broadcast)"
+msgstr "USA (transmissão)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "USA (cabo)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "USA (cabo-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Canada (cabo)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
-msgstr "Japão (broadcast)"
+msgstr "Japão (transmissão)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Japão (cabo)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
-msgstr "China (broadcast)"
+msgstr "China (transmissão)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
-msgstr "Europa do Oeste"
+msgstr "Europa Oeste"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Europa do Leste"
 
-#: 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-Zelândia"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
-msgstr "Australiano Optus TV por Cabo"
+msgstr "Cabo de TV Optus Australiano"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr ""
 "Por favor,\n"
-"escreva o seu sistema de TV e o país"
+"digite a norma da sua tv e país"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
-msgstr "Sistema TV :"
+msgstr "Norma 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 ..."
-msgstr "A procura de cadeias TV avança..."
+msgid "Scanning for TV channels in progress..."
+msgstr "Detecção de canais de TV em progresso..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
-msgstr "À procura de cadeias TV"
+msgstr "A detectar canais de TV"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
-msgstr "Houve um erro enquanto procurava cadeias de TV"
+msgstr "Houve um erro enquanto a detectar por canais de TV"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Tenha um bom dia!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
-msgstr "Agora, você pode utilizar xawtv (sob X Window!) !\n"
+msgstr "Agora, pode usar xawtv (sob X Window!) !\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Nenhuma placa TV detectada!"
 
-#: 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-"
@@ -22656,60 +23833,36 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"Nenhuma placa TV foi encontrada na sua máquina. Por favor verifique que uma "
-"placa Video/TV suportada por Linux está bem ligada.\n"
+"Nenhuma placa TV foi detectada na sua máquina. Por favor verifique que a "
+"placa de Video/TV suportada pelo Linux está bem conectada.\n"
 "\n"
 "\n"
-"Pode visitar a nossa base de dados de material em :\n"
+"Pode visitar a nossa base de dados de hardware em :\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
-msgstr "Pilotos alternativos"
+msgstr "Drivers alternativos"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
-msgstr "a lista dos pilotos alternativos para esta placa de som"
-
-#: standalone/harddrake2:22
-#, c-format
-msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr "este é o caminho físico onde está ligado o dispositivo (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"
+msgstr "a lista dos drivers alternativos para esta placa de som"
 
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
-"O núcleo GNU/Linux precisa de fazer um ciclo de cálculos ao iniciar-separa "
-"preparar um contador de tempo.  O resultado é guardado em Bogomips como um "
-"\"índice\" de velocidade do processador."
+"este é o bus físico no qual o disposito está conectado (ex: PCI, USB, ...)"
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
-msgstr "Identificação do Bus?"
+msgstr "Identificação do Bus"
 
 #: standalone/harddrake2:27
 #, c-format
@@ -22717,7 +23870,7 @@ msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
 "subdevice PCI/USB ids"
 msgstr ""
-"- dispositivos PCI e USB : isto lista os ids PCI/USB do vendedor, do "
+"- dispositivos PCI e USB : isto lista  os ids PCI/USB do vendedor, do "
 "dispositivo, e os ids sub PCI/USB corespondentes"
 
 #: standalone/harddrake2:30
@@ -22727,773 +23880,998 @@ msgid ""
 "- eide devices: the device is either a slave or a master device\n"
 "- scsi devices: the scsi bus and the scsi device ids"
 msgstr ""
-"- dispositivos PCI : isto indica o slot, o dispositivo e a função desta "
-"placa\n"
-"- dispositivos EIDE : o dispositivo é um mestre ou um escravo\n"
-"- dispositivos scsi : o bus scsi o os ids scsi do dispositivo"
+"- dispositivos PCI : isto dá o slot PCI, dispositivo e função desta placa\n"
+"- dispositivos EIDE : o dispositivo ou é slave ou master\n"
+"- dispositivos SCSI : o bus scsi o os ids do dispositivo scsi"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Tamanho do cache"
+msgid "Drive capacity"
+msgstr "Capacidade do disco"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "tamanho do cache (nível 2) do processador"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "capacidades especiais do driver (capacidade de gravar e/ou sporte DVD)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Tamanho do disco"
+msgid "this field describes the device"
+msgstr "este campo descreve o dispositivo"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "funções particulares do dispositivo (gravação ou aceite de DVD)"
+msgid "Old device file"
+msgstr "Antigo ficheiro do dispositivo"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
 #, c-format
-msgid "Coma bug"
-msgstr "Erro de virgula"
+msgid "old static device name used in dev package"
+msgstr "nome de dispositivo estático antigo usado no pacote dev"
 
 #: standalone/harddrake2:37
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "se o processador tem o erro de virgula dos Cyrix 6x86"
-
-#: standalone/harddrake2:38
-#, c-format
-msgid "Cpuid family"
-msgstr "Família de cpuid"
+msgid "New devfs device"
+msgstr "Novo dispositivo devfs"
 
 #: standalone/harddrake2:38
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "Família do processador (ex: 6 para a classe i686"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "novo nome dinâmico do dispositivo gerado pelo núcleo devfs do kernel"
 
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid level"
-msgstr "Nível de cpuid"
+msgid "Module"
+msgstr "Módulo"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "nível de informação que pode ser obtido com a instrução cpuid"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "o módulo do kernel GNU/Linux que gere o dispositivo"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Frequência (MHz)"
+msgid "Extended partitions"
+msgstr "Partições extendidas"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"A frequência do processador em MHz (Mega Hertz que em primeira aproximação "
-"pode ser por erro assimilada à quantia de instruções que o processador pode "
-"tratar por segundo)"
+msgid "the number of extended partitions"
+msgstr "o número de partições extendidas"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
 #, c-format
-msgid "this field describes the device"
-msgstr "este campo descreve o dispositivo"
+msgid "Geometry"
+msgstr "Geometria"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
 #, c-format
-msgid "Old device file"
-msgstr "Antigo ficheiro de periférico"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "Cilindros/cabeças/sectores geometria do disco"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "Antigo nome fixo do dispositivo utilizado no pacote dev"
+msgid "Disk controller"
+msgstr "Controlador do Disco"
 
 #: standalone/harddrake2:44
 #, c-format
-msgid "New devfs device"
-msgstr "Novo periférico devfs"
+msgid "the disk controller on the host side"
+msgstr "o controlador do disco na parte do anfitrião(host)"
 
 #: standalone/harddrake2:45
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "novo nome dinâmico do dispositivo criado pela parte devfs do núcleo"
+msgid "class of hardware device"
+msgstr "classe do hardware do dispositivo"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, c-format
-msgid "Module"
-msgstr "Módulo"
+msgid "Model"
+msgstr "Modelo"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "Modelo de disco rígido"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "porta da impressora na rede"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "o módulo do núcleo GNU/Linux que pilota este dispositivo"
+msgid "Primary partitions"
+msgstr "Partições primárias"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:48
 #, c-format
-msgid "Extended partitions"
-msgstr "Partições extendidas"
+msgid "the number of the primary partitions"
+msgstr "o número de partições primárias"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "the number of extended partitions"
-msgstr "o número de partições extendidas"
+msgid "the vendor name of the device"
+msgstr "o nome do vendedor do dispositivo"
 
 #: standalone/harddrake2:50
 #, c-format
-msgid "Flags"
-msgstr "Bandejas"
+msgid "Bus PCI #"
+msgstr "Bus PCI #"
 
 #: standalone/harddrake2:50
 #, c-format
-msgid "CPU flags reported by the kernel"
-msgstr "Bandejas do processador indicadas pelo núcleo"
+msgid "the PCI bus on which the device is plugged"
+msgstr "a bus PCI onde o dispositivo está conectado"
 
 #: standalone/harddrake2:51
 #, c-format
-msgid "Fdiv bug"
-msgstr "Erro Fdiv"
+msgid "PCI device #"
+msgstr "Dispositivo PCI #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "Número do dispositivo PCI"
 
 #: standalone/harddrake2:52
 #, c-format
-msgid ""
-"Early Intel Pentium chips manufactured have a bug in their floating point "
-"processor which did not achieve the required precision when performing a "
-"Floating point DIVision (FDIV)"
-msgstr ""
-"Os primeiros processadores Intel Pentium fabricados têm um erro na unidade "
-"de cálculos por virgula que não permite a precisão esperada quando é feita "
-"uma divisão com virgulas (FDIV)"
+msgid "PCI function #"
+msgstr "Função PCI #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "Número da função PCI"
 
 #: standalone/harddrake2:53
 #, c-format
-msgid "Is FPU present"
-msgstr "Inclui uma FPU"
+msgid "Vendor ID"
+msgstr "ID do vendedor"
 
 #: standalone/harddrake2:53
 #, c-format
-msgid "yes means the processor has an arithmetic coprocessor"
-msgstr "sim significa que o processador tem um coprocessador aritmético"
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "este é o identificador númerico standard do vendedor"
 
 #: standalone/harddrake2:54
 #, c-format
-msgid "Whether the FPU has an irq vector"
-msgstr "Se o FPU tem um vector irq"
+msgid "Device ID"
+msgstr "ID do dispositivo"
 
 #: standalone/harddrake2:54
 #, c-format
-msgid "yes means the arithmetic coprocessor has an exception vector attached"
-msgstr "sim significa que o coprocessador aritmético tem um vector de excepção"
+msgid "this is the numerical identifier of the device"
+msgstr "este é o identificador númerico do dispositivo"
 
 #: standalone/harddrake2:55
 #, c-format
-msgid "F00f bug"
-msgstr "Erro F00f"
+msgid "Sub vendor ID"
+msgstr "ID do sub-vendedor"
 
 #: standalone/harddrake2:55
 #, c-format
-msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
-msgstr "os primeiros Pentium tinham um erro que os bloqueia na instrução F00F"
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "este é o menor identificador númerico do vendedor"
 
 #: standalone/harddrake2:56
 #, c-format
-msgid "Geometry"
-msgstr "Geometria"
+msgid "Sub device ID"
+msgstr "ID do sub dispositivo"
 
 #: standalone/harddrake2:56
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr "Cilindros/cabeças/sectores geometria do disco"
+msgid "this is the minor numerical identifier of the device"
+msgstr "este é o menor identificador númerico do dispositivo"
 
 #: standalone/harddrake2:57
 #, c-format
-msgid "Halt bug"
-msgstr "Erro halt"
-
-#: standalone/harddrake2:58
-#, c-format
-msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
-msgstr ""
-"Alguns dos primeiros processadores i486DX-100 não podem voltar ao modo "
-"operacional de maneira segura depois de ter utilizado a instrução \"halt\"."
+msgid "Device USB ID"
+msgstr "ID do dispositivo USB"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:57
 #, c-format
-msgid "Floppy format"
-msgstr "Formatos de disquete"
+msgid ".."
+msgstr ".."
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:61
 #, c-format
-msgid "format of floppies supported by the drive"
-msgstr "formatos de disquetes que o leitor aceita"
+msgid "Bogomips"
+msgstr "Bogomips"
 
 #: standalone/harddrake2:61
 #, c-format
-msgid "sub generation of the cpu"
-msgstr "sub-geração do processador"
+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 ""
+"O kernel GNU/Linux precisa de executar o ciclo de cálculos na altura do "
+"arranque para inicializar o contador de tempo.  Os seus resultados são "
+"guardados como bogomips como uma maneira de \"benchmark\" (referência "
+"comparativa) do processador (cpu)."
 
 #: standalone/harddrake2:62
 #, c-format
-msgid "class of hardware device"
-msgstr "classe do dispositivo material"
-
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Modelo"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "Modelo de disco rígido"
+msgid "Cache size"
+msgstr "Tamanho da cache"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:62
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "Geração do processador (ex: 8 para os Pentium III, ...)"
+msgid "size of the (second level) cpu cache"
+msgstr "tamanho da cache (segundo nível) do processador"
 
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:65
 #, c-format
-msgid "Model name"
-msgstr "Nome do modelo"
+msgid "Coma bug"
+msgstr "Erro do coma"
 
 #: standalone/harddrake2:65
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "nome oficial de venda do processador"
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "se este processador tem o erro decoma dos Cyrix 6x86"
 
 #: standalone/harddrake2:66
 #, c-format
-msgid "Number of buttons"
-msgstr "Número de botões"
+msgid "Cpuid family"
+msgstr "Família cpuid"
 
 #: standalone/harddrake2:66
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "o numero de botões que o rato tem"
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "Família do processador (ex: 6 para a classe i686)"
 
 #: standalone/harddrake2:67
 #, c-format
-msgid "the name of the CPU"
-msgstr "o nome do processador"
+msgid "Cpuid level"
+msgstr "Nível do cpuid"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "nível de informação que pode ser obtido atravez da instrução cpuid"
 
 #: standalone/harddrake2:68
 #, c-format
-msgid "network printer port"
-msgstr "porta na rede da impressora"
+msgid "Frequency (MHz)"
+msgstr "Frequência (MHz)"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:68
 #, c-format
-msgid "Processor ID"
-msgstr "ID Processador"
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"A frequência do processador em MHz (Megahertz que na primeira aproximação "
+"pode ser por erro assimilada ao número de de instruções que o processador "
+"consegue executar por segundo)"
 
 #: standalone/harddrake2:69
 #, c-format
-msgid "the number of the processor"
-msgstr "o numero do processador"
+msgid "Flags"
+msgstr "Flags"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:69
 #, c-format
-msgid "Primary partitions"
-msgstr "Partições primárias"
+msgid "CPU flags reported by the kernel"
+msgstr "flags do processador indicadas pelo kernel"
 
 #: standalone/harddrake2:70
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "o número de partições primárias"
+msgid "Fdiv bug"
+msgstr "Erro Fdiv"
 
 #: standalone/harddrake2:71
 #, c-format
-msgid "Model stepping"
-msgstr "Passo de modelo"
+msgid ""
+"Early Intel Pentium chips manufactured have a bug in their floating point "
+"processor which did not achieve the required precision when performing a "
+"Floating point DIVision (FDIV)"
+msgstr ""
+"Os primeiros processadores Intel Pentium fabricados têm um erro no seu "
+"processador 'floating point ' que não permite a precisão esperada quando a "
+"executar uma 'Floating point DIVision (FDIV)'"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:72
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr "evolução do processador (numero de sub-modelo (geração))"
+msgid "Is FPU present"
+msgstr "FPU está presente"
 
 #: standalone/harddrake2:72
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "o tipo de transporte ao qual o rato está ligado"
+msgid "yes means the processor has an arithmetic coprocessor"
+msgstr "sim significa que o processador tem um coprocessador aritmético"
 
 #: standalone/harddrake2:73
 #, c-format
-msgid "the vendor name of the device"
-msgstr "o nome comercial do dispositivo"
+msgid "Whether the FPU has an irq vector"
+msgstr "Se o FPU tem um vector irq"
+
+#: standalone/harddrake2:73
+#, c-format
+msgid "yes means the arithmetic coprocessor has an exception vector attached"
+msgstr ""
+"sim significa que o coprocessador aritmético tem um vector de excepção "
+"anexado"
 
 #: standalone/harddrake2:74
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "o nome comercial do processador"
+msgid "F00f bug"
+msgstr "Erro F00f"
+
+#: standalone/harddrake2:74
+#, c-format
+msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
+msgstr ""
+"os primeiros Pentium eram buggy e bloqueavam quando a desencodificar o F00F "
+"bytecode"
 
 #: standalone/harddrake2:75
 #, c-format
+msgid "Halt bug"
+msgstr "Erro halt"
+
+#: standalone/harddrake2:76
+#, c-format
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr ""
+"Alguns dos primeiros chips i486DX-100 não podem voltar ao modo operacional "
+"de maneira segura depois de ter usado a instrução \"halt\"."
+
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr "sub-geração do processador"
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "geração do processador (ex: 8 para os Pentium III, ...)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Nome do modelo"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "nome oficial do vendedor do processador"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "o nome do processador"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "ID Processador"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "o numero do processador"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr "Passo do modelo"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr "passo do processador (numero de sub-modelo (geração))"
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "o nome do vendedor do processador"
+
+#: standalone/harddrake2:84
+#, c-format
 msgid "Write protection"
-msgstr "Protecção em Escritura"
+msgstr "Protecção de escrita"
 
-#: 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 ""
-"a bandeira WP no registo CR0 do processador força a protecção da escritura "
-"ao nível da página da memória, permitindo ao processador de evitar acessos "
-"não verificados do núcleo à memória do utilizador (isto é uma protecção "
-"contra os erros)"
+"a bandeira WP no registo CR0 do processador força a protecção de escrita ao "
+"nível da página da memória, permitindo assim o processador de evitar acessos "
+"desmarcados no kernel à memória do utilizador (é uma protecção contra erros)"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "Floppy format"
+msgstr "Formatos de disquete"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "formatos de disquetes suportados pelo drive"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Canal"
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "Canal EIDE/SCSI"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "Disk identifier"
+msgstr "Identificador do disco"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr "usualmente o número série do disco"
+
+#: standalone/harddrake2:94
+#, c-format
+msgid "Logical unit number"
+msgstr "Número da unidade lógica"
+
+#: 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 ""
+"o número da marca SCSI (LUN). Os dispositivos SCSI conectados a um anfitrião "
+"são\n"
+"únicamente identificados por um número d canal, uma marca id e um número de "
+"unidade lógica"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Ficheiro de dispositivo"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+"o ficheiro do dispositivo usado para comunicar com o driver do kernel para o "
+"rato"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr "Roda emulada"
+
+#: standalone/harddrake2:100
+#, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "se a roda está emulada ou não"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "o tipo do rato"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "o nome do rato"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Número de botões"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "o número de botões que o rato tem"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "o tipo de bus no qual o rato está conectado"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr "Protocolo de rato usado pelo X11"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "o protocolo que o desktop gráfico usa com o rato"
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Identificação"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Conexão"
+
+#: standalone/harddrake2:122
+#, c-format
+msgid "Performances"
+msgstr "Performances"
+
+#: standalone/harddrake2:123
+#, c-format
+msgid "Bugs"
+msgstr "Erros"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Partições"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Funcionalidades"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: 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 "/Auto-detectar _impressoras"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Auto-detectar _modems"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
-msgstr "/Auto-detectar leitores _jaz"
+msgstr "/Auto-detectar drives _jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
-msgstr "/Descrição dos _Campos"
+msgstr "/_Descrição dos campos"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
-msgstr "Ajuda de Harddrake"
+msgstr "Ajuda Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Descrição dos campos :\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
 msgstr ""
-"Quando tiver escolhido um dispositivo, vai obter detalhes sobre os elementos "
-"mostrados no quadro da direita (\"Informação\")"
+"Assim que tiver escolhido um dispositivo, irá ser capaz de ver a informação "
+"do dispositivo em campos exibidos no frame correcto (\"Informação\")"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
-msgstr "/_Comunicar um Erro"
+msgstr "/_Reportar Erro"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Acerca..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
-msgstr "Acerca de Harddrake"
+msgstr "Acerca do 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 ""
-"Isto é Harddrake, uma ferramenta Mandrake de configuração do hardware.\n"
+"Isto é Harddrake, uma ferramenta Mandrakelinux para configurar o hardware.\n"
 "<span foreground=\"royalblue3\">Versão:</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 "Versão de Harddrake2 %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
-msgstr "Hardware encontrado"
+msgstr "Hardware detectado"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Configurar modulo"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
-msgstr "Executar a ferramenta de configuração"
+msgstr "Executar ferramenta de configuração"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "desconhecido"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Misc"
+
+#: standalone/harddrake2:332
 #, c-format
-msgid "Click on a device in the left tree in order to display its information here."
+msgid ""
+"Click on a device in the left tree in order to display its information here."
 msgstr ""
-"Carregue num dispositivo na lista à esquerda para obter as suas informações "
+"Clique num dispositivo na árvore à esquerda para mostrar a sua informação "
 "aqui."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "secundario"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
-msgstr "principal"
+msgstr "primário"
 
-#: 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 "Por favor escolha o tipo de teclado."
+msgstr "Por favor, escolha a disposição do seu teclado."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "Deseja que o BackSpace funcione como Suppr na consola?"
+msgstr "Deseja que o BackSpace execute Delete na 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 "A mudança está feita, mas para ser efectiva é preciso desligar-se"
+msgstr "A mudança está feita, mas para ser efectiva é preciso sair/logout"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Registos das Ferramentas Mandrake"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Registos das Ferramentas Mandrakelinux"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Mostrar apenas para o dia seleccionado"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Ficheiro/_Novo"
 
-#: 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 "/Ficheiro/_Abrir"
 
-#: 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 "/Ficheiro/_Guardar"
 
-#: 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 "/Ficheiro/Guardar _Como"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Ficheiro/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Opções/Teste"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Ajuda/_Sobre..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Autenticação"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Utilizador"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Mensagens"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "Syslog"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "pesquisa"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Uma ferramenta para monitorizar os seus registos"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
-msgstr "Configuração"
+msgstr "Configurações"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Correspondente"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
-msgstr "mas não há correspondência"
+msgstr "mas não corresponde"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
-msgstr "Escolha ficheiro"
+msgstr "Escolha o ficheiro"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Calendário"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Conteúdo do ficheiro"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
-msgstr "Alerta por Correio"
+msgstr "Alerta de Correio Eletrônico"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "O assistente de alerta falhou inesperadamente:"
 
 #: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
-msgstr "aguarde por favor, a analisar ficheiro: %s"
+msgstr "por favor aguarde, a analisar o ficheiro: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Servidor WWW Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
-msgstr "Calculador de Nome do domínio"
+msgstr "Resolução de Nome do domínio"
 
-#: 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 correio Postfix"
+msgstr "Servidor de Correio Eletrônico 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 "Serviço Webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Serviço Xinetd"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
-msgstr "Configurar o sistema de alertas do correio"
+msgstr "Configurar o sistema de alertas de correio eletrônico"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Parar o sistema de alerta de e-mail"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
-msgstr "Configuração alertas Correio"
+msgstr "Configuração dos alertas de Correio eletrônico"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
-"Bem vindo ao utilitário de configuração do correio.\n"
+"Bem vindo ao utilitário de configuração do correio eletrônico.\n"
 "\n"
 "Aqui, poderá configurar o sistema de alertas.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
-msgstr "Que deseja fazer?"
+msgstr "O que deseja fazer?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Definições dos serviços"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr ""
-"Você vai receber uma alerta se um dos serviços seleccionados pára de "
-"funcionar"
+"Você irá receber um alerta se um dos serviços seleccionados já não estiver a "
+"correr"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
-msgstr "Carregar a configuração"
+msgstr "Carregar configuração"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
-msgstr "Você vai receber uma alerta se a carga é superior a este valor"
+msgstr "Você irá receber um alerta se a carga for superior a este valor"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Carga"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Configuração de alertas"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
-msgstr "Por favor escreva o seu endereço de correio abaixo "
+msgstr "Por favor digite o seu endereço de correio eletrônico abaixo "
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "e introduza o nome (ou o IP) do servidor SMTP que deseja usar"
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "O assistente configurou com sucesso o alerta de e-mail."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "O assistente desactivou com sucesso o alerta de e-mail."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Guardar como..."
@@ -23501,7 +24879,7 @@ msgstr "Guardar como..."
 #: standalone/mousedrake:31
 #, c-format
 msgid "Please choose your mouse type."
-msgstr "Por favor escolha o tipo de rato."
+msgstr "Por favor escolha o seu tipo de rato."
 
 #: standalone/mousedrake:44
 #, c-format
@@ -23516,29 +24894,76 @@ msgstr "Teste do Rato"
 #: standalone/mousedrake:64
 #, c-format
 msgid "Please test your mouse:"
-msgstr "Por favor teste o rato :"
+msgstr "Por favor teste o seu rato:"
+
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "A Rede está activa na interface %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 "A Rede está em baixo no interface %s. Clique em \"Configurar Rede\""
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Conectar %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Desconectar %s"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Monitorizar Rede"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Configurar Rede"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, c-format
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "Obter Ajuda Online"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Lançar sempre no arranque"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
-msgstr "Controlo da Rede"
+msgstr "Monitarizar Rede"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Estatísticas Globais"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Instantâneo"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Média"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23547,7 +24972,7 @@ msgstr ""
 "Envio\n"
 "velocidade:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23556,7 +24981,7 @@ msgstr ""
 "Recepção\n"
 "velocidade:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23565,470 +24990,465 @@ msgstr ""
 "Conexão\n"
 "tempo: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "Use a mesma escala para a recepção e transmissão"
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
-msgstr "Espere por favor, a testar a sua ligação..."
+msgstr "Espere por favor, a testar a sua conexão..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
-msgstr "A Desligar do Internet "
+msgstr "A desconectar da internet"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
-msgstr "A ligar ao Internet "
+msgstr "A conectar à internet"
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
-msgstr "Falhou o desligo do Internet."
+msgstr "Desconexão da internet falhada"
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
-msgstr "Desligado do Internet."
+msgstr "Desconexão da internet complecta"
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
-msgstr "Ligação feita."
+msgstr "Conexão complecta"
 
-#: 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 ""
-"A ligação falhou.\n"
-"Verifique a sua configuração no Centro de Controlo do Mandrake."
+"A conexão falhou.\n"
+"Verifique a sua configuração no Centro de Controlo Mandrakelinux."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Configuração das cores"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "enviado : "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "recebido : "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "média"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Medidas locais"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "enviado"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "recebido"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
-msgstr "Cuidado, outra ligação Internet foi detectada, talvez utilizando a sua rede"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Desligar %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Ligar %s"
+msgstr ""
+"Aviso, outra conexão à Internet foi detectada, talvez usando a sua rede"
 
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
-msgstr "Não foi configurada nenhuma ligação à internet"
+msgstr "Não foi configurada nenhuma conexão internet"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
-msgstr "A carregar a configuração da impressora... Aguarde por favor"
+msgstr "A carregar configuração da impressora... Por favor aguarde"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
-msgstr "A ler os dados das impressoras instaladas..."
+msgstr "A ler dados das impressoras instaladas..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
-msgstr "%s Ferramenta para Gestão das Impressoras"
+msgstr "%s Ferramenta de Manutenção de Impressoras"
 
-#: 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 "/_Acções"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Adicionar Impressora"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
-msgstr "/_Definir por omissão"
+msgstr "/Definir como _Padrão"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
-msgstr "/Modo de _Perito"
+msgstr "/_Modo Perito"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
-msgstr "/_Recarregar"
+msgstr "/_Refrescar"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Adicionar Impressora"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Configurar CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Procurar:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Nome da Impressora"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
-msgstr "Tipo de Ligação"
+msgstr "Tipo de Conexão"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Nome do 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 "Adicionar Impressora"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Adiciona uma nova impressora ao 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 "Definir por omissão"
+msgstr "Definir como padrão"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
-msgstr "Definir a impressora como impressora por omissão"
+msgstr "Definir a impressora como impressora padrão"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Editar a impressora seleccionada"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Apagar a impressora selecionada"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Recarregar"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
-msgstr "Recarrega a lista"
+msgstr "Refrescar a lista"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS"
 msgstr "Configurar CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Configurar o sistema de impressão CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Activado"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Autores : "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
-msgstr "Gestão das Impressoras \n"
+msgstr "Manutenção de Impressoras \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
 "\n"
 "Do you want to install the SANE packages?"
 msgstr ""
-"Para utilizar scanners é necessário instalar os pacotes SANE.\n"
+"Os pacotes SANE precisam ser instalados para usar scanners.\n"
 "\n"
 "Deseja instalar os pacotes SANE?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
-msgstr "Abortando o Scannerdrake."
+msgstr "Abortar o Scannerdrake."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
-msgid "Could not install the packages needed to set up a scanner with Scannerdrake."
+msgid ""
+"Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
-"Não pude instalar os pacotes precisos para configurar um digitalizador com "
+"Não pude instalar os pacotes necessários para configurar um scanner com o "
 "Scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
-msgstr "Scannerdrake vai ser agora lançado."
+msgstr "O scannerdrake não irá ser iniciado agora."
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
-msgstr "A procurar os digitalizadores configurados..."
+msgid "Searching for configured scanners..."
+msgstr "A procurar os scanners configurados..."
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
-msgstr "A procurar novos digitalizadores..."
+msgid "Searching for new scanners..."
+msgstr "A procurar por novos novos scanners..."
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
-msgstr "A regenerar a lista dos digitalizadores configurados..."
+msgid "Re-generating list of configured scanners..."
+msgstr "A regenerar a lista dos scanners configurados..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "O %s não é suportado por esta versão do %s."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s encontrado em %s, configurar automaticamente?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr "%s não está na lista dos digitalizadores, deseja configurá-lo manualmente?"
+msgstr ""
+"%s não está na lista na base de dados do scanner, configurar manualmente?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
-msgstr "Seleccione um modelo de digitalizador"
+msgstr "Seleccione um modelo de scanner"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Modelo detectado: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Porta: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "O %s não é suportado por esta versão do Scannerdrake."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Não instalar o ficheiro 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 "
 "it is turned on."
-msgstr "É possível que o seu %s necessite que o firmware lhe seja carregado cada vez que é ligado."
+msgstr ""
+"É possível que o seu %s precise que o seu firmware seja carregado cada vez "
+"que é ligado."
 
-#: 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 "Se este é o caso, pode fazer com que isso seja feito automáticamente."
+msgstr "Se este é o caso, pode fazer com que isto seja feito automáticamente."
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
-msgstr "Para tal, necessita de fornecer o ficheiro de firmware do seu scanner para que ele possa ser instalado."
+msgstr ""
+"Para tal, precisa de fornecer o ficheiro de firmware do seu scanner para que "
+"possa ser instalado."
 
-#: 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 "Pode encontrar o ficheiro no CD ou disquete que acompanhavam o scanner, na home page do fabricante, ou na sua partição de Windows."
+msgstr ""
+"Encontra o ficheiro no CD ou disquete que vem com o scanner, na home page do "
+"fabricante, ou na sua partição Windows."
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Instalar o ficheiro de firmware a partir de"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Seleccione o ficheiro 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 "O ficheiro de firmware %s não existe ou está ilegível!"
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
-msgstr "É possível que os seus scanners necessitem que o firmware lhes seja carregado cada vez que eles são ligados."
+msgstr ""
+"É possível que os seus scanners precisem que o seu firmware seja carregado "
+"quando estiverem ligados."
 
-#: 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 "Para tal, necessita de fornecer os ficheiros de firmware dos seus scanners para que eles possam ser instalados."
+msgstr ""
+"Para tal, necessita de fornecer os ficheiros de firmware para os seus "
+"scanners para que eles possam ser instalados."
 
-#: 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 "Se já instalou o firmware do seu scanner pode actualizar o firmware aqui fornecendo o novo ficheiro de firmware."
+msgstr ""
+"Se já instalou o firmware do seu scanner pode actualizar o firmware aqui ao "
+"fornecer o novo ficheiro de firmware."
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
-msgstr "Instalar o firmware para o"
+msgstr "Instalar firmware para o"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
-msgstr "Seleccione o ficheiro de firmware para o %s"
+msgstr "Seleccione o ficheiro firmware para o %s"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "Não foi possível instalar o ficheiro de firmware para o %s!"
+msgstr "Não conseguiu instalar o ficheiro firmware para o %s!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
-msgstr "O ficheiro de firmware para o seu %s foi instalado com sucesso."
+msgstr "O ficheiro firmware para o seu %s foi instalado com sucesso."
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
-msgstr "%s não é suportado"
+msgstr "O %s não é suportado"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 "A %s deve ser configurada pelo printerdrake.\n"
-"Pode executar o printerdrake a partir do %s Centro de Controlo na secção de Hardware."
+"Pode executar o printerdrake a partir do %s Centro de Controlo na secção "
+"Hardware."
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
-msgstr "Auto-detectar as portas disponíveis"
+msgstr "Auto-detectar portas disponíveis"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
-msgstr "Por favor escolha o dispositivo onde o seu %s está ligado"
+msgstr "Por favor escolha o dispositivo onde o seu %s está conectado"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
-msgstr "(Nota : as portas paralelas não podem ser detectadas automaticamente)"
+msgstr "(Nota : portas paralelas não podem ser auto-detectadas)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
-msgstr "Escolha o dispositivo"
+msgstr "Escolher dispositivo"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
-msgstr "A procurar digitalizadores ..."
+msgid "Searching for scanners..."
+msgstr "A procurar scanners ..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24036,9 +25456,10 @@ msgid ""
 "Graphics in the applications menu."
 msgstr ""
 "O seu %s foi configurado.\n"
-"Pode agora digitalizar documentos utilizando o \"XSane\" ou o \"Kooka\" a partir do menu de aplicações Multimédia/Gráficos."
+"Pode agora digitalizar documentos usando o \"XSane\" ou o \"Kooka\" a partir "
+"do menu de aplicações Multimédia/Gráficos."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24046,12 +25467,12 @@ msgid ""
 "%s\n"
 "are available on your system.\n"
 msgstr ""
-"Os digitalizadores seguintes\n"
+"Os seguintes scanners\n"
 "\n"
 "%s\n"
 "estão disponíveis no seu sistema.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24059,188 +25480,186 @@ msgid ""
 "%s\n"
 "is available on your system.\n"
 msgstr ""
-"O digitalizador seguinte\n"
+"O seguinte scanner\n"
 "\n"
 "%s\n"
 "está disponível no seu 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 "Não encontrei nenhum digitalizador ligado directamente à sua máquina.\n"
+msgstr "Não há scanners disponiveis no seu sistema.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
-msgstr "A procurar novos digitalizadores"
+msgstr "Procurar por novos scanners"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
-msgstr "Adicionar o digitalizador manualmente"
+msgstr "Adicionar um scanner manualmente"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
-msgstr "Instlar/Actualizar ficheiros de firmware"
+msgstr "Instalar/Actualizar ficheiros firmware"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
-msgstr "Partilhar digitalizadores"
+msgstr "Partilha do Scanner"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Todas as máquinas remotas"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Esta máquina"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
-"Aqui pode decidir se os digitalizadores ligados a esta máquina deveriam ser "
-"disponibilizados para máquinas remotas e para quais máquinas."
+"Aqui pode escolher se os scanners conectados a esta máquina devem ser "
+"disponibilizados para máquinas remotas e para que máquinas."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
-"Também pode decidir aqui se os digitalizadores nas máquinas remotas deveriam "
-"ser disponibilizados nesta máquina."
+"Também pode decidir aqui se os scanners em máquinas remotas devem ser "
+"disponibilizados nesta máquina."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
-msgstr "Os digitalizadores desta máquina estão disponíveis para outros computadores"
+msgstr "Os scanners nesta máquina estão disponíveis para outros computadores"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
-msgstr "Digitalizador partilhado para os anfitriões: "
+msgstr "O scanner partilha dois anfitriões: "
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
-msgstr "Utilizar os digitalizadores dos anfitriões remotos"
+msgstr "Use os scanners  nos computadores remotos"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
-msgstr "Utilizar os digitalizadores nos anfitriões : "
+msgstr "Use os scanners nos anfitriões: "
 
-#: 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 "Partilha dos digitalizadores locais"
+msgstr "Partilhar scanners locais"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
-"Estas são as máquinas nas quais os digitalizadores locais podem ser "
-"utilizados :"
+"Estas são as máquinas nas quais o(s) scanner(s) locais devem estar "
+"disponiveis:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Adicionar um anfitrião"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Editar o anfitrião seleccionado"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Remover o anfitrião seleccionado"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Nome/Endereço IP do anfitrião:"
 
-#: 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 ""
-"Escolha o anfitrião no qual os digitalizadores locais deveriam ser "
-"disponíveis :"
+"Escolha o anfitrião no qual os scanners locais devem estar disponíveis :"
 
-#: 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 "Deve indicar o nome de um anfitrião ou um endereço IP.\n"
+msgstr "Deve indicar o nome de anfitrião ou um endereço 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 ""
-"Este anfitrião servidor já existe na lista, não pode ser adicionado outra "
-"vez.\n"
+"Este anfitrião(host) já está na lista, não pode ser adicionado outra vez.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
-msgstr "Utilização de digitalizadores remotos"
+msgstr "Uso de scanners remotos"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
-msgstr "Estas são as máquinas nas quais os digitalizadores podem ser utilizados :"
+msgstr "Estas são as máquinas nas quais os scanners devem ser usados:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
 msgstr ""
-"para partilhar o(s) scanner(s) local(ais) é necesário instalar o saned.\n"
+"saned precisa ser instalado para partilhar o(o) scanner(s) locai(s).\n"
 "\n"
-"Deseja instalar o pacote do saned?"
+"Deseja instalar o pacote 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 "O seu digitalizador não vai estar disponível na rede."
+msgstr "O seu scanner não vai estar disponível na rede."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr "Alguns dispositivos na classe material \"%s\" foram removidos :\n"
+msgstr "Alguns dispositivos na classe de hardware \"%s\" foram removidos:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s foi removido\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Foram adicionados alguns dispositivos: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s foi adicionado\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Detecção do material em progresso"
@@ -24248,17 +25667,17 @@ msgstr "Detecção do material em progresso"
 #: standalone/service_harddrake_confirm:7
 #, c-format
 msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
-msgstr "Alterações ao hardware na classe \"%s\" (%s segundos para responder)"
+msgstr "Alterações do hardware na classe \"%s\" (%s segundos para responder)"
 
 #: standalone/service_harddrake_confirm:8
 #, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "Deseja executar a ferramenta de configuração adequada?"
 
 #: steps.pm:14
 #, c-format
 msgid "Language"
-msgstr "Escolha o seu idioma"
+msgstr "Linguagem"
 
 #: steps.pm:15
 #, c-format
@@ -24278,7 +25697,7 @@ msgstr "Detecção de discos rígidos"
 #: steps.pm:18
 #, c-format
 msgid "Select installation class"
-msgstr "Seleccione a classe da instalação"
+msgstr "Seleccione a classe de instalação"
 
 #: steps.pm:19
 #, c-format
@@ -24288,7 +25707,7 @@ msgstr "Escolha o seu teclado"
 #: steps.pm:21
 #, c-format
 msgid "Partitioning"
-msgstr "Particionamento"
+msgstr "Particionar"
 
 #: steps.pm:22
 #, c-format
@@ -24298,7 +25717,7 @@ msgstr "Formatar partições"
 #: steps.pm:23
 #, c-format
 msgid "Choose packages to install"
-msgstr "Escolha os pacotes a serem instalados"
+msgstr "Escolha os pacotes para instalar"
 
 #: steps.pm:24
 #, c-format
@@ -24308,7 +25727,7 @@ msgstr "Instalar sistema"
 #: steps.pm:25
 #, c-format
 msgid "Root password"
-msgstr "Senha de Root"
+msgstr "Senha Root"
 
 #: steps.pm:26
 #, c-format
@@ -24345,25 +25764,25 @@ msgstr "Instalar actualizações"
 msgid "Exit install"
 msgstr "Sair da instalação"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Isto está correcto?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Expandir Árvore"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Encolher Árvore"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
-msgstr "Alternar entre organização plana ou em grupo"
+msgstr "Alternar entre organização plana e o grupo classificado"
 
 #: wizards.pm:95
 #, c-format
@@ -24372,172 +25791,10286 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 "%s não está instalado\n"
-"Carregue em  \"Seguinte\"para o instalar ou em \"Anular\" para sair"
+"Clique em  \"Seguinte\"para instalar ou em \"Cnacelar\" para sair"
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "A instalação falhou"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estação de Trabalho de Escritório"
+#~ msgid "-> All Applications"
+#~ msgstr "-> Todas as Aplicações"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programas de Escritório: texto (kword, abiword), folhas de cálculo (kspread, "
-"gnumeric), visualizadores pdf, etc"
+#~ msgid "-> What to do?"
+#~ msgstr "-> O Que fazer?"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estação de Jogo"
+#~ msgid "Hotline client"
+#~ msgstr "Cliente Hotline"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
+#~ msgid "AlsaMixerGUI"
+#~ msgstr "GUI AlsaMixer"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estação Multimédia"
+#~ msgid "ALSA connection mixer"
+#~ msgstr "Mixer da conexão ALSA"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Aplicações de som e vídeo reprodução/edição"
+#~ msgid "Multimedia"
+#~ msgstr "Multimédia"
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estação de Internet"
+#~ msgid "Sound"
+#~ msgstr "Som"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
-"mutt, tin...) e para navegar na Web"
+#~ msgid "Amarok"
+#~ msgstr "Amarok"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computador de Rede (cliente)"
+#~ msgid "Uncle Rodney says, \"10/10, amaroK is seriously super!\""
+#~ msgstr "O Tio Rodney diz, \"10/10, amaroK é excelente!\""
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para diferentes protocolos incluindo ssh"
+#~ msgid "ArmageTron"
+#~ msgstr "ArmageTron"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuração"
+#~ msgid "Another 3d lightcycle game"
+#~ msgstr "Outro jogo de motas ligeiras em 3D"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Ferramentas para facilitar a configuração do seu computador"
+#~ msgid "More Applications"
+#~ msgstr "Mais Aplicações"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Ferramentas de terminal"
+#~ msgid "Games"
+#~ msgstr "Jogos"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, Linha de Comandos (shell), ferramentas de ficheiro, terminais"
+#~ msgid "Arcade"
+#~ msgstr "Arcada"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estação de Trabalho KDE"
+#~ msgid "ATerm"
+#~ msgstr "ATerm"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"O K Desktop Environment, o ambiente gráfico básico com a colecção de "
-"ferramentas que o acompanham"
+#~ msgid "A terminal emulator for the X Window System"
+#~ msgstr "Um Emulador de Terminal para o sistema X Window"
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Estação de Trabalho Gnome"
+#~ msgid "Terminals"
+#~ msgstr "Terminais"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Um ambiente gráfico com um conjunto de aplicações e ferramentas de ambiente "
-"de trabalho fáceis de usar"
+#~ msgid "Audacity"
+#~ msgstr "Audacity"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Outros Ambientes de Trabalho Gráficos"
+#~ msgid "Digital audio waveforms editor"
+#~ msgstr "Editor áudio digital de ondas sonoras"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#~ msgid "Aumix"
+#~ msgstr "Aumix"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C e C++ bibliotecas de desenvolvimento, programas e ficheiros 'include'"
+#~ msgid "Audio Mixer based on GTK+ and NCurses"
+#~ msgstr "Mixer Áudio baseado em GTK+ e NCurses"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentação"
+#~ msgid "Balsa"
+#~ msgstr "Balsa"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livros e Howto's sobre o Linux e Software Livre"
+#~ msgid "Balsa Mail Client"
+#~ msgstr "Cliente de Correio Electrónico Balsa"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "BitTorrent GUI"
+#~ msgstr "BitTorrent GUI"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Base Padrão Linux (LSB). Suporte de aplicações exteriores."
+#~ msgid "Download files with BitTorrent"
+#~ msgstr "Transferência de ficheiros com BitTorrent"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "File Transfer"
+#~ msgstr "Transferir Ficheiros"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache e Pro-ftpd"
+#~ msgid "BitTorrent creator"
+#~ msgstr "BitTorrent Criador"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Correio Electrónico"
+#~ msgid "Creates BitTorrent metadata files"
+#~ msgstr "Cria fichieros de metadados BitTorrent"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix servidor de correio"
+#~ msgid "Blackbox"
+#~ msgstr "Blackbox"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Dados"
+#~ msgid "Session"
+#~ msgstr "Sessão"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de Bases de Dados PostgreSQL ou MySQL"
+#~ msgid "Windowmanagers"
+#~ msgstr "Gestores de Janelas"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+#~ msgid "Reconfigure"
+#~ msgstr "Reconfigurar"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Ponte Internet"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Computador de Rede Servidor"
+#~ msgid "/usr/share/blackbox/styles"
+#~ msgstr "/usr/share/blackbox/styles"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
+#~ msgid "Setting"
+#~ msgstr "Configuração"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Conjunto de ferramentas para ler e enviar e-mails e notícias e "
-"para navegar na Web"
+#~ msgid "Styles"
+#~ msgstr "Estilos"
+
+#~ msgid "~/.blackbox/styles"
+#~ msgstr "~/.blackbox/styles"
+
+#~ msgid "Workspaces"
+#~ msgstr "Espaços de Trabalho"
+
+#~ msgid "BlueFish"
+#~ msgstr "BlueFish"
+
+#~ msgid "Web development studio"
+#~ msgstr "Estúdio de Programação Web"
+
+#~ msgid "Web editors"
+#~ msgstr "Editores Web"
+
+#~ msgid "Bug Report Tool"
+#~ msgstr "Ferramenta para Comunicar Erros"
+
+#~ msgid "Report a bug in GNOME"
+#~ msgstr "Comunique um erro(bug) no GNOME"
+
+#~ msgid "Tools"
+#~ msgstr "Ferramentas"
+
+#~ msgid "Bumprace"
+#~ msgstr "Bumprace"
+
+#~ msgid "BZflag"
+#~ msgstr "BZflag"
+
+#~ msgid "A multiplayer 3D tank battle game"
+#~ msgstr "Um jogo multiplayer 3D de tanques de guerra"
+
+#~ msgid "Gcdmaster"
+#~ msgstr "Gcdmaster"
+
+#~ msgid "Graphical front end to cdrdao for composing audio CDs"
+#~ msgstr "Um interface gráfico para o cdrdao para compor CDs Áudio"
+
+#~ msgid "Archiving"
+#~ msgstr "Arquivar"
+
+#~ msgid "CD Burning"
+#~ msgstr "Gravação de CDs"
+
+#~ msgid "ChBg"
+#~ msgstr "ChBg"
+
+#~ msgid "ChBg - Desktop background manager/changer/screensaver"
+#~ msgstr "ChBg - Gestor de fundo e protecções de ecrã"
+
+#~ msgid "Chromium"
+#~ msgstr "Chromium"
+
+#~ msgid "OpenGL shoot them up"
+#~ msgstr "Jogo de tiro OpenGL"
+
+#~ msgid "Chromium Setup"
+#~ msgstr "Configuração do Chromium "
+
+#~ msgid "Graphical Setup of Chromium"
+#~ msgstr "Configuração Gráfica do Chromium"
+
+#~ msgid "Circus Linux!"
+#~ msgstr "Circus Linux!"
+
+#~ msgid "ClanBomber"
+#~ msgstr "ClanBomber"
+
+#~ msgid "Clanbomber - free (GPL) Bomberman-like multiplayer game"
+#~ msgstr "Clanbomber - Bomberman free (GPL) - um jogo multi-jogadores"
+
+#~ msgid "CoolEdit"
+#~ msgstr "CoolEdit"
+
+#~ msgid ""
+#~ "Powerful programmer's text editor with Python and shell scripting hooks"
+#~ msgstr ""
+#~ "Um poderoso editor de texto para programadores Python e scripts para a "
+#~ "linha de comandos"
+
+#~ msgid "Editors"
+#~ msgstr "Editores"
+
+#~ msgid "Crack Attack! - Solo"
+#~ msgstr "Crack Attack! - Solo"
+
+#~ msgid "Tetris like game based on Tetris Attack"
+#~ msgstr "Jogo tipo Tetris baseado no Tetris Attack"
+
+#~ msgid "Crack Attack! - Create Server"
+#~ msgstr "Crack Attack! - Criar um Servidor"
+
+#~ msgid "Crack Attack! - Join Server"
+#~ msgstr "Crack Attack! - Entre no Servidor"
+
+#~ msgid "Cannon Smash"
+#~ msgstr "Cannon Smash"
+
+#~ msgid "CannonSmash, a 3D tabletennis game"
+#~ msgstr "Cannon Smash, um jogo de ténis de mesa 3D"
+
+#~ msgid "Sports"
+#~ msgstr "Desportos"
+
+#~ msgid "CUPS WWW admin tool"
+#~ msgstr "CUPS WWW Ferramenta de Administração"
+
+#~ msgid ""
+#~ "Web-based administration tool for CUPS, works with every browser. Set "
+#~ "the  environment variable to choose your preferred browser."
+#~ msgstr ""
+#~ "Ferramenta de administração baseada na Web para CUPS, funciona com "
+#~ "qualquer browser. Defina a variável de ambiente para escolher o seu "
+#~ "browser preferido."
+
+#~ msgid "Cxhextris"
+#~ msgstr "Cxhextris"
+
+#~ msgid "Cxhextris: An X Window System color version of xhextris."
+#~ msgstr "Cxhextris: Uma versão a cores do xhextris para o sistema X Window"
+
+#~ msgid "Amusement"
+#~ msgstr "Diversão"
+
+#~ msgid "Dia"
+#~ msgstr "Dia"
+
+#~ msgid "A gtk+ based diagram creation program"
+#~ msgstr "Programa de criação de diagramas baseado em gtk+ "
+
+#~ msgid "Office"
+#~ msgstr "Escritório"
+
+#~ msgid "Graphs"
+#~ msgstr "Gráficos"
+
+#~ msgid "Digikam"
+#~ msgstr "Digikam"
+
+#~ msgid "KDE Photo Management"
+#~ msgstr "Gestão de Fotos KDE"
+
+#~ msgid "Graphics"
+#~ msgstr "Gráficos"
+
+#~ msgid "LDAP directory manager"
+#~ msgstr "Gestor de pastas LDAP"
+
+#~ msgid "Bittorrent checker"
+#~ msgstr "BitTorrent Verificador"
+
+#~ msgid "Mandrakelinux Bittorrent checker"
+#~ msgstr "Verificador Bittorrent Mandrakelinux"
+
+#~ msgid "File transfer"
+#~ msgstr "Transferência de Ficheiros"
+
+#~ msgid "Configure your computer"
+#~ msgstr "Configure o Seu Computador"
+
+#~ msgid "System configuration tool"
+#~ msgstr "Ferramenta de configuração do sistema"
+
+#~ msgid "DrakFax"
+#~ msgstr "DrakFax"
+
+#~ msgid "A client and server fax configuration tool"
+#~ msgstr "Uma ferramenta de configuração de cliente e servidor de fax"
+
+#~ msgid "Communications"
+#~ msgstr "Comunicações"
+
+#~ msgid "Fax"
+#~ msgstr "Fax"
+
+#~ msgid "Club Services"
+#~ msgstr "Serviços do Clube"
+
+#~ msgid "Wizard tool for Mandrake Club"
+#~ msgstr "Assistente para o Mandrake Club"
+
+#~ msgid "Drakpxelinux"
+#~ msgstr "Drakpxelinux"
+
+#~ msgid "Mandrake Pxelinux configurator"
+#~ msgstr "Configurador Mandrake do Pxelinux"
+
+#~ msgid "Graphical directory synchronization tool"
+#~ msgstr "Ferramenta gráfica de sincronização de directorias"
+
+#~ msgid "Applications"
+#~ msgstr "Aplicações"
+
+#~ msgid "Backup"
+#~ msgstr "Copias de Segurança"
+
+#~ msgid "LocaleDrake (System)"
+#~ msgstr "LocaleDrake (Sistema)"
+
+#~ msgid "System wide language configurator"
+#~ msgstr "Configurador Global da língua do sistema"
+
+#~ msgid "LocaleDrake (User)"
+#~ msgstr "LocaleDrake (Utilizador)"
+
+#~ msgid "Language configurator"
+#~ msgstr "Configuração da língua"
+
+#~ msgid "Electric Eyes image viewer"
+#~ msgstr "Visualizador de Imagens Electric eyes"
+
+#~ msgid "Emacs"
+#~ msgstr "Emacs"
+
+#~ msgid "Powerful editor"
+#~ msgstr "Poderoso editor"
+
+#~ msgid "Enlightenment"
+#~ msgstr "Enlightenment"
+
+#~ msgid "The Enlightenment window manager"
+#~ msgstr "O gestor de janelas Enlightenment"
+
+#~ msgid "Envy24Control"
+#~ msgstr "Envy24Control"
+
+#~ msgid "Control tool for Envy24 (ice1712) based soundcards"
+#~ msgstr ""
+#~ "Ferramenta de controlo para as placas de som baseadas no Envy24 (ice1712)"
+
+#~ msgid "Eye of Gnome"
+#~ msgstr "Eye of Gnome"
+
+#~ msgid "Eye of Gnome Image Viewer"
+#~ msgstr "Visualizador de Imagens Eye of Gnome"
+
+#~ msgid "Epiphany Web Browser"
+#~ msgstr "Epiphany Web Browser"
+
+#~ msgid "Browse the web"
+#~ msgstr "Navegar na web"
+
+#~ msgid "Web Browsers"
+#~ msgstr "Web Browsers"
+
+#~ msgid "Epiphany Bookmarks Editor"
+#~ msgstr "Epiphany Editor de Favoritos"
+
+#~ msgid "Browse and organize your bookmarks"
+#~ msgstr "Procura e organiza os seus favoritos"
+
+#~ msgid "Eroaster"
+#~ msgstr "Eroaster"
+
+#~ msgid "GUI CD Burner"
+#~ msgstr "GUI Gravador de Cds"
+
+#~ msgid "Cd burning"
+#~ msgstr "Gravar CD"
+
+#~ msgid "Eterm"
+#~ msgstr "Eterm"
+
+#~ msgid "Eterm Enlightened Terminal Emulator for X Window"
+#~ msgstr "Eterm Enlightened Emulador de Terminal para X Window"
+
+#~ msgid "A network traffic analyzer"
+#~ msgstr "Analisador do tráfego da rede"
+
+#~ msgid "Monitoring"
+#~ msgstr "Monitorizar"
+
+#~ msgid "Evolution"
+#~ msgstr "Evolution"
+
+#~ msgid "GNOME mailer, calendar, contact manager and communications tool"
+#~ msgstr ""
+#~ "Ferramentas GNOME para envio de correio eletrônico, calendário, gestor de "
+#~ "contactos e comunicações"
+
+#~ msgid "Fetchmailconf"
+#~ msgstr "Fetchmailconf"
+
+#~ msgid "Configuration of fetchmail"
+#~ msgstr "Configuração do fetchmail"
+
+#~ msgid "File-Roller"
+#~ msgstr "File-Roller"
+
+#~ msgid "An archive manager for GNOME"
+#~ msgstr "Um gestor de arquivos para GNOME"
+
+#~ msgid "Compression"
+#~ msgstr "Compressão"
+
+#~ msgid "FileRunner"
+#~ msgstr "FileRunner"
+
+#~ msgid "A simple file manager with built-in FTP support"
+#~ msgstr "Um simples gestor de ficheiros com suporte FTP integrado"
+
+#~ msgid "File Tools"
+#~ msgstr "Ferramentas de Ficheiros"
+
+#~ msgid "Xmms"
+#~ msgstr "Xmms"
+
+#~ msgid "Multimedia Player"
+#~ msgstr "Leitor de Multimédia"
+
+#~ msgid ".hidden"
+#~ msgstr ".hidden"
+
+#~ msgid "FLPhoto (GPhoto 2)"
+#~ msgstr "FLPhoto (GPhoto 2)"
+
+#~ msgid "All what you need for the photos from your digital camera"
+#~ msgstr "Tudo o que precisa para as fotos da sua camera digital"
+
+#~ msgid "Freeciv client"
+#~ msgstr "Cliente Freeciv"
+
+#~ msgid "The Free Civilization Clone"
+#~ msgstr "Clone do Free Civilization"
+
+#~ msgid "Strategy"
+#~ msgstr "Estratégia"
+
+#~ msgid "Freeciv server"
+#~ msgstr "Servidor Freeciv"
+
+#~ msgid "The Free Civilization Clone (server)"
+#~ msgstr "Clone do Free Civilization (servidor)"
+
+#~ msgid "Frozen-Bubble"
+#~ msgstr "Frozen-Bubble"
+
+#~ msgid "Frozen Bubble arcade game"
+#~ msgstr "Jogo de arcada Frozen-Bubble"
+
+#~ msgid "Gabber"
+#~ msgstr "Gabber"
+
+#~ msgid "Gnome client for Jabber Open Source instant messaging system"
+#~ msgstr ""
+#~ "Cliente Gnome para Jabber Open Source sistema de mensagens instantâneas"
+
+#~ msgid "Instant Messaging"
+#~ msgstr "Mensageiros"
+
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
+
+#~ msgid "Multi-protocol Instant Messaging Client"
+#~ msgstr "Cliente de Mensagens Instantâneas multi-protocolo"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "GNOME Web Browser"
+#~ msgstr "GNOME Web Browser"
+
+#~ msgid "Gnome Calculator"
+#~ msgstr "Calculadora Gnome"
+
+#~ msgid "Perform calculations"
+#~ msgstr "Efectua cálculos"
+
+#~ msgid "Accessories"
+#~ msgstr "Acessórios"
+
+#~ msgid "GCombust"
+#~ msgstr "GCombust"
+
+#~ msgid "Gtk+ frontend for Cd burning"
+#~ msgstr "Interface GTK+ para gravação de CDs"
+
+#~ msgid "GConf Editor"
+#~ msgstr "Editor GConf"
+
+#~ msgid "Directly edit your entire configuration database"
+#~ msgstr "Edita directamente toda a configuração da base de dados"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Gdb"
+#~ msgstr "Gdb"
+
+#~ msgid "The GNU debugger"
+#~ msgstr "O debugger GNU"
+
+#~ msgid "GDM Configurator"
+#~ msgstr "Configurador GDM"
+
+#~ msgid ""
+#~ "A graphical application for configuring the GNOME Display Manager (GDM)"
+#~ msgstr "Uma aplicação gráfica para configurar o Gestor de Ecrãs GNOME (GDM)"
+
+#~ msgid "Boot and Init"
+#~ msgstr "Inicialização e Arranque"
+
+#~ msgid "GDM Photo Setup"
+#~ msgstr "Configuração de Foto GDM"
+
+#~ msgid ""
+#~ "Setup the picture that will show in the GDM (login manager) face browser"
+#~ msgstr "Escolhe a foto que irá aparecer no GDM (gestor de inicio de sessão)"
+
+#~ msgid "New login with GDM"
+#~ msgstr "Novo Login com o GDM"
+
+#~ msgid "Log in as another user without logging out"
+#~ msgstr "Entre/Login como outro utilizador sem terminar a sessão actual"
+
+#~ msgid "New login in a nested window "
+#~ msgstr "Nova sessão/login numa janela nested"
+
+#~ msgid "New login in a nested window"
+#~ msgstr "Nova sessão/login numa janela nested"
+
+#~ msgid "GEdit"
+#~ msgstr "GEdit"
+
+#~ msgid "GEdit is a small but powerful text editor"
+#~ msgstr "O GEdit é um pequeno mas poderoso editor texto"
+
+#~ msgid "GEXIF - View and edit EXIF info in JPEG images"
+#~ msgstr "GEXIF - Veja e edite as informações EXIF nas imagens JPEG"
+
+#~ msgid "View and edit the info which digital cameras add to your photos"
+#~ msgstr ""
+#~ "Veja e edite as informações que as cameras digitais adicionam às suas "
+#~ "fotos"
+
+#~ msgid "gFTP"
+#~ msgstr "gFTP"
+
+#~ msgid "FTP client for X Window"
+#~ msgstr "Cliente FTP para X-Window"
+
+#~ msgid "GGV PostScript Viewer"
+#~ msgstr "Visualizador de PostScript GGV"
+
+#~ msgid "A Ghostscript frontend to visualize PostScript files"
+#~ msgstr ""
+#~ "Interface gráfica do ghostscript para visualizar ficheiros PostScript"
+
+#~ msgid "Publishing"
+#~ msgstr "Publicação"
+
+#~ msgid "The GIMP v2"
+#~ msgstr "O GIMP v2"
+
+#~ msgid "The GNU Image Manipulation Program"
+#~ msgstr "O Programa de Manipulação de Imagens GNU"
+
+#~ msgid "Gkrellm"
+#~ msgstr "Gkrellm"
+
+#~ msgid "A GTK-based monitoring app"
+#~ msgstr "Um programa de monitorização baseado em GTK"
+
+#~ msgid "Glade"
+#~ msgstr "Glade"
+
+#~ msgid "Gtk/gnome widget builder"
+#~ msgstr "Criador de objectos Gtk/gnome 2"
+
+#~ msgid "Development environments"
+#~ msgstr "Ambientes de Programação"
+
+#~ msgid "Glade 2"
+#~ msgstr "Glade 2"
+
+#~ msgid "GTK/GNOME 2 Widget Builder"
+#~ msgstr "Criador de objectos Gtk/gnome 2"
+
+#~ msgid "Gnobog"
+#~ msgstr "Gnobog"
+
+#~ msgid "Gnome Bookmarks Organizer"
+#~ msgstr "Organizador de Favoritos do Gnome"
+
+#~ msgid "Networking"
+#~ msgstr "Rede"
+
+#~ msgid "WWW"
+#~ msgstr "WWW"
+
+#~ msgid "Gnome Samba Browser"
+#~ msgstr "Gnome Samba Browser"
+
+#~ msgid "Gnome Samba Machine Browser"
+#~ msgstr "Browser de Máquinas Samba do Gnome"
+
+#~ msgid "Gnome-ALSA-Mixer"
+#~ msgstr "Gnome-ALSA-Mixer"
+
+#~ msgid "A gnome ALSA Mixer"
+#~ msgstr "Um Mixer ALSA Gnome"
+
+#~ msgid "Bluetooth Manager"
+#~ msgstr "Gestor Bluetooth"
+
+#~ msgid "Bluetooth Devices Administration"
+#~ msgstr "Administração dos Dispositivos Bluetooth"
+
+#~ msgid "Bluetooth Server"
+#~ msgstr "Servidor Bluetooth"
+
+#~ msgid "Listen for incoming files"
+#~ msgstr "Escuta por ficheiros enviados"
+
+#~ msgid "Bluetooth Send"
+#~ msgstr "Enviar Bluetooth"
+
+#~ msgid "Send files over Bluetooth"
+#~ msgstr "Enviar ficheiros através de Bluetooth"
+
+#~ msgid "Gnome Chess"
+#~ msgstr "Gnome Chess"
+
+#~ msgid "Gnome Chess game"
+#~ msgstr "Jogo Chess Gnome"
+
+#~ msgid "Boards"
+#~ msgstr "Tabuleiros"
+
+#~ msgid "GNOME Control Center"
+#~ msgstr "Centro de Controlo GNOME"
+
+#~ msgid "Accessibility"
+#~ msgstr "Acessibilidade"
+
+#~ msgid "Set your keyboard accessibility preferences"
+#~ msgstr "Define as suas preferências de acessibilidade do teclado"
+
+#~ msgid "Background"
+#~ msgstr "Fundo"
+
+#~ msgid "Customize your desktop background"
+#~ msgstr "Personaliza o fundo do ambiente de trabalho"
+
+#~ msgid "Enable sound and associate sounds with events"
+#~ msgstr "Activa sons e associar sons com eventos"
+
+#~ msgid "Set your keyboard preferences"
+#~ msgstr "Define as suas preferências de teclado"
+
+#~ msgid "Set your mouse preferences"
+#~ msgstr "Define as suas preferências do rato"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Definições Avançadas"
+
+#~ msgid "File types and programs"
+#~ msgstr "Tipos de Ficheiros e Programas"
+
+#~ msgid "Specify which programs are used to open or view each file type"
+#~ msgstr ""
+#~ "Especifica que programas são usados para abrir ou ver cada tipo de "
+#~ "ficheiro"
+
+#~ msgid "Menus & Toolbars"
+#~ msgstr "Barras de Ferramentas & Menus"
+
+#~ msgid "Customize the appearance of toolbars and menubars in applications"
+#~ msgstr ""
+#~ "Personaliza a aparência das barras de ferramentas e menus nas aplicações"
+
+#~ msgid "Select themes for various parts of the desktop"
+#~ msgstr "Selecciona os temas para as várias partes do ambiente de trabalho"
+
+#~ msgid "Font"
+#~ msgstr "Tipos de Letra"
+
+#~ msgid "Select fonts for the desktop"
+#~ msgstr "Selecciona os tipos de letra para o ambiente de trabalho"
+
+#~ msgid "Keyboard Shortcuts"
+#~ msgstr "Atalhos do Teclado"
+
+#~ msgid "Assign shortcut keys to commands"
+#~ msgstr "Atribui atalhos de teclado a comandos"
+
+#~ msgid "Network proxy"
+#~ msgstr "Proxy da Rede"
+
+#~ msgid "Network proxy preferences"
+#~ msgstr "Preferências do proxy da rede"
+
+#~ msgid "Preferred Applications"
+#~ msgstr "Aplicações Preferidas"
+
+#~ msgid "Select your default applications"
+#~ msgstr "Selecciona as suas aplicações padrão"
+
+#~ msgid "Window Properties"
+#~ msgstr "Propriedades da Janela"
+
+#~ msgid "Assistive Technology Support"
+#~ msgstr "Suporte de Tecnologia Assistiva"
+
+#~ msgid "Enable support for GNOME assistive technologies at login"
+#~ msgstr ""
+#~ "Activa o suporte para tecnologias assistivas GNOME ao iniciar sessão"
+
+#~ msgid "Screen Resolution"
+#~ msgstr "Resolução de Ecrã"
+
+#~ msgid "Change screen resolution"
+#~ msgstr "Altera a resolução do ecrã"
+
+#~ msgid "GNOME-DB frontend"
+#~ msgstr "Interface GNOME-DB"
+
+#~ msgid "Gnome-DB frontend application"
+#~ msgstr "Aplicação de Interface para Gnome-DB"
+
+#~ msgid "Databases"
+#~ msgstr "Bases de Dados"
+
+#~ msgid "GNOME Database configuration"
+#~ msgstr "Configuração GNOME da Base de Dados"
+
+#~ msgid "Configure your database environment"
+#~ msgstr "Configure o seu ambiente de base de dados"
+
+#~ msgid "GNOME Mines"
+#~ msgstr "Minas GNOME"
+
+#~ msgid "Mines game"
+#~ msgstr "Jogo de Minas do GNOME"
+
+#~ msgid "Puzzles"
+#~ msgstr "Puzzles"
+
+#~ msgid "Same GNOME"
+#~ msgstr "Same GNOME"
+
+#~ msgid "GNOME SameGame"
+#~ msgstr "Jogo SameGame do GNOME"
+
+#~ msgid "GNOME Mahjongg"
+#~ msgstr "Mahjongg GNOME"
+
+#~ msgid "Mahjongg game"
+#~ msgstr "Jogo de Mahjong"
+
+#~ msgid "GTali"
+#~ msgstr "GTali"
+
+#~ msgid "Poker-like dice game"
+#~ msgstr "Jogo de dados parecido com o Poker"
+
+#~ msgid "GNOME Robots"
+#~ msgstr "GNOME Robots"
+
+#~ msgid "GNOME Robots game"
+#~ msgstr "Jogo Robots do GNOME"
+
+#~ msgid "Iagno"
+#~ msgstr "Iagno"
+
+#~ msgid "Reversi chess"
+#~ msgstr "Xadrez Reverso"
+
+#~ msgid "GNOME Tetravex"
+#~ msgstr "GNOME Tetravex"
+
+#~ msgid "Tetravex puzzle"
+#~ msgstr "Puzzle Tetravex"
+
+#~ msgid "GNOME Stones"
+#~ msgstr "Pedras GNOME"
+
+#~ msgid "GNOME Stones game"
+#~ msgstr "Jogo de Pedras do GNOME"
+
+#~ msgid "AisleRiot"
+#~ msgstr "AisleRiot"
+
+#~ msgid "Card-based Solitaire suite"
+#~ msgstr "Jogo de cartas Solitária"
+
+#~ msgid "Cards"
+#~ msgstr "Cartas"
+
+#~ msgid "Glines"
+#~ msgstr "Glinhas"
+
+#~ msgid "Color lines chess"
+#~ msgstr "Xadrês Linhas Coloridas"
+
+#~ msgid "Gnibbles"
+#~ msgstr "Gnibbles"
+
+#~ msgid "Nibbles Game"
+#~ msgstr "Jogo Nibbles"
+
+#~ msgid "Gnect"
+#~ msgstr "Gnect"
+
+#~ msgid "Four-in-a-row chess"
+#~ msgstr "Jogo de quatro-em-linha"
+
+#~ msgid "Gataxx"
+#~ msgstr "Gataxx"
+
+#~ msgid "Ataxx chess"
+#~ msgstr "Xadrez Ataxx"
+
+#~ msgid "Gnotski"
+#~ msgstr "Gnotski"
+
+#~ msgid "Klotski game"
+#~ msgstr "Jogo Klotski"
+
+#~ msgid "Gnometris"
+#~ msgstr "Gnometris"
+
+#~ msgid "Tetris game"
+#~ msgstr "Jogo Tetris"
+
+#~ msgid "Blackjack"
+#~ msgstr "Blackjack"
+
+#~ msgid "Gnome Icon Editor"
+#~ msgstr "Editor de Ícones do Gnome"
+
+#~ msgid "GnomeICU"
+#~ msgstr "GnomeICU"
+
+#~ msgid "GNOME ICQ communications program"
+#~ msgstr "Programa de comunicações ICQ do Gnome"
+
+#~ msgid "Instant messaging"
+#~ msgstr "Mensagens Instantâneas"
+
+#~ msgid "CD Player"
+#~ msgstr "Leitor de CDs"
+
+#~ msgid "Play audio CDs"
+#~ msgstr "Reproduz CDs áudio"
+
+#~ msgid "Volume Control"
+#~ msgstr "Controlo do Volume"
+
+#~ msgid "Adjust the volume level"
+#~ msgstr "Ajusta o nível de volume"
+
+#~ msgid "Volume monitor"
+#~ msgstr "Monitor do Volume"
+
+#~ msgid "Monitor the sound output volume"
+#~ msgstr "Monitoriza a saída do volume do som"
+
+#~ msgid "Recording level monitor"
+#~ msgstr "Monitor de Nível de Gravação"
+
+#~ msgid "Monitor the recording input volume"
+#~ msgstr "Monitoriza o volume de entrada da gravação"
+
+#~ msgid "Sound Recorder"
+#~ msgstr "Gravador de Som"
+
+#~ msgid "Record sound clips"
+#~ msgstr "Grava clips de som"
+
+#~ msgid "CD Database"
+#~ msgstr "Base de Dados CD"
+
+#~ msgid "Modify your CD database preferences"
+#~ msgstr "Modifica as preferências da base de dados CD"
+
+#~ msgid "Multimedia Systems Selector"
+#~ msgstr "Selector de Sistemas Multimédia"
+
+#~ msgid "Configure defaults for GStreamer applications"
+#~ msgstr "Configurar os padrôes para aplicações GStreamer"
+
+#~ msgid "Gnomemeeting"
+#~ msgstr "Gnomemeeting"
+
+#~ msgid "Video Conference"
+#~ msgstr "Vídeo Conferência"
+
+#~ msgid "Panel"
+#~ msgstr "Painel"
+
+#~ msgid "Select preferences for all your panels"
+#~ msgstr "Escolha as preferências para todos os seus painéis"
+
+#~ msgid "GNOME Phone Manager"
+#~ msgstr "GNOME Gestor de Telefone"
+
+#~ msgid "Cellular Phone Interface"
+#~ msgstr "Interface para Telefone Celular"
+
+#~ msgid "Pilot"
+#~ msgstr "Piloto"
+
+#~ msgid "PDA"
+#~ msgstr "PDA"
+
+#~ msgid "Gnome-Cal"
+#~ msgstr "Gnome-Cal"
+
+#~ msgid "Personal calendar and todo list"
+#~ msgstr "Agenda pessoal e lista de tarefas"
+
+#~ msgid "Time Management"
+#~ msgstr "Gestor de Tempo"
+
+#~ msgid "Gnome-Card"
+#~ msgstr "Gnome-Card"
+
+#~ msgid "Contact list of friends and business associates"
+#~ msgstr "Lista de contactos de amigos e empresas"
+
+#~ msgid "Address Books"
+#~ msgstr "Livros de Endereços"
+
+#~ msgid "Sessions"
+#~ msgstr "Sessões"
+
+#~ msgid "Configure your sessions"
+#~ msgstr "Configure as suas sessões"
+
+#~ msgid "GNOME System monitor"
+#~ msgstr "Monitor do Sistema GNOME"
+
+#~ msgid "View current processes and monitor system state"
+#~ msgstr "Vê processos correntes e monitoriza o estado do sistema"
+
+#~ msgid "Telnet, SSH, and RLogin"
+#~ msgstr "Telnet, SSH, e RLogin"
+
+#~ msgid "A cool front-end for telnet, ssh, and rlogin"
+#~ msgstr "Um interface para telnet, ssh, e rlogin"
+
+#~ msgid "Remote access"
+#~ msgstr "Acesso Remoto"
+
+#~ msgid "GNOME Terminal"
+#~ msgstr "Terminal GNOME"
+
+#~ msgid "Terminal of the GNOME desktop"
+#~ msgstr "Terminal do ambiente de trabalho GNOME"
+
+#~ msgid "Gnome-Toaster"
+#~ msgstr "Gnome-Toaster"
+
+#~ msgid "A GNOME utility for CD burning"
+#~ msgstr "Um utilitário GNOME para gravar CDs"
+
+#~ msgid "Floppy Formatter"
+#~ msgstr "Formatador de disquetes"
+
+#~ msgid "Format Floppy Disks"
+#~ msgstr "Formata Disquetes"
+
+#~ msgid "Search for Files"
+#~ msgstr "Procura por Ficheiros"
+
+#~ msgid "Search your disk for files"
+#~ msgstr "Procura ficheiros no seu disco"
+
+#~ msgid "System Log"
+#~ msgstr "Registo do Sistema"
+
+#~ msgid "View the system log file"
+#~ msgstr "Vê o ficheiro de registo do sistema"
+
+#~ msgid "GNOME Dictionary"
+#~ msgstr "Dicionário GNOME"
+
+#~ msgid "Lookup words in an online dictionary"
+#~ msgstr "Procura palavras num dicionário online"
+
+#~ msgid "Gnopernicus"
+#~ msgstr "Gnopernicus"
+
+#~ msgid "Screen Reader and Magnifier"
+#~ msgstr "Leitor de Ecrã e Ampliador"
+
+#~ msgid "Gnozip"
+#~ msgstr "Gnozip"
+
+#~ msgid ""
+#~ "A Winzip(tm) like application which supports gzip and bzip compresssion "
+#~ "format"
+#~ msgstr ""
+#~ "Uma aplicação tipo Winzip(TM) que suporta formatos de compressão gzip e "
+#~ "bzip"
+
+#~ msgid "GnuCash"
+#~ msgstr "GnuCash"
+
+#~ msgid "GnuCash Personal finance manager"
+#~ msgstr "GnuCash Gestor de Finanças Pessoais"
+
+#~ msgid "Finances"
+#~ msgstr "Finanças"
+
+#~ msgid "Gnumeric"
+#~ msgstr "Gnumeric"
+
+#~ msgid "A full-featured spreadsheet for Gnome"
+#~ msgstr "Uma folha de cálculo completa para Gnome"
+
+#~ msgid "Spreadsheets"
+#~ msgstr "Folhas de Cálculo"
+
+#~ msgid "The famous function plotting program"
+#~ msgstr "O famoso programa de gráficos de funções"
+
+#~ msgid "Sciences"
+#~ msgstr "Ciências"
+
+#~ msgid "Mathematics"
+#~ msgstr "Matemáticas"
+
+#~ msgid "Gtk-ocr is a gtk frontend for gocr"
+#~ msgstr "Gtk-ocr é um interface gtk para gocr"
+
+#~ msgid "On-Screen Keyboard"
+#~ msgstr "Teclado No Ecrã"
+
+#~ msgid "GNOME Onscreen Keyboard"
+#~ msgstr "Teclado no Ecrã GNOME"
+
+#~ msgid "PDF file viewer"
+#~ msgstr "Visualizador de Ficheiros PDF"
+
+#~ msgid "Tool for viewing PDF files"
+#~ msgstr "Ferramenta para visualizar ficheiros PDF"
+
+#~ msgid "GPhoto (Use FLPhoto or GTKam with new cameras)"
+#~ msgstr "GPhoto (Use o FLPhoto ou o GTKam com cameras novas)"
+
+#~ msgid "Old GPhoto to support old cameras not supported by GPhoto2"
+#~ msgstr ""
+#~ "GPhoto antigo para suportar cameras antigas não suportadas pelo GPhoto2"
+
+#~ msgid "GPR"
+#~ msgstr "GPR"
+
+#~ msgid "Graphical frontend for printing with various spoolers"
+#~ msgstr "Interface gráfico para imprimir com vários spoolers"
+
+#~ msgid "GNU Prolog"
+#~ msgstr "Prólogo GNU"
+
+#~ msgid "Interpreters"
+#~ msgstr "Interpretadores"
+
+#~ msgid "GPS"
+#~ msgstr "GPS"
+
+#~ msgid "Graphical Process Statistics"
+#~ msgstr "Estatísticas do Processo Gráfico"
+
+#~ msgid "gqcam"
+#~ msgstr "gqcam"
+
+#~ msgid "A Linux clone of the QuickPict software that comes with the QuickCam"
+#~ msgstr "Um clone Linux do programa QuickPict que vem com o QuickCam"
+
+#~ msgid "GQview"
+#~ msgstr "GQview"
+
+#~ msgid "A browser for graphics files"
+#~ msgstr "Um browser para ficheiros gráficos"
+
+#~ msgid "Grip"
+#~ msgstr "Grip"
+
+#~ msgid "A gtk-based cd-player and cd-ripper"
+#~ msgstr "Um ripper e leitor de Cds baseado em gtk"
+
+#~ msgid "GTKam (GPhoto 2)"
+#~ msgstr "GTKam (GPhoto 2)"
+
+#~ msgid "GNU Digital Camera Program, for newer cameras"
+#~ msgstr "Programa de Camera Digital GNU, para novas cameras"
+
+#~ msgid "GTKeyboard"
+#~ msgstr "GTKeybord"
+
+#~ msgid "A graphical keyboard for disabled people"
+#~ msgstr "Um teclado gráfico para pessoas com necessidades especiais"
+
+#~ msgid "GtkGraph"
+#~ msgstr "GtkGraph"
+
+#~ msgid "Graphic Calculator"
+#~ msgstr "Calculadora Gráfica"
+
+#~ msgid "HTML Viewer"
+#~ msgstr "Visualizador HTML"
+
+#~ msgid "HTML Viewer properties"
+#~ msgstr "Propriedades do visualizador HTML"
+
+#~ msgid "GTKtalog"
+#~ msgstr "GTKtalog"
+
+#~ msgid "The Gnome disk catalog"
+#~ msgstr "O catalo de discos Gnome"
+
+#~ msgid "Gtm"
+#~ msgstr "Gtm"
+
+#~ msgid "Gnome transfer manager"
+#~ msgstr "Gestor de Transferência Gnome"
+
+#~ msgid "Unicode Character Map"
+#~ msgstr "Mapa Caracteres Unicode"
+
+#~ msgid "Software installer"
+#~ msgstr "Instalador de software"
+
+#~ msgid "Graphical front end to install RPM files"
+#~ msgstr "Um interface gráfico para instalar ficheiros RPM"
+
+#~ msgid "GhostView"
+#~ msgstr "GhostView"
+
+#~ msgid "GhostView, PostScript and PDF viewer"
+#~ msgstr "Visualizador de GhostView, PostScript e PDF"
+
+#~ msgid "Hardware Central Configuration/information tool"
+#~ msgstr "Ferramenta Central de Configuração/Informação de hardware"
+
+#~ msgid "HDSP Mixer"
+#~ msgstr "HDSP Mixer"
+
+#~ msgid "Mixer for RME Hammerfall"
+#~ msgstr "Mixer para RME Hammerfall"
+
+#~ msgid "Howtos German"
+#~ msgstr "Howtos em Alemão"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "German"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Alemão"
+
+#~ msgid "More applications"
+#~ msgstr "Mais Aplicações"
+
+#~ msgid "Howtos Greek"
+#~ msgstr "Howtos em Grego"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Greek"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Grego"
+
+#~ msgid "Howtos English"
+#~ msgstr "Howtos em Inglês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "English"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Inglês"
+
+#~ msgid "Howtos Spanish"
+#~ msgstr "Howtos em Espanhol"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Spanish"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Espanhol"
+
+#~ msgid "Howtos Finnish"
+#~ msgstr "Howtos em Finlandês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Finnish"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Finlandês"
+
+#~ msgid "Howtos French"
+#~ msgstr "Howtos em Francês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "French"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Francês"
+
+#~ msgid "Howtos Hungarian"
+#~ msgstr "Howtos em Húngaro"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Hungarian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Húngaro"
+
+#~ msgid "Howtos Indonesian"
+#~ msgstr "Howtos em Indonésio"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Indonesian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Indonésio"
+
+#~ msgid "Howtos Italian"
+#~ msgstr "Howtos em Italiano"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Italian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Italiano"
+
+#~ msgid "Howtos Japanese"
+#~ msgstr "Howtos em Japonês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Japanese"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Japonês"
+
+#~ msgid "Howtos Korean"
+#~ msgstr "Howtos em Coreano"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Korean"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Coreano"
+
+#~ msgid "Howtos Dutch"
+#~ msgstr "Howtos em Holandês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Dutch"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Holandês"
+
+#~ msgid "Howtos Polish"
+#~ msgstr "Howtos em Polaco"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Polish"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Polaco"
+
+#~ msgid "Howtos Romanian"
+#~ msgstr "Howtos em Romeno"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Romanian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Romeno"
+
+#~ msgid "Howtos Slovenian"
+#~ msgstr "Howtos em Esloveno"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Slovenian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Esloveno"
+
+#~ msgid "Howtos Swedish"
+#~ msgstr "Howtos em Sueco"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Swedish"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Sueco"
+
+#~ msgid "Howtos Chinese"
+#~ msgstr "Howtos em Chinês"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Chinese"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Chinês"
+
+#~ msgid "Ical"
+#~ msgstr "Ical"
+
+#~ msgid "Calendar program"
+#~ msgstr "Programa de Calendário"
+
+#~ msgid "IceBreaker"
+#~ msgstr "IceBreaker"
+
+#~ msgid "Action-puzzle game involving bouncing penguins"
+#~ msgstr "Jogo de Acção-Puzzle com pinguins saltantes"
+
+#~ msgid "IceWM Configuration tool"
+#~ msgstr "Ferramenta de configuração do IceWM"
+
+#~ msgid "IceWM"
+#~ msgstr "IceWM"
+
+#~ msgid "Irssi"
+#~ msgstr "Irssi"
+
+#~ msgid "Console Irc Client"
+#~ msgstr "Cliente de Irc em Consola"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "Joe"
+#~ msgstr "Joe"
+
+#~ msgid "Joe - a text ANSI editor"
+#~ msgstr "Joe - Editor de texto ANSI"
+
+#~ msgid "J-Pilot"
+#~ msgstr "J-Pilot"
+
+#~ msgid "A tool for your palm pilot"
+#~ msgstr "Uma ferramenta para o seu Palm Pilot"
+
+#~ msgid "K3b"
+#~ msgstr "K3b"
+
+#~ msgid "CD writing program"
+#~ msgstr "Programa de gravação de CDs"
+
+#~ msgid "K3b-cue"
+#~ msgstr "K3b-cue"
+
+#~ msgid "K3b-iso"
+#~ msgstr "K3b-iso"
+
+#~ msgid "K3bSetup 2"
+#~ msgstr "K3bSetup 2"
+
+#~ msgid "K3bSetup 2 - modify permission for CD/DVD burning with K3b"
+#~ msgstr ""
+#~ "K3bSetup 2 - modifica as permissões para a gravação de CDs/DVDs com o K3b"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
+
+#~ msgid "Kaffeine"
+#~ msgstr "Kaffeine"
+
+#~ msgid "Version 0.4.3b"
+#~ msgstr "Versão 0.4.3b"
+
+#~ msgid "Video"
+#~ msgstr "Vídeo"
+
+#~ msgid "KBear"
+#~ msgstr "KBear"
+
+#~ msgid "A Graphical FTP client"
+#~ msgstr "Um cliente FTP gráfico"
+
+#~ msgid "A mail notification utility"
+#~ msgstr "Utilitário de notificação de correio electrónico"
+
+#~ msgid "Kdbg"
+#~ msgstr "Kdbg"
+
+#~ msgid "A Graphical Debugger Interface"
+#~ msgstr "Um Interface de Depuração Gráfico"
+
+#~ msgid "K Magnifier"
+#~ msgstr "K Ampliador"
+
+#~ msgid "KMouseTool"
+#~ msgstr "KRato"
+
+#~ msgid "Clicks the mouse for you, reducing the effects of RSI"
+#~ msgstr "Clica no rato por si, reduzindo os efeitos e dores do RSI"
+
+#~ msgid "KMouth"
+#~ msgstr "KBoca"
+
+#~ msgid "Vim Component Configuration"
+#~ msgstr "Configuração do Componente Vim"
+
+#~ msgid "Components"
+#~ msgstr "Componentes"
+
+#~ msgid "KSig"
+#~ msgstr "KSig"
+
+#~ msgid "Atlantik Designer"
+#~ msgstr "Desenhador Atlantik"
+
+#~ msgid "Game board designer for Atlantik"
+#~ msgstr "Desenhador do tabuleiro de jogo para o Atlantik"
+
+#~ msgid "KCron"
+#~ msgstr "KCron"
+
+#~ msgid "KDat"
+#~ msgstr "KDat"
+
+#~ msgid "KUser"
+#~ msgstr "KUser"
+
+#~ msgid "KPackage"
+#~ msgstr "KPackage"
+
+#~ msgid "Packaging"
+#~ msgstr "Pacotes"
+
+#~ msgid "SysV-Init Editor"
+#~ msgstr "Editor SysV-Init"
+
+#~ msgid "Boot Manager (LILO)"
+#~ msgstr "Gestor de Arranque (LILO)"
+
+#~ msgid "Configure LILO (the Linux boot manager)"
+#~ msgstr "Configure o LILO (gestor de arranque do Linux)"
+
+#~ msgid "Linux Kernel"
+#~ msgstr "Kernel do Linux"
+
+#~ msgid "KDE Frontend for the Linux kernel configuration"
+#~ msgstr "Interface KDE para a configuração do kernel do Linux"
+
+#~ msgid "Banner"
+#~ msgstr "Cartaz"
+
+#~ msgid "ScreenSavers"
+#~ msgstr "Protecções de Ecrã"
+
+#~ msgid "Blob"
+#~ msgstr "Blob"
+
+#~ msgid "Clock"
+#~ msgstr "Relógio"
+
+#~ msgid "Lines"
+#~ msgstr "Linhas"
+
+#~ msgid "Lorenz Attractor"
+#~ msgstr "Atracção Lorenz"
+
+#~ msgid "Polygons"
+#~ msgstr "Polígonos"
+
+#~ msgid "Science"
+#~ msgstr "Ciência"
+
+#~ msgid "Slide Show"
+#~ msgstr "Passagem de Slides"
+
+#~ msgid "Swarm"
+#~ msgstr "Enxame"
+
+#~ msgid "Virtual Machine"
+#~ msgstr "Máquina Virtual"
+
+#~ msgid "Anemone"
+#~ msgstr "Anemone"
+
+#~ msgid "Ant"
+#~ msgstr "Ant"
+
+#~ msgid "Apollonian"
+#~ msgstr "Apollonian"
+
+#~ msgid "Attraction"
+#~ msgstr "Attraction"
+
+#~ msgid "Barcode"
+#~ msgstr "Barcode"
+
+#~ msgid "Blaster"
+#~ msgstr "Blaster"
+
+#~ msgid "BlitSpin"
+#~ msgstr "BlitSpin"
+
+#~ msgid "Bouboule"
+#~ msgstr "Bouboule"
+
+#~ msgid "Braid"
+#~ msgstr "Braid"
+
+#~ msgid "BSOD"
+#~ msgstr "BSOD"
+
+#~ msgid "Bubbles"
+#~ msgstr "Bubbles"
+
+#~ msgid "Bumps"
+#~ msgstr "Bumps"
+
+#~ msgid "C Curve"
+#~ msgstr "C Curve"
+
+#~ msgid "CloudLife"
+#~ msgstr "CloudLife"
+
+#~ msgid "Compass"
+#~ msgstr "Compass"
+
+#~ msgid "Coral"
+#~ msgstr "Coral"
+
+#~ msgid "OBEX devices"
+#~ msgstr "Dispositivos OBEX"
+
+#~ msgid "OBEX device configuration tool"
+#~ msgstr "Ferramenta de configuração de dispositivos OBEX"
+
+#~ msgid "Critical"
+#~ msgstr "Critical"
+
+#~ msgid "Crystal"
+#~ msgstr "Crystal"
+
+#~ msgid "Cynosure"
+#~ msgstr "Cynosure"
+
+#~ msgid "DecayScreen"
+#~ msgstr "DecayScreen"
+
+#~ msgid "Deco"
+#~ msgstr "Deco"
+
+#~ msgid "Deluxe"
+#~ msgstr "Deluxe"
+
+#~ msgid "Demon"
+#~ msgstr "Demon"
+
+#~ msgid "Discrete"
+#~ msgstr "Discrete"
+
+#~ msgid "Distort"
+#~ msgstr "Distort"
+
+#~ msgid "Drift"
+#~ msgstr "Drift"
+
+#~ msgid "Epicycle"
+#~ msgstr "Epicycle"
+
+#~ msgid "Euler2d"
+#~ msgstr "Euler2d"
+
+#~ msgid "Fade Plot"
+#~ msgstr "Fade Plot"
+
+#~ msgid "Flame"
+#~ msgstr "Chama"
+
+#~ msgid "Flow"
+#~ msgstr "Fluxo"
+
+#~ msgid "FluidBalls"
+#~ msgstr "Bolas Fluidas"
+
+#~ msgid "Forest"
+#~ msgstr "Floresta"
+
+#~ msgid "Galaxy"
+#~ msgstr "Galáxia"
+
+#~ msgid "Goop"
+#~ msgstr "Goop"
+
+#~ msgid "Gravity"
+#~ msgstr "Gravidade"
+
+#~ msgid "graynetic"
+#~ msgstr "Cinzento"
+
+#~ msgid "Halftone"
+#~ msgstr "Meio tom"
+
+#~ msgid "Halo"
+#~ msgstr "Halo"
+
+#~ msgid "Helix"
+#~ msgstr "Helix"
+
+#~ msgid "Hopalong"
+#~ msgstr "Hopalong"
+
+#~ msgid "Hyperball"
+#~ msgstr "Hiper-bola"
+
+#~ msgid "Hypercube"
+#~ msgstr "Hiper-cubo"
+
+#~ msgid "Iterated-function-system Images"
+#~ msgstr "Imagens IFS"
+
+#~ msgid "Fractal Maps"
+#~ msgstr "Mapas Fraccionados"
+
+#~ msgid "Interference"
+#~ msgstr "Interferência"
+
+#~ msgid "Jigsaw"
+#~ msgstr "Puzzle"
+
+#~ msgid "Juggle"
+#~ msgstr "Juggle"
+
+#~ msgid "Julia"
+#~ msgstr "Júlia"
+
+#~ msgid "Kaleidescope"
+#~ msgstr "Kaleidoscópio"
+
+#~ msgid "Media Screen Saver"
+#~ msgstr "Média de Protecção de Ecrã"
+
+#~ msgid "Kumppa"
+#~ msgstr "Kumppa"
+
+#~ msgid "Laser"
+#~ msgstr "Laser"
+
+#~ msgid "Lightning"
+#~ msgstr "Lightning"
+
+#~ msgid "Lisa"
+#~ msgstr "Lisa"
+
+#~ msgid "Lissie"
+#~ msgstr "Lissie"
+
+#~ msgid "Morphing Lines"
+#~ msgstr "Linhas Mutantes"
+
+#~ msgid "Loop"
+#~ msgstr "Ciclo"
+
+#~ msgid "Maze"
+#~ msgstr "Labirinto"
+
+#~ msgid "MetaBalls"
+#~ msgstr "MetaBolas"
+
+#~ msgid "Moire"
+#~ msgstr "Moire"
+
+#~ msgid "Moire2"
+#~ msgstr "Moire2"
+
+#~ msgid "Mountain"
+#~ msgstr "Montanha"
+
+#~ msgid "Munch"
+#~ msgstr "Munch"
+
+#~ msgid "NerveRot"
+#~ msgstr "NerveRot"
+
+#~ msgid "Noseguy"
+#~ msgstr "Noseguy"
+
+#~ msgid "Pedal"
+#~ msgstr "Pedal"
+
+#~ msgid "Penetrate"
+#~ msgstr "Penetração"
+
+#~ msgid "Penrose"
+#~ msgstr "Penrose"
+
+#~ msgid "Petri"
+#~ msgstr "Petri"
+
+#~ msgid "Phosphor"
+#~ msgstr "Fósforo"
+
+#~ msgid "Piecewise"
+#~ msgstr "Por Peças"
+
+#~ msgid "pixmaps"
+#~ msgstr "pixmaps"
+
+#~ msgid "Polyominoes"
+#~ msgstr "Polióminos"
+
+#~ msgid "Popsquares"
+#~ msgstr "Quadrados Pop"
+
+#~ msgid "Pyro"
+#~ msgstr "Pyro"
+
+#~ msgid "Qix"
+#~ msgstr "Qix"
+
+#~ msgid "RD-Bomb"
+#~ msgstr "Bomba RD"
+
+#~ msgid "Ripples"
+#~ msgstr "Ondas"
+
+#~ msgid "Rocks"
+#~ msgstr "Rochas"
+
+#~ msgid "Rorschach"
+#~ msgstr "Rorschach"
+
+#~ msgid "Rotor"
+#~ msgstr "Rotor"
+
+#~ msgid "RotZoomer"
+#~ msgstr "RotZoomer"
+
+#~ msgid "ShadeBobs"
+#~ msgstr "ShadeBobs"
+
+#~ msgid "Sierpinski"
+#~ msgstr "Sierpinski"
+
+#~ msgid "SlideScreen"
+#~ msgstr "Ecrã Deslizante"
+
+#~ msgid "Slip"
+#~ msgstr "Slip"
+
+#~ msgid "Sonar"
+#~ msgstr "Sonar"
+
+#~ msgid "SpeedMine"
+#~ msgstr "Minas"
+
+#~ msgid "Sphere"
+#~ msgstr "Esfera"
+
+#~ msgid "Spiral"
+#~ msgstr "Esperial"
+
+#~ msgid "Spotlight"
+#~ msgstr "Luz Pontual"
+
+#~ msgid "Squiral"
+#~ msgstr "Remoinho"
+
+#~ msgid "Starfish"
+#~ msgstr "Peixe Estrela"
+
+#~ msgid "StarWars"
+#~ msgstr "Guerra das Estrelas"
+
+#~ msgid "Strange"
+#~ msgstr "Estranho"
+
+#~ msgid "Swirl"
+#~ msgstr "Remoinho"
+
+#~ msgid "Time 3D"
+#~ msgstr "Hora 3D"
+
+#~ msgid "Thornbird"
+#~ msgstr "Thornbird"
+
+#~ msgid "Triangle"
+#~ msgstr "Triângulo"
+
+#~ msgid "Truchet"
+#~ msgstr "Truchet"
+
+#~ msgid "Twang"
+#~ msgstr "Twang"
+
+#~ msgid "Vermiculate"
+#~ msgstr "Vermiculato"
+
+#~ msgid "vidwhacker"
+#~ msgstr "vidwhacker"
+
+#~ msgid "Vines"
+#~ msgstr "Trepadeiras"
+
+#~ msgid "Wander"
+#~ msgstr "Vaguear"
+
+#~ msgid "Web Collage"
+#~ msgstr "Colagem Web"
+
+#~ msgid "WhirlwindWarp"
+#~ msgstr "Remoinho 2"
+
+#~ msgid "WhirlyGig"
+#~ msgstr "Ondulação"
+
+#~ msgid "Worm"
+#~ msgstr "Lagarta"
+
+#~ msgid "XFlame"
+#~ msgstr "Chama"
+
+#~ msgid "XJack"
+#~ msgstr "Jack"
+
+#~ msgid "Xlyap"
+#~ msgstr "Xlyap"
+
+#~ msgid "XRaySwarm"
+#~ msgstr "Enxame"
+
+#~ msgid "XSpiroGraph"
+#~ msgstr "Gráfico Espiral"
+
+#~ msgid "xsublim"
+#~ msgstr "xsublim"
+
+#~ msgid "XTeeVee"
+#~ msgstr "XTeeVee"
+
+#~ msgid "Zoom"
+#~ msgstr "Zoom"
+
+#~ msgid "Euphoria (GL)"
+#~ msgstr "Euforia (GL)"
+
+#~ msgid "Flux (GL)"
+#~ msgstr "Fluxo (GL)"
+
+#~ msgid "Particle Fountain (GL)"
+#~ msgstr "Fonte de Partículas (GL)"
+
+#~ msgid "Gravity (GL)"
+#~ msgstr "Gravidade (GL)"
+
+#~ msgid "Solar Winds (GL)"
+#~ msgstr "Ventos Solares (GL)"
+
+#~ msgid "Space (GL)"
+#~ msgstr "Espaço (GL)"
+
+#~ msgid "Bitmap Flag (GL)"
+#~ msgstr "Imagem Ondulante (GL)"
+
+#~ msgid "AntSpotlight"
+#~ msgstr "Luz Pontual Ant"
+
+#~ msgid "Atlantis (GL)"
+#~ msgstr "Atlântida (GL)"
+
+#~ msgid "Atunnel"
+#~ msgstr "Túnel"
+
+#~ msgid "BlockTube"
+#~ msgstr "Tubo Bloco"
+
+#~ msgid "BouncingCow"
+#~ msgstr "VacaSaltitante"
+
+#~ msgid "Boxed"
+#~ msgstr "Encaixotado"
+
+#~ msgid "Bubble 3D (GL)"
+#~ msgstr "Bolha 3D (GL)"
+
+#~ msgid "Cage (GL)"
+#~ msgstr "Jaula (GL)"
+
+#~ msgid "Circuit"
+#~ msgstr "Circuito"
+
+#~ msgid "Cubenetic"
+#~ msgstr "Cubo"
+
+#~ msgid "CubeStorm"
+#~ msgstr "Tempestade Cubo"
+
+#~ msgid "DangerBall"
+#~ msgstr "Bola Perigosa"
+
+#~ msgid "Endgame"
+#~ msgstr "Fim do Jogo"
+
+#~ msgid "Engine"
+#~ msgstr "Motor"
+
+#~ msgid "Eruption"
+#~ msgstr "Erupção"
+
+#~ msgid "Extrusion"
+#~ msgstr "Extrusão"
+
+#~ msgid "FlipFlop"
+#~ msgstr "FlipFlop"
+
+#~ msgid "Flipscreen3d"
+#~ msgstr "Ecrã Invertido 3D"
+
+#~ msgid "Flurry"
+#~ msgstr "Confuso"
+
+#~ msgid "Flying Toasters"
+#~ msgstr "Torradeira Voadoras"
+
+#~ msgid "Gears (GL)"
+#~ msgstr "Roldanas (GL)"
+
+#~ msgid "GFlux"
+#~ msgstr "GFlux"
+
+#~ msgid "GLBlur"
+#~ msgstr "GLBlur"
+
+#~ msgid "GLForestFire"
+#~ msgstr "Fogo na Floresta (GL)"
+
+#~ msgid "GLKnots"
+#~ msgstr "Nós GL"
+
+#~ msgid "GL Planet (GL)"
+#~ msgstr "Planeta (GL)"
+
+#~ msgid "GLSlideshow"
+#~ msgstr "Slides (GL)"
+
+#~ msgid "GLSnake"
+#~ msgstr "Cobra (GL)"
+
+#~ msgid "GLText"
+#~ msgstr "Texto (GL)"
+
+#~ msgid "4D Hypertorus"
+#~ msgstr "Hipertorus 4D"
+
+#~ msgid "JigglyPuff"
+#~ msgstr "JigglyPuff"
+
+#~ msgid "Klein"
+#~ msgstr "Klein"
+
+#~ msgid "Lament (GL)"
+#~ msgstr "Lamento (GL)"
+
+#~ msgid "LavaLite"
+#~ msgstr "LavaLite"
+
+#~ msgid "Menger"
+#~ msgstr "Menger"
+
+#~ msgid "Moebius (GL)"
+#~ msgstr "Moebius (GL)"
+
+#~ msgid "Molecule"
+#~ msgstr "Molécula"
+
+#~ msgid "Morph3D"
+#~ msgstr "Morph3D"
+
+#~ msgid "Pipes - another (GL)"
+#~ msgstr "Canos - outro (GL)"
+
+#~ msgid "Regular 4D Polytopes"
+#~ msgstr "Politópos Regulares 4D"
+
+#~ msgid "Pulsar (GL)"
+#~ msgstr "Pulsar (GL)"
+
+#~ msgid "Queens"
+#~ msgstr "Rainhas"
+
+#~ msgid "Rubik Cube (GL)"
+#~ msgstr "Cubo de Rubik (GL)"
+
+#~ msgid "Sballs"
+#~ msgstr "Sballs"
+
+#~ msgid "Sierpinski3D"
+#~ msgstr "Sierpinski3D"
+
+#~ msgid "Spheremonics"
+#~ msgstr "Esferemónicos"
+
+#~ msgid "Sproingies (GL)"
+#~ msgstr "Sproingies (GL)"
+
+#~ msgid "Stairs (GL)"
+#~ msgstr "Escadas (GL)"
+
+#~ msgid "StonerView"
+#~ msgstr "StonerView"
+
+#~ msgid "Superquadrics (GL)"
+#~ msgstr "Superquadráticos (GL)"
+
+#~ msgid "Sound System"
+#~ msgstr "Sistema de Som"
+
+#~ msgid "Sound System Configuration"
+#~ msgstr "Configuração do Sistema de Som"
+
+#~ msgid "Change the background settings"
+#~ msgstr "Altera a configuração do fundo"
+
+#~ msgid "LookNFeel"
+#~ msgstr "Aparência/Modo"
+
+#~ msgid "Please don't remove or modify"
+#~ msgstr "Por favor não apague ou modifique"
+
+#~ msgid "FileBrowsing"
+#~ msgstr "Explorar Ficheiros"
+
+#~ msgid "Peripherals"
+#~ msgstr "Periféricos"
+
+#~ msgid "Personalization"
+#~ msgstr "Personalização"
+
+#~ msgid "PowerControl"
+#~ msgstr "Controlo de Energia"
+
+#~ msgid "WebBrowsing"
+#~ msgstr "NavegaçãoWeb"
+
+#~ msgid "Laptop"
+#~ msgstr "Portátil"
+
+#~ msgid "System Bell"
+#~ msgstr "Campainha do Sistema"
+
+#~ msgid "System Bell Configuration"
+#~ msgstr "Configuração da Campainha do Sistema"
+
+#~ msgid "Configure web cache settings"
+#~ msgstr "Configuração das opções cache da Web"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#~ msgid "Color settings"
+#~ msgstr "Configuração das cores"
+
+#~ msgid "Component Chooser"
+#~ msgstr "Selector de Componentes"
+
+#~ msgid "Choose the default components for various services"
+#~ msgstr "Escolha os componentes predefinidos para os vários serviços"
+
+#~ msgid "Cookies"
+#~ msgstr "Cookies"
+
+#~ msgid "Configure the way cookies work"
+#~ msgstr "Configure a forma como os cookies funcionam"
+
+#~ msgid "Crypto"
+#~ msgstr "Cripto"
+
+#~ msgid "Configure SSL, manage certificates, and other cryptography settings"
+#~ msgstr ""
+#~ "Configure o SSL, gira certificados e outras configurações de criptografia"
+
+#~ msgid "Multiple Desktops"
+#~ msgstr "Ecrãs Múltiplos"
+
+#~ msgid "You can configure how many virtual desktops there are."
+#~ msgstr "Pode configurar quantos ecrãs virtuais existem."
+
+#~ msgid "Behavior"
+#~ msgstr "Comportamento"
+
+#~ msgid "You can configure how the desktop behaves here"
+#~ msgstr "Pode configurar aqui como o ecrã se comporta"
+
+#~ msgid "Paths"
+#~ msgstr "Localizações"
+
+#~ msgid "Change the location important files are stored"
+#~ msgstr "Altere as localizações onde os ficheiros importantes são guardados"
+
+#~ msgid "Display"
+#~ msgstr "Ecrã"
+
+#~ msgid "Display Settings"
+#~ msgstr "Configuração do Ecrã"
+
+#~ msgid "Web Shortcuts"
+#~ msgstr "Atalhos Web"
+
+#~ msgid "Configure enhanced browsing"
+#~ msgstr "Configure a navegação avançada"
+
+#~ msgid "Email"
+#~ msgstr "Correio Electrónico"
+
+#~ msgid "Configure your identity, email addresses, mail servers, etc."
+#~ msgstr ""
+#~ "Configure a sua identidade, endereços de correio electrónico, servidores, "
+#~ "etc."
+
+#~ msgid "Display Power Control"
+#~ msgstr "Controlo de Energia do Ecrã"
+
+#~ msgid "Settings for display power management"
+#~ msgstr "Configurações para a gestão de energia do ecrã"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparência"
+
+#~ msgid "You can configure how Konqueror looks as a file manager here"
+#~ msgstr ""
+#~ "Pode configurar aqui a aparência do Konqueror como gestor de ficheiros"
+
+#~ msgid "You can configure how Konqueror behaves as a file manager here"
+#~ msgstr ""
+#~ "Pode configurar aqui como o Konqueror se comporta como um gestor de "
+#~ "ficheiros"
+
+#~ msgid "File Manager"
+#~ msgstr "Gestor de Ficheiros"
+
+#~ msgid "You can configure Konqueror's file manager mode here"
+#~ msgstr "Pode configurar aqui o modo de gestão de ficheiros do Konqueror"
+
+#~ msgid "Previews & Meta-Data"
+#~ msgstr "Previsões & Meta-Dados"
+
+#~ msgid "You can configure how Konqueror Previews & Meta-data work here"
+#~ msgstr ""
+#~ "Pode configurar aqui como o Konqueror Prevê e os Meta-dados funcionam"
+
+#~ msgid "File Associations"
+#~ msgstr "Associações de Ficheiros"
+
+#~ msgid "Configure file associations"
+#~ msgstr "Configure as associações de ficheiros"
+
+#~ msgid "Fonts"
+#~ msgstr "Tipos de Letra"
+
+#~ msgid "Font settings"
+#~ msgstr "Configuração dos tipos de letra"
+
+#~ msgid "KDE Help Center"
+#~ msgstr "Centro de Ajuda KDE"
+
+#~ msgid "Home"
+#~ msgstr "Home"
+
+#~ msgid "Icons"
+#~ msgstr "Ícones"
+
+#~ msgid "Customize KDE Icons"
+#~ msgstr "Personalize os icones do KDE"
+
+#~ msgid "Protocols"
+#~ msgstr "Protocolos"
+
+#~ msgid "Information about the available protocols"
+#~ msgstr "Informação acerca dos protocolos disponíveis"
+
+#~ msgid "Improve accessibility for disabled persons"
+#~ msgstr "Melhore a acessibilidade para pessoas com deficiências"
+
+#~ msgid "CGI Scripts"
+#~ msgstr "Scripts CGI"
+
+#~ msgid "Configure the CGI KIO slave"
+#~ msgstr "Configure o KIO slave CGI"
+
+#~ msgid "Stylesheets"
+#~ msgstr "Folhas de Estilo"
+
+#~ msgid "Configure the stylesheets used to render web pages"
+#~ msgstr "Configure as folhas de estilo usadas para mostrar as páginas Web"
+
+#~ msgid "Font Installer"
+#~ msgstr "Instalador de Tipos de Letra"
+
+#~ msgid "Install & preview fonts"
+#~ msgstr "Instale e anteveja os tipos de letra"
+
+#~ msgid "History Sidebar"
+#~ msgstr "Barra Lateral do Histórico"
+
+#~ msgid "Configure the history sidebar"
+#~ msgstr "Configure a barra lateral do histórico"
+
+#~ msgid "Service Manager"
+#~ msgstr "Gestor de Serviços"
+
+#~ msgid "System Services Configuration"
+#~ msgstr "Configuração dos Serviços do Sistema"
+
+#~ msgid "Configure the Panel"
+#~ msgstr "Configure o Painel"
+
+#~ msgid "Performance"
+#~ msgstr "Performance"
+
+#~ msgid "Configure settings that can improve Konqueror performance"
+#~ msgstr "Configure as opções que podem aumentar a performance do Konqueror"
+
+#~ msgid "XML RPC Daemon"
+#~ msgstr "Daemon XML RPC"
+
+#~ msgid "Launch Feedback"
+#~ msgstr "Comportamento da Execução"
+
+#~ msgid "Choose application-launch feedback style"
+#~ msgstr "Escolha o estilo de feedback da aplicação/lançamento"
+
+#~ msgid "System Notifications"
+#~ msgstr "Notificações do Sistema"
+
+#~ msgid "System Notification Configuration"
+#~ msgstr "Configuração das Notificações do Sistema"
+
+#~ msgid "KDE Performance"
+#~ msgstr "Performance do KDE"
+
+#~ msgid "Configure settings that can improve KDE performance"
+#~ msgstr "Configure as opções que podem aumentar a performance do KDE"
+
+#~ msgid "Session Manager"
+#~ msgstr "Gestor de Sessões"
+
+#~ msgid "Configure the session manager and logout settings"
+#~ msgstr "Configure o gestor de sessões e as opções de finalização (logout)"
+
+#~ msgid "Taskbar"
+#~ msgstr "Barra de Tarefas"
+
+#~ msgid "Configure the panel taskbar"
+#~ msgstr "Configure a barra de tarefas do painel"
+
+#~ msgid "IEEE 1394 Devices"
+#~ msgstr "Dispositivos IEEE 1394"
+
+#~ msgid "View the IEEE 1394 devices attached to this computer"
+#~ msgstr "Veja os dispositivos IEEE 1394 conectados a este computador"
+
+#~ msgid "Configure your desktop"
+#~ msgstr "Configure o Seu Desktop"
+
+#~ msgid "Login Manager"
+#~ msgstr "Gestor de Autenticação"
+
+#~ msgid "Configure the login manager (KDM)"
+#~ msgstr "Configure o gestor de autenticação (KDM)"
+
+#~ msgid "Keyboard settings"
+#~ msgstr "Configuração do teclado"
+
+#~ msgid "Keyboard Layout"
+#~ msgstr "Disposição do Teclado"
+
+#~ msgid "Configuration of keybindings"
+#~ msgstr "Configuração dos atalhos do teclado"
+
+#~ msgid "Find Files"
+#~ msgstr "Procurar Ficheiros"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Web Behavior"
+#~ msgstr "Comportamento Web"
+
+#~ msgid "Configure the browser behavior"
+#~ msgstr "Configure o comportamento do browser"
+
+#~ msgid "Configure the fonts used on web pages"
+#~ msgstr "Configure os tipos de letra usados nas páginas Web"
+
+#~ msgid "Java & JavaScript"
+#~ msgstr "Java & JavaScript"
+
+#~ msgid "Configure the behavior of Java and JavaScript"
+#~ msgstr "Configure o comportamento do Java e do JavaScript"
+
+#~ msgid "Plugins"
+#~ msgstr "Plugins"
+
+#~ msgid "Configure the browser plugins"
+#~ msgstr "Configure os plugins do browser"
+
+#~ msgid "Layout"
+#~ msgstr "Disposição"
+
+#~ msgid "You can configure the arrangement of the panel here"
+#~ msgstr "Pode configurar aqui o posicionamento do painel"
+
+#~ msgid "Print Jobs"
+#~ msgstr "Tarefas de Impressão"
+
+#~ msgid "Menu Editor"
+#~ msgstr "Editor de Menus"
+
+#~ msgid "Konqueror Browser"
+#~ msgstr "Browser Konqueror"
+
+#~ msgid "Konqueror-hidden"
+#~ msgstr "Konqueror-escondido"
+
+#~ msgid "KDE File Manager & Web Browser"
+#~ msgstr "Gestor de Ficheiros KDE & Web Browser"
+
+#~ msgid "Konsole"
+#~ msgstr "Konsole"
+
+#~ msgid "Screen Resize & Rotate"
+#~ msgstr "Redimensionar o Ecrâ & Rodar"
+
+#~ msgid "A panel applet for resizing and reorientating X screens."
+#~ msgstr "Uma applet do painel para redimensionar e reorientar os ecrãs X."
+
+#~ msgid "Splash Screen"
+#~ msgstr "Ecrã Inicial/Splash"
+
+#~ msgid "Manager for Splash Screen Themes"
+#~ msgstr "Gestor de Temas do Ecrã Inicial"
+
+#~ msgid "KDE System Guard"
+#~ msgstr "Sistema de Guarda KDE"
+
+#~ msgid "Actions"
+#~ msgstr "Acções"
+
+#~ msgid "Configure keyboard and mouse settings"
+#~ msgstr "Configure as opções do teclado e do rato"
+
+#~ msgid "Configure advanced window management features"
+#~ msgstr "Configure as opções avançadas de manutenção das janelas"
+
+#~ msgid "Window Decorations"
+#~ msgstr "Decorações das Janelas"
+
+#~ msgid "Configure the look and feel of window titles"
+#~ msgstr "Configure a aparência e modo dos títulos das janelas"
+
+#~ msgid "Focus"
+#~ msgstr "Foco"
+
+#~ msgid "Configure the window focus policy"
+#~ msgstr "Configure a política de foco (primeiro plano) das janelas"
+
+#~ msgid "Configure the way that windows are moved"
+#~ msgstr "Configure a forma como as janelas são movidas"
+
+#~ msgid "Window Behavior"
+#~ msgstr "Comportamento das Janelas"
+
+#~ msgid "KWrite"
+#~ msgstr "KWrite"
+
+#~ msgid "Local Network Browsing"
+#~ msgstr "Navegação na Rede Local"
+
+#~ msgid "Setup lisa, reslisa and the ioslaves"
+#~ msgstr "Configurar o lisa, o reslisa e os ioslaves"
+
+#~ msgid "Country - Region & Language"
+#~ msgstr "País - Região & Língua"
+
+#~ msgid "Language, numeric, and time settings for your particular region"
+#~ msgstr ""
+#~ "Configuração da língua e dos parâmetros numéricos/horários da sua região"
+
+#~ msgid "Memory"
+#~ msgstr "Memória"
+
+#~ msgid "Memory information"
+#~ msgstr "Informação da memória"
+
+#~ msgid "Mouse settings"
+#~ msgstr "Configuração do rato"
+
+#~ msgid "Configure generic network preferences, like timeout values"
+#~ msgstr "Configure as opções de rede genéricas, como por ex. tempos-limite"
+
+#~ msgid "Panels"
+#~ msgstr "Painéis"
+
+#~ msgid "Configure the arrangement of the panel"
+#~ msgstr "Configure aqui o arranjo do painel"
+
+#~ msgid "Passwords"
+#~ msgstr "Senhas"
+
+#~ msgid "Configure password settings"
+#~ msgstr "Configure as opções das senhas"
+
+#~ msgid "Printers"
+#~ msgstr "Impressoras"
+
+#~ msgid "Printing system configuration (printers, jobs, classes, ...)"
+#~ msgstr ""
+#~ "Configuração do sistema de impressão (impressoras, tarefas, classes, ...)"
+
+#~ msgid "Printing Manager"
+#~ msgstr "Gestor de Impressão"
+
+#~ msgid "Privacy"
+#~ msgstr "Privacidade"
+
+#~ msgid ""
+#~ "Privacy - a kcontrol module to clean unwanted traces the user leaves on "
+#~ "the system"
+#~ msgstr ""
+#~ "Privacidade - um módulo do kcontrol para limpar os registos indesejáveis "
+#~ "que o utilizador deixa no sistema"
+
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Configure the proxy servers used"
+#~ msgstr "Configure os servidores proxy usados"
+
+#~ msgid "Size & Orientation"
+#~ msgstr "Tamanho & Orientação"
+
+#~ msgid "Resize and Rotate your display"
+#~ msgstr "Redimensione e Rode o seu ecrã"
+
+#~ msgid "Screen Saver"
+#~ msgstr "Protecção de Ecrã"
+
+#~ msgid "Screen Saver Settings"
+#~ msgstr "Configuração da Protecção de Ecrã"
+
+#~ msgid "Windows Shares"
+#~ msgstr "Partilhas do Windows"
+
+#~ msgid "Use to configure which windows (SMB) filesystems you can browse"
+#~ msgstr ""
+#~ "Use para configurar que sistemas de ficheiros windows (SMB) pode aceder"
+
+#~ msgid "Samba Status"
+#~ msgstr "Estado Samba"
+
+#~ msgid "Samba status monitor"
+#~ msgstr "Monitor de estado do Samba"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Verificador Ortográfico"
+
+#~ msgid "Configure the spell checker"
+#~ msgstr "Configure o verificador ortográfico"
+
+#~ msgid "Style"
+#~ msgstr "Estilo"
+
+#~ msgid ""
+#~ "Allows the manipulation of widget behavior and changing the Style for KDE"
+#~ msgstr ""
+#~ "Permite a manipulação do comportamento dos widgets e a mudança do estilo "
+#~ "para o KDE"
+
+#~ msgid "Browser Identification"
+#~ msgstr "Identificação do Browser"
+
+#~ msgid "Configure the way Konqueror reports itself"
+#~ msgstr "Configure a forma como o Konqueror se apresenta"
+
+#~ msgid "Virtual Desktops"
+#~ msgstr "Ecrãs Virtuais"
+
+#~ msgid "Multiple Monitors"
+#~ msgstr "Múltiplos Monitores"
+
+#~ msgid "Configure KDE for multiple monitors"
+#~ msgstr "Configure o KDE para múltiplos monitores"
+
+#~ msgid "X-Server"
+#~ msgstr "Servidor X"
+
+#~ msgid "X-Server information"
+#~ msgstr "Informações do Servidor X"
+
+#~ msgid "KHotKeys"
+#~ msgstr "KHotKeys"
+
+#~ msgid "Kate"
+#~ msgstr "Kate"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data & Hora"
+
+#~ msgid "Date and time settings"
+#~ msgstr "Configuração da data e hora"
+
+#~ msgid "Devices"
+#~ msgstr "Dispositivos"
+
+#~ msgid "Attached devices information"
+#~ msgstr "Informações dos dispositivos conectados"
+
+#~ msgid "DMA-Channels"
+#~ msgstr "Canais DMA"
+
+#~ msgid "DMA information"
+#~ msgstr "Informação DMA"
+
+#~ msgid "File Sharing"
+#~ msgstr "Partilha de Ficheiros"
+
+#~ msgid "Enable or disable file sharing"
+#~ msgstr "Active ou desactive a partilha de ficheiros"
+
+#~ msgid "Interrupts"
+#~ msgstr "Interrupções"
+
+#~ msgid "Interrupt information"
+#~ msgstr "Informação das interrupções"
+
+#~ msgid "IO-Ports"
+#~ msgstr "Portas IO"
+
+#~ msgid "IO-port information"
+#~ msgstr "Informação das portas IO (Input/Output)"
+
+#~ msgid "USB Devices"
+#~ msgstr "Dispositivos USB"
+
+#~ msgid "View the USB devices attached to this computer"
+#~ msgstr "Veja os dispositivos USB conectados a este computador"
+
+#~ msgid "Network Interfaces"
+#~ msgstr "Interfaces de Rede"
+
+#~ msgid "Network interface information"
+#~ msgstr "Informação das interfaces de rede"
+
+#~ msgid "Partition information"
+#~ msgstr "Informaçãodas partições"
+
+#~ msgid "PCI information"
+#~ msgstr "Informação PCI"
+
+#~ msgid "Processor"
+#~ msgstr "Processador"
+
+#~ msgid "Processor information"
+#~ msgstr "Informação do processador"
+
+#~ msgid "SCSI"
+#~ msgstr "SCSI"
+
+#~ msgid "SCSI information"
+#~ msgstr "Informação SCSI"
+
+#~ msgid "Sound information"
+#~ msgstr "Informação do som"
+
+#~ msgid "KdeprintFax"
+#~ msgstr "KdeprintFax"
+
+#~ msgid "Konsole configuration module"
+#~ msgstr "Módulo de configuração do Konsole"
+
+#~ msgid "kbthandsfree"
+#~ msgstr "kbthandsfree"
+
+#~ msgid "Hands-Free Profile Client"
+#~ msgstr "Cliente do Perfil Mãos Livres"
+
+#~ msgid "Phone"
+#~ msgstr "Telefone"
+
+#~ msgid "kbtobexclient"
+#~ msgstr "kbtobexclient"
+
+#~ msgid "An OBEX Object Push client for the KDEBluetooth Framework"
+#~ msgstr ""
+#~ "Um cliente de envio de objectos OBEX para a Infraestrutura Bluetooth do "
+#~ "KDE"
+
+#~ msgid "Bluetooth Obex Server"
+#~ msgstr "Servidor Bluetooth Obex"
+
+#~ msgid "kbtserialchat"
+#~ msgstr "kbtserialchat"
+
+#~ msgid "Small serial terminal application for Bluetooth"
+#~ msgstr "Pequena aplicação de terminal em serie para Bluetooth"
+
+#~ msgid "Bluetooth Services"
+#~ msgstr "Serviços Bluetooth"
+
+#~ msgid "Manage Bluetooth Services offered to others."
+#~ msgstr "Gere serviços Bluetooth oferecidos a outros."
+
+#~ msgid "kioobex_start"
+#~ msgstr "kioobex_start"
+
+#~ msgid "Browse files with OBEX FTP"
+#~ msgstr "Procure ficheiros com o OBEX FTP"
+
+#~ msgid "FlashKard"
+#~ msgstr "FlashKard"
+
+#~ msgid "Education"
+#~ msgstr "Educação"
+
+#~ msgid "Kalzium"
+#~ msgstr "Kalzium"
+
+#~ msgid "KBruch"
+#~ msgstr "KBruch"
+
+#~ msgid "Practice exercises with fractions"
+#~ msgstr "Pratique, faça exercícios com fracções"
+
+#~ msgid "KEduca"
+#~ msgstr "KEduca"
+
+#~ msgid "KEduca-Editor"
+#~ msgstr "Editor KEduca"
+
+#~ msgid "KHangMan"
+#~ msgstr "KHangMan"
+
+#~ msgid "Languages"
+#~ msgstr "Linguagens"
+
+#~ msgid "KDE Interactive Geometry"
+#~ msgstr "Geometria Interactiva KDE"
+
+#~ msgid "Kiten"
+#~ msgstr "Kiten"
+
+#~ msgid "KLettres"
+#~ msgstr "KLetras"
+
+#~ msgid "KMessedWords"
+#~ msgstr "KPalavrasMisturadas"
+
+#~ msgid "KmPlot"
+#~ msgstr "KmPlot"
+
+#~ msgid "Function Plotter"
+#~ msgstr "Desenho de funções"
+
+#~ msgid "KPercentage"
+#~ msgstr "KPercentagem"
+
+#~ msgid "KStars"
+#~ msgstr "KEstrelas"
+
+#~ msgid "Desktop Planetarium"
+#~ msgstr "Planetarium"
+
+#~ msgid "KTouch"
+#~ msgstr "KTocar"
+
+#~ msgid "Kverbos"
+#~ msgstr "Kverbos"
+
+#~ msgid "KVocTrain"
+#~ msgstr "KTreinarVoc"
+
+#~ msgid "KGoldrunner"
+#~ msgstr "KGoldrunner"
+
+#~ msgid "A game of action and puzzle-solving"
+#~ msgstr "Um jogo de acção e resolução de puzzles"
+
+#~ msgid "Atlantik"
+#~ msgstr "Atlantik"
+
+#~ msgid "KAsteroids"
+#~ msgstr "KAsteróides"
+
+#~ msgid "KAtomic"
+#~ msgstr "KAtómico"
+
+#~ msgid "KBackgammon"
+#~ msgstr "KBackgammon"
+
+#~ msgid "KBattleship"
+#~ msgstr "KBatalhaNaval"
+
+#~ msgid "KBlackBox"
+#~ msgstr "KBlackBox"
+
+#~ msgid "KBounce"
+#~ msgstr "KBounce"
+
+#~ msgid "Kenolaba"
+#~ msgstr "Kenolaba"
+
+#~ msgid "KFoulEggs"
+#~ msgstr "KOvosPodres"
+
+#~ msgid "KJumpingCube"
+#~ msgstr "KJumpingCube"
+
+#~ msgid "Klickety"
+#~ msgstr "Klickety"
+
+#~ msgid "Kolor Lines"
+#~ msgstr "Linhas Koloridas"
+
+#~ msgid "KMahjongg"
+#~ msgstr "KMahjongg"
+
+#~ msgid "KMines"
+#~ msgstr "KMinas"
+
+#~ msgid "Kolf"
+#~ msgstr "Kolf"
+
+#~ msgid "Konquest"
+#~ msgstr "Konquista"
+
+#~ msgid "Patience"
+#~ msgstr "Paciência"
+
+#~ msgid "KPoker"
+#~ msgstr "KPoker"
+
+#~ msgid "KReversi"
+#~ msgstr "KReversi"
+
+#~ msgid "SameGame"
+#~ msgstr "MesmoJogo"
+
+#~ msgid "Shisen-Sho"
+#~ msgstr "Shisen-Sho"
+
+#~ msgid "KSirtet"
+#~ msgstr "KSirtet"
+
+#~ msgid "KSmileTris"
+#~ msgstr "KSorrisostris"
+
+#~ msgid "KSnakeRace"
+#~ msgstr "KorridaKobras"
+
+#~ msgid "KSokoban"
+#~ msgstr "KSokoban"
+
+#~ msgid "KSpaceDuel"
+#~ msgstr "KDueloNoEspaço"
+
+#~ msgid "KTron"
+#~ msgstr "KTron"
+
+#~ msgid "Potato Guy"
+#~ msgstr "Homem Batata"
+
+#~ msgid "KWin4"
+#~ msgstr "KWin4"
+
+#~ msgid "Lieutnant Skat"
+#~ msgstr "Tenente Skat"
+
+#~ msgid "Digital Camera"
+#~ msgstr "Câmara Digital"
+
+#~ msgid "Configure Kamera"
+#~ msgstr "Configuração do Kamera"
+
+#~ msgid "Monitor Gamma"
+#~ msgstr "Correcção Gama do Monitor"
+
+#~ msgid "A monitor calibration tool"
+#~ msgstr "Ferramenta de calibração do monitor"
+
+#~ msgid "KDVI"
+#~ msgstr "KDVI"
+
+#~ msgid "KFax"
+#~ msgstr "KFax"
+
+#~ msgid "KGhostView"
+#~ msgstr "KGhostView"
+
+#~ msgid "KIconEdit"
+#~ msgstr "KIconEdit"
+
+#~ msgid "Kooka"
+#~ msgstr "Kooka"
+
+#~ msgid "KColorChooser"
+#~ msgstr "KColorChooser"
+
+#~ msgid "KColorEdit"
+#~ msgstr "KColorEdit"
+
+#~ msgid "KPaint"
+#~ msgstr "KPaint"
+
+#~ msgid "KPDF"
+#~ msgstr "KPDF"
+
+#~ msgid "Povray Modeler"
+#~ msgstr "Modelador Povray"
+
+#~ msgid "KRuler"
+#~ msgstr "KRuler"
+
+#~ msgid "KSnapshot"
+#~ msgstr "KSnapshot"
+
+#~ msgid "Kuickshow"
+#~ msgstr "Kuickshow"
+
+#~ msgid "KView"
+#~ msgstr "KView"
+
+#~ msgid "Image Index"
+#~ msgstr "Índex de Imagens"
+
+#~ msgid "Configuration for using the GNU Image Finding Tool"
+#~ msgstr "Configuração da Ferramenta de Procura de Imagens da GNU"
+
+#~ msgid "KDE Resources Configuration"
+#~ msgstr "Configuração dos Recursos KDE"
+
+#~ msgid "aRts Builder"
+#~ msgstr "Construtor aRts"
+
+#~ msgid "aRts Control Tool"
+#~ msgstr "Ferramenta de Controlo aRts"
+
+#~ msgid "Audio CDs"
+#~ msgstr "CDs de Áudio"
+
+#~ msgid "Audiocd IO Slave Configuration"
+#~ msgstr "Configuração do IO Slave Audiocd"
+
+#~ msgid "JuK"
+#~ msgstr "JuK"
+
+#~ msgid "Kaboodle"
+#~ msgstr "Kaboodle"
+
+#~ msgid "KAudioCreator"
+#~ msgstr "KAudioCreator"
+
+#~ msgid "Frontend for audio file creation"
+#~ msgstr "Uma interface para a criação de ficheiros de áudio"
+
+#~ msgid "KMid"
+#~ msgstr "KMid"
+
+#~ msgid "KMix"
+#~ msgstr "KMix"
+
+#~ msgid "Mixer"
+#~ msgstr "Mixer"
+
+#~ msgid "Soundcard mixer control"
+#~ msgstr "Controlo da mistura da placa de som"
+
+#~ msgid "KRec"
+#~ msgstr "KRec"
+
+#~ msgid "KsCD"
+#~ msgstr "KsCD"
+
+#~ msgid "CDDB Retrieval"
+#~ msgstr "Transferência de CDDB"
+
+#~ msgid "Noatun"
+#~ msgstr "Noatun"
+
+#~ msgid "Kdict"
+#~ msgstr "Kdict"
+
+#~ msgid "KGet"
+#~ msgstr "KGet"
+
+#~ msgid "KNewsTicker"
+#~ msgstr "KNewsTicker"
+
+#~ msgid "KNewsTicker config frontend"
+#~ msgstr "Configuração das Notícias"
+
+#~ msgid "A frontend for the KNewsTicker configuration"
+#~ msgstr "Configuração do extractor de notícias"
+
+#~ msgid "Kopete"
+#~ msgstr "Kopete"
+
+#~ msgid "Instant Messenger"
+#~ msgstr "Mensageiro Instantâneo"
+
+#~ msgid "KPPP"
+#~ msgstr "KPPP"
+
+#~ msgid "Remote Access"
+#~ msgstr "Acesso Remoto"
+
+#~ msgid "KPPP - Log Viewer"
+#~ msgstr "KPPP - Visualizador de Registos"
+
+#~ msgid "Desktop Sharing"
+#~ msgstr "Partilha do Ambiente de Trabalho"
+
+#~ msgid "Configure Desktop Sharing"
+#~ msgstr "Configure a Partilha do Ecrã"
+
+#~ msgid "Remote Desktop Connection"
+#~ msgstr "Conexão a Ecrã Remoto"
+
+#~ msgid "KSirc"
+#~ msgstr "KSirc"
+
+#~ msgid "Local Network Chat"
+#~ msgstr "Chat na Rede Local"
+
+#~ msgid "Talk daemon configuration"
+#~ msgstr "Configuração do daemon talk"
+
+#~ msgid "Wireless Network"
+#~ msgstr "Rede Sem Fios/Wireless"
+
+#~ msgid "Set up your wireless LAN"
+#~ msgstr "Configure a sua da rede sem fios LAN"
+
+#~ msgid "KWiFiManager"
+#~ msgstr "KWiFiManager"
+
+#~ msgid "A wireless LAN connection monitor"
+#~ msgstr "Um monitor de ligações na rede local sem-fios (wireless)"
+
+#~ msgid "Kdenlive"
+#~ msgstr "Kdenlive"
+
+#~ msgid "Nonlinear video editor for KDE"
+#~ msgstr "Um editor de vídeo não linear para KDE"
+
+#~ msgid "KPalmDOC"
+#~ msgstr "KPalmDOC"
+
+#~ msgid "TNEF File Viewer"
+#~ msgstr "Visualizador de Ficheiros TNEF"
+
+#~ msgid "A viewer/extractor for TNEF files"
+#~ msgstr "Um visualizador/extractor de ficheiros TNEF"
+
+#~ msgid "Address Manager"
+#~ msgstr "Gestor de Endereços"
+
+#~ msgid "KArm"
+#~ msgstr "KArm"
+
+#~ msgid "KMail"
+#~ msgstr "KMail"
+
+#~ msgid "KNode"
+#~ msgstr "KNode"
+
+#~ msgid "News"
+#~ msgstr "Notícias"
+
+#~ msgid "KNotes"
+#~ msgstr "KNotes"
+
+#~ msgid "Kontact"
+#~ msgstr "Kontact"
+
+#~ msgid "KAlarm"
+#~ msgstr "KAlarme"
+
+#~ msgid "KOrganizer"
+#~ msgstr "KOrganizer"
+
+#~ msgid "Calendar and Scheduling Program"
+#~ msgstr "Calendário e Programa de Escalonamento"
+
+#~ msgid "Korn"
+#~ msgstr "Korn"
+
+#~ msgid "Kandy"
+#~ msgstr "Kandy"
+
+#~ msgid "KPilot"
+#~ msgstr "KPilot"
+
+#~ msgid "KPilotDaemon"
+#~ msgstr "KPilotDaemon"
+
+#~ msgid "KBugBuster"
+#~ msgstr "KBugBuster"
+
+#~ msgid "Kompare"
+#~ msgstr "Kompare"
+
+#~ msgid "KUIViewer"
+#~ msgstr "KUIViewer"
+
+#~ msgid "Cervisia"
+#~ msgstr "Cervisia"
+
+#~ msgid "KBabel - Catalog Manager"
+#~ msgstr "KBabel - Gestor de Catálogos"
+
+#~ msgid "KBabel"
+#~ msgstr "KBabel"
+
+#~ msgid "KBabel - Dictionary"
+#~ msgstr "KBabel - Dicionário"
+
+#~ msgid "KCachegrind"
+#~ msgstr "KCachegrind"
+
+#~ msgid "Visualization of Performance Profiling Data"
+#~ msgstr "Visualização dos Dados de Análise da Performance"
+
+#~ msgid "Umbrello"
+#~ msgstr "Umbrello"
+
+#~ msgid "AMOR"
+#~ msgstr "AMOR"
+
+#~ msgid "Toys"
+#~ msgstr "Brinquedos"
+
+#~ msgid "MoonPhase"
+#~ msgstr "Fase Lunar"
+
+#~ msgid "Mouspedometa"
+#~ msgstr "Ratómetro"
+
+#~ msgid "Tea Cooker"
+#~ msgstr "Chá"
+
+#~ msgid "Tux"
+#~ msgstr "Tux"
+
+#~ msgid "World Clock"
+#~ msgstr "Relógio Mundial"
+
+#~ msgid "kdetv"
+#~ msgstr "kdetv"
+
+#~ msgid "Ark"
+#~ msgstr "Ark"
+
+#~ msgid "KDE LIRC server"
+#~ msgstr "Servidor LIRC do KDE"
+
+#~ msgid "KDE Linux infrared remote control server."
+#~ msgstr "Servidor dos controlos remotos por infravermelhos Linux KDE."
+
+#~ msgid "Remote Controls"
+#~ msgstr "Controlos Remotos"
+
+#~ msgid "Configure your remote controls for use with applications"
+#~ msgstr "Configure os seus controlos remotos para usar com aplicações"
+
+#~ msgid "KRegExpEditor"
+#~ msgstr "KRegExpEditor"
+
+#~ msgid "KCalc"
+#~ msgstr "KCalc"
+
+#~ msgid "KCharSelect"
+#~ msgstr "KCharSelect"
+
+#~ msgid "Change Password"
+#~ msgstr "Mudar Senha"
+
+#~ msgid "User Account"
+#~ msgstr "Conta do Utilizador"
+
+#~ msgid "Change your account information"
+#~ msgstr "Alterar a informação da sua conta"
+
+#~ msgid "Storage Devices"
+#~ msgstr "Dispositivos de Armazenamento"
+
+#~ msgid "Shows the disk usage of the mounted devices"
+#~ msgstr "Mostra o espaço ocupado nos dispositivos montados"
+
+#~ msgid "KDiskFree"
+#~ msgstr "KDiskFree"
+
+#~ msgid "KwikDisk"
+#~ msgstr "KwikDisk"
+
+#~ msgid "KEdit"
+#~ msgstr "KEdit"
+
+#~ msgid "KFloppy"
+#~ msgstr "KFloppy"
+
+#~ msgid "KGpg"
+#~ msgstr "KGpg"
+
+#~ msgid "A GnuPG frontend"
+#~ msgstr "Uma interface para o GnuPG"
+
+#~ msgid "KHexEdit"
+#~ msgstr "KHexEdit"
+
+#~ msgid "KJots"
+#~ msgstr "KJots"
+
+#~ msgid "Sony Vaio Laptop Hardware Configuration"
+#~ msgstr "Configuração do Hardware do Portátil Sony Vaio"
+
+#~ msgid ""
+#~ "Configure the KDE Interface to the Sony Programmable Interrupt Controller "
+#~ "Driver"
+#~ msgstr ""
+#~ "Configure o Interface KDE para o Driver do Controlador de Interrupeções "
+#~ "Programaveis da Sony"
+
+#~ msgid "Laptop Battery"
+#~ msgstr "Bateria do Portátil"
+
+#~ msgid "PCMCIA status"
+#~ msgstr "Estados PCMCIA"
+
+#~ msgid "KTimer"
+#~ msgstr "KTimer"
+
+#~ msgid "KDE Wallet"
+#~ msgstr "KDE Wallet"
+
+#~ msgid "KDE Wallet Configuration"
+#~ msgstr "Configuração da Carteira do KDE"
+
+#~ msgid "KDevelop"
+#~ msgstr "KDevelop"
+
+#~ msgid "Development Environments"
+#~ msgstr "Ambientes de Programação"
+
+#~ msgid "KimDaBa"
+#~ msgstr "KimDaBa"
+
+#~ msgid "Video editor for DV format"
+#~ msgstr "Editor vídeo para formato DV"
+
+#~ msgid "Kiosk Admin Tool"
+#~ msgstr "Ferramenta de Administração do Kiosk"
+
+#~ msgid "kjscmd"
+#~ msgstr "kjscmd"
+
+#~ msgid "Karbon14"
+#~ msgstr "Karbon14"
+
+#~ msgid "Drawing"
+#~ msgstr "Desenhar"
+
+#~ msgid "Kivio"
+#~ msgstr "Kivio"
+
+#~ msgid "KPresenter"
+#~ msgstr "KPresenter"
+
+#~ msgid "Presentations"
+#~ msgstr "Apresentações"
+
+#~ msgid "KChart"
+#~ msgstr "KChart"
+
+#~ msgid "KSpread"
+#~ msgstr "KSpread"
+
+#~ msgid "Kugar"
+#~ msgstr "Kugar"
+
+#~ msgid "Kugar Designer"
+#~ msgstr "Desenhador Kugar"
+
+#~ msgid "Report Designer"
+#~ msgstr "Desenhador de Relatórios"
+
+#~ msgid "KWord"
+#~ msgstr "KWord"
+
+#~ msgid "Wordprocessors"
+#~ msgstr "Processadores de Texto"
+
+#~ msgid "KFormula"
+#~ msgstr "KFormula"
+
+#~ msgid "KOffice Workspace"
+#~ msgstr "Espaço de Trabalho KOffice"
+
+#~ msgid "Kover"
+#~ msgstr "Kover"
+
+#~ msgid "CD Kover Printer"
+#~ msgstr "Impressão de capas de CD Kover"
+
+#~ msgid "K-Phone"
+#~ msgstr "K-Phone"
+
+#~ msgid "KPhone: A SIP phone for KDE"
+#~ msgstr "KPhone: Um telefone SIP para KDE"
+
+#~ msgid "Mandrake Slide Show"
+#~ msgstr "Passagem de Slides Mandrake"
+
+#~ msgid "Monitors seti@home crunching"
+#~ msgstr "Monitorizar seti@home"
+
+#~ msgid "KTerm"
+#~ msgstr "KTerm"
+
+#~ msgid "Kanji Terminal Emulator"
+#~ msgstr "Emulador de Terminal Kanji"
+
+#~ msgid "LBreakout 2"
+#~ msgstr "LBreakout 2"
+
+#~ msgid "Breakout-style arcade game"
+#~ msgstr "Jogo de arcada tipo Breakout"
+
+#~ msgid "Mwm"
+#~ msgstr "Mwm"
+
+#~ msgid "A free Motif clone"
+#~ msgstr "Um clone livre Motif"
+
+#~ msgid "Qt3 Assistant"
+#~ msgstr "Assistente Qt3"
+
+#~ msgid "A manual browser for Qt3 documentation"
+#~ msgstr "Um browser manual para documentação Qt3"
+
+#~ msgid "Qt3 Designer"
+#~ msgstr "Desenhador Qt3"
+
+#~ msgid "A graphical designer/dialog builder for Qt3"
+#~ msgstr "Um compilador gráfico desenho/diálogo para Qt3"
+
+#~ msgid "Qt Linguist"
+#~ msgstr "Qt Linguistica"
+
+#~ msgid "A translation tool for Qt3"
+#~ msgstr "Uma ferramenta de tradução para QT3"
+
+#~ msgid "ICQ client"
+#~ msgstr "Cliente ICQ"
+
+#~ msgid "Links"
+#~ msgstr "Ligações"
+
+#~ msgid "Lynx-like text/graphic Web browser"
+#~ msgstr "Web browser texto/gráfico tipo Lynx"
+
+#~ msgid "LinNeighborhood"
+#~ msgstr "LinNeighborhood"
+
+#~ msgid "Graphical front end to Samba (LinNeighborhood)"
+#~ msgstr "Interface gráfico para Samba (LinNeighborhood)"
+
+#~ msgid "LAN KIO Slave"
+#~ msgstr "LAN KIO Slave"
+
+#~ msgid "lan: and rlan: setup"
+#~ msgstr "Configuração lan: e rlan:"
+
+#~ msgid "LISa"
+#~ msgstr "LISa"
+
+#~ msgid "Setup LISa"
+#~ msgstr "Configuração LISa"
+
+#~ msgid "ResLISa"
+#~ msgstr "ResLISa"
+
+#~ msgid "Setup ResLISa"
+#~ msgstr "Configuração ResLISa"
+
+#~ msgid "LyX"
+#~ msgstr "LyX"
+
+#~ msgid "TeX word processor - especially good at scientific documents"
+#~ msgstr ""
+#~ "Processador de texto TeX - especialmente bom para documentos cientificos"
+
+#~ msgid "Asteroids game"
+#~ msgstr "Jogo de Asteróides"
+
+#~ msgid "CD Properties"
+#~ msgstr "Propriedades do CD"
+
+#~ msgid "Configure handling of CD devices"
+#~ msgstr "Configurar a gestão dos dispositivos CD"
+
+#~ msgid "Mandrakelinux documentation in German"
+#~ msgstr "Documentação Mandrakelinux em Alemão"
+
+#~ msgid "Mandrakelinux Documentation in German"
+#~ msgstr "Documentação Mandrakelinux em Alemão"
+
+#~ msgid "Mandrakelinux documentation in English"
+#~ msgstr "Documentação Mandrakelinux em Inglês"
+
+#~ msgid "Mandrakelinux Documentation in English"
+#~ msgstr "Documentação Mandrakelinux em Inglês"
+
+#~ msgid "Mandrakelinux documentation in Spanish"
+#~ msgstr "Documentação Mandrakelinux em Espanhol"
+
+#~ msgid "Mandrakelinux Documentation in Spanish"
+#~ msgstr "Documentação Mandrakelinux em Espanhol"
+
+#~ msgid "Mandrakelinux documentation in French"
+#~ msgstr "Documentação Mandrakelinux em Francês"
+
+#~ msgid "Mandrakelinux Documentation in French"
+#~ msgstr "Documentação Mandrakelinux em Francês"
+
+#~ msgid "Mandrakelinux documentation in Italian"
+#~ msgstr "Documentação Mandrakelinux em Italiano"
+
+#~ msgid "Mandrakelinux Documentation in Italian"
+#~ msgstr "Documentação Mandrakelinux em Italiano"
+
+#~ msgid "Mandrakelinux documentation in Chinese"
+#~ msgstr "Documentação Mandrakelinux em Chinês"
+
+#~ msgid "Mandrakelinux Documentation in Chinese"
+#~ msgstr "Documentação Mandrakelinux em Chinês"
+
+#~ msgid "Marbles"
+#~ msgstr "Marbles"
+
+#~ msgid "Atomix-style arcade game"
+#~ msgstr "Jogo de arcada no estilo Atomix"
+
+#~ msgid "Interactive function grapher"
+#~ msgstr "Função interactiva de grafismo"
+
+#~ msgid "Discover custom services"
+#~ msgstr "Descubra serviços personalizados"
+
+#~ msgid "Wizard tool for online registered user"
+#~ msgstr "Assistente para o utilizador registado online"
+
+#~ msgid "Tasks Management"
+#~ msgstr "Gerir Tarefas"
+
+#~ msgid "Web Editors"
+#~ msgstr "Editores Web"
+
+#~ msgid "Text Tools"
+#~ msgstr "Ferramentas de Texto"
+
+#~ msgid "Code Generators"
+#~ msgstr "Geradores de Código"
+
+#~ msgid "Economy"
+#~ msgstr "Economia"
+
+#~ msgid "Geography"
+#~ msgstr "Geografia"
+
+#~ msgid "History"
+#~ msgstr "Historia"
+
+#~ msgid "Literature"
+#~ msgstr "Literatura"
+
+#~ msgid "Emulators"
+#~ msgstr "Emuladores"
+
+#~ msgid "Adventure"
+#~ msgstr "Aventura"
+
+#~ msgid "Artificial Intelligence"
+#~ msgstr "Inteligência Artificial"
+
+#~ msgid "Astronomy"
+#~ msgstr "Astronomia"
+
+#~ msgid "Biology"
+#~ msgstr "Biologia"
+
+#~ msgid "Chemistry"
+#~ msgstr "Química"
+
+#~ msgid "Computer science"
+#~ msgstr "Ciência de Computação"
+
+#~ msgid "Data Visualization"
+#~ msgstr "Visualizar Dados"
+
+#~ msgid "Electricity"
+#~ msgstr "Electricidade"
+
+#~ msgid "Geosciences"
+#~ msgstr "Geociências"
+
+#~ msgid "Image Processing"
+#~ msgstr "Tratamento de Imagem"
+
+#~ msgid "Numeric Analysis"
+#~ msgstr "Análise Numérica"
+
+#~ msgid "Parallel Computing"
+#~ msgstr "Computação Paralela"
+
+#~ msgid "Physics"
+#~ msgstr "Física"
+
+#~ msgid "Robotics"
+#~ msgstr "Robótica"
+
+#~ msgid "Menu editor"
+#~ msgstr "Editor de Menus"
+
+#~ msgid "Mesa gears"
+#~ msgstr "Mesa gears"
+
+#~ msgid "Gears 3D demonstration from Mesa 3D"
+#~ msgstr "Gears 3D demonstração para Mesa 3D"
+
+#~ msgid "Mesa reflect"
+#~ msgstr "Mesa reflect"
+
+#~ msgid "Reflect 3D demonstration from Mesa 3D"
+#~ msgstr "Reflect 3D demonstração para Mesa 3D"
+
+#~ msgid "Mesa morph"
+#~ msgstr "Mesa morph"
+
+#~ msgid "Morph 3D demonstration from Mesa 3D"
+#~ msgstr "Morph 3D demonstração para Mesa 3D"
+
+#~ msgid "Super Methane Brothers"
+#~ msgstr "Super Irmãos Methane"
+
+#~ msgid "A bubble bobble like arcade game"
+#~ msgstr "Jogo de arcada tipo bubble bobble"
+
+#~ msgid "MoTV"
+#~ msgstr "MoTV"
+
+#~ msgid "A program for watching TV"
+#~ msgstr "Um programa para ver TV"
+
+#~ msgid "DrakLoop"
+#~ msgstr "DrakLoop"
+
+#~ msgid "Create encrypted folder"
+#~ msgstr "Criar pasta encriptada"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "The free and open source web browser"
+#~ msgstr "Web browser livre e open source"
+
+#~ msgid "Mozilla Composer"
+#~ msgstr "Mozilla Compositor"
+
+#~ msgid "Mozilla Messenger"
+#~ msgstr "Mozilla Correio"
+
+#~ msgid "Mozilla AddressBook"
+#~ msgstr "Mozilla Livro de Endereços"
+
+#~ msgid "MP3 info"
+#~ msgstr "MP3 info"
+
+#~ msgid "Utility for MP3 information and tag modification"
+#~ msgstr "Utilitário para informação MP3 e modificar marcas"
+
+#~ msgid "MPlayer"
+#~ msgstr "MPlayer"
+
+#~ msgid "Movie player for linux"
+#~ msgstr "Leitor de Filmes para linux"
+
+#~ msgid "MTools File Manager"
+#~ msgstr "Gestor de Ficheiros MTools"
+
+#~ msgid ""
+#~ "File manager to access photo memory cards in HP's PhotoSmart printers and "
+#~ "MF devices"
+#~ msgstr ""
+#~ "Gestor de ficheiros para aceder às placas de memoria nas impressoras HP "
+#~ "PhotoSmart e dispositivos MF"
+
+#~ msgid "Mures"
+#~ msgstr "Mures"
+
+#~ msgid "Clone of Sega's Chu Chu Rocket"
+#~ msgstr "Clone do Chu Chu Rocket da Sega"
+
+#~ msgid "Nautilus"
+#~ msgstr "Nautilus"
+
+#~ msgid "Nautilus - GNOME file manager"
+#~ msgstr "Nautilus - Gestor de Ficheiros GNOME"
+
+#~ msgid "File Management"
+#~ msgstr "Gestor de Ficheiros"
+
+#~ msgid "Change how files are managed"
+#~ msgstr "Alterar como os ficheiros são geridos"
+
+#~ msgid "Nautilus CD Burning"
+#~ msgstr "Nautilus Gravador de CD"
+
+#~ msgid "Nautilus CD Burning tool"
+#~ msgstr "Ferramenta do Nautilus para Gravar CDs"
+
+#~ msgid "Nedit"
+#~ msgstr "Nedit"
+
+#~ msgid "A text editor based on lesstif"
+#~ msgstr "Um editor de texto baseado no lesstif"
+
+#~ msgid "Nmap"
+#~ msgstr "Nmap"
+
+#~ msgid "A frontend for the nmap port scanner"
+#~ msgstr "Interface para a porta de scaner nmap"
+
+#~ msgid "NvTV"
+#~ msgstr "NvTV"
+
+#~ msgid "Nvidia TV"
+#~ msgstr "Nvidia TV"
+
+#~ msgid "OpenOffice.org Quickstarter"
+#~ msgstr "OpenOffice.org Arranque Rápido"
+
+#~ msgid "OpenOffice.org's Quickstarter for KDE systems"
+#~ msgstr "Arranque Rápido do OpenOffice.org para sistemas KDE"
+
+#~ msgid "OpenDX"
+#~ msgstr "OpenDX"
+
+#~ msgid "Visualization Data Explorer"
+#~ msgstr "Visualizar Explorador de Dados"
+
+#~ msgid "OpenOffice.org Calc"
+#~ msgstr "OpenOffice.org Calc"
+
+#~ msgid "OpenOffice.org Spreadsheet"
+#~ msgstr "OpenOffice.org Folha de calculo"
+
+#~ msgid "OpenOffice.org Draw"
+#~ msgstr "OpenOffice.org Draw"
+
+#~ msgid "OpenOffice.org Drawing"
+#~ msgstr "OpenOffice.org Desenhar"
+
+#~ msgid "OpenOffice.org Impress"
+#~ msgstr "OpenOffice.org Impress"
+
+#~ msgid "OpenOffice.org Presentation"
+#~ msgstr "OpenOffice.org Apresentação"
+
+#~ msgid "OpenOffice.org Writer"
+#~ msgstr "OpenOffice.org Writer"
+
+#~ msgid "OpenOffice.org Word Processing Component"
+#~ msgstr "OpenOffice.org Componente Processador de Texto"
+
+#~ msgid "OpenOffice.org Math"
+#~ msgstr "OpenOffice.org Math"
+
+#~ msgid "OpenOffice.org Formula Editor"
+#~ msgstr "OpenOffice.org Editor de Formulas"
+
+#~ msgid "Pan"
+#~ msgstr "Pan"
+
+#~ msgid "Read News from Usenet"
+#~ msgstr "Ler Notícias da Usenet"
+
+#~ msgid "PostgreSQL Tcl/Tk front-end"
+#~ msgstr "Interface Tcl/Tk para PostgreSQL"
+
+#~ msgid "Planner"
+#~ msgstr "Planner"
+
+#~ msgid "Project management tool"
+#~ msgstr "Ferramenta de gestão de projectos"
+
+#~ msgid "Power Manga"
+#~ msgstr "Power Manga"
+
+#~ msgid "Shoot them up with 3d graphics"
+#~ msgstr "Jogo de tiro com gráficos 3D"
+
+#~ msgid "Install OKI 4w or compatible"
+#~ msgstr "Instalar OKI 4w ou compatível"
+
+#~ msgid "Install OKI 4w or compatible (these printers need an extra daemon!)"
+#~ msgstr ""
+#~ "Instalar OKI 4w ou compatível (estas impressoras precisam de um daemon "
+#~ "extra!)"
+
+#~ msgid "Printer Utility Program"
+#~ msgstr "Programa Utilitário de Impressão"
+
+#~ msgid ""
+#~ "Graphical tool to set default options in many laser printers and "
+#~ "maintenance for inkjets"
+#~ msgstr ""
+#~ "Ferramenta gráfica definir valores padrão em muitas impressoras laser e "
+#~ "manutenção para jactos de tinta"
+
+#~ msgid "Change Cartridge in a Lexmark 5xxx or 7xxx"
+#~ msgstr "Mudar Tinteiro na Lexmark 5xxx ou 7xxx"
+
+#~ msgid ""
+#~ "Tool to get the print head out to change the cartridges and to put it "
+#~ "back afterwards"
+#~ msgstr ""
+#~ "Ferramenta para aceder à cabeça de impressora para mudar os tinteiros e "
+#~ "posteriores"
+
+#~ msgid "Lexmark"
+#~ msgstr "Lexmark"
+
+#~ msgid "Command line tools for Lexmark 5xxx or 7xxx"
+#~ msgstr "Ferramentas da linha de comandos para Lexmark 5xxx ou 7xxx"
+
+#~ msgid "Printer maintenance commands: Change cartridges, clean nozzles, ..."
+#~ msgstr "Comandos de manutenção da impressora: Mudar tinteiros, limpar ...."
+
+#~ msgid "Change Cartridge in a Lexmark 1xxx"
+#~ msgstr "Mudar Tinteiro na Lexmark 1xxxx"
+
+#~ msgid "To get the print head of the printer accessible"
+#~ msgstr "Colocar a cabeça da impressora acessível"
+
+#~ msgid "Park Cartridge in a Lexmark 1xxx"
+#~ msgstr "Colocar Tinteiro na Lexmark 1xxx"
+
+#~ msgid ""
+#~ "To put the print head back into the corner after changing the cartridges"
+#~ msgstr "Colocar a cabeça de impressão no canto depois de mudar os tinteiros"
+
+#~ msgid "Display printer test page (for colour adjustment)"
+#~ msgstr "Mostrar página de teste (para ajustar a cor)"
+
+#~ msgid "Mtink - Epson inkjet printer maintenance and ink level monitor"
+#~ msgstr ""
+#~ "Mtink - Manutenção/Monitorização do nível de tinta nas impressoras a "
+#~ "jacto de tinta Epson"
+
+#~ msgid ""
+#~ "Epson inkjet printer maintenance (Head cleaning and alignment, ink level "
+#~ "display, cartridge change, ...)"
+#~ msgstr ""
+#~ "Manutenção de impressoras a jacto de tinta Epson (Limpeza da cabeças "
+#~ "ealinhamento, nível da tinta, trocar tinteiro, ...)"
+
+#~ msgid "Head alignment and nozzle cleaning pages for Z22, Z32, or Z52"
+#~ msgstr "Alinhamento de cabeças e páginas de limpeza para Z22, Z32, ou Z52"
+
+#~ msgid "This program needs Lexmark's printer drivers."
+#~ msgstr "Este programa necessita dos drivers da impressora Lexmark"
+
+#~ msgid "Adjust margins and offsets of printed pages"
+#~ msgstr "Ajustar margens e avanços das páginas imprimidas"
+
+#~ msgid ""
+#~ "Adjust the position and the margins of the printed contents on the paper"
+#~ msgstr "Ajustar a posição e as margens dos conteudos imprimidos no papel"
+
+#~ msgid "Calibrate colour printer (Gimp-Print CUPS drivers)"
+#~ msgstr "Calibrar impressora a cores (Gimp-Print CUPS drivers)"
+
+#~ msgid ""
+#~ "Calibrate colour printer (Gimp-Print CUPS drivers, 'CUPS + GIMP-print')"
+#~ msgstr ""
+#~ "Calibrar impressora a cores (Gimp-Print CUPS drivers, 'CUPS + GIMP-print')"
+
+#~ msgid "Maintenance tool for Lexmark Z42, Z43, and Z52"
+#~ msgstr "Ferramenta de Controlo para Lexmark Z42, Z43, e Z52"
+
+#~ msgid "Head alignment, nozzle cleaning, ... for Lexmark Z42, Z43, and Z52"
+#~ msgstr "Alinhamento de cabeças, limpeza, ... para Lexmark Z42, Z43, e Z52"
+
+#~ msgid "PySOL"
+#~ msgstr "PySOL"
+
+#~ msgid "All solitaire cards games"
+#~ msgstr "Todos os jogos de cartas solitária"
+
+#~ msgid "A professional CAD system"
+#~ msgstr "Um sistema CAD profissional"
+
+#~ msgid "Quadra"
+#~ msgstr "Quadra"
+
+#~ msgid "Multiplayer puzzle game"
+#~ msgstr "Um jogo de puzzle multi-jogador"
+
+#~ msgid "Quanta Plus"
+#~ msgstr "Quanta Plus"
+
+#~ msgid "Web Development Environment"
+#~ msgstr "Ambiente de Programação Web"
+
+#~ msgid "KXsldbg"
+#~ msgstr "KXsldbg"
+
+#~ msgid "Kommander Editor"
+#~ msgstr "Editor Kommander"
+
+#~ msgid "Dynamic Dialog Editor"
+#~ msgstr "Editor de Diálogos Dinâmicos"
+
+#~ msgid "Kommander Executor"
+#~ msgstr "Executor Kommander"
+
+#~ msgid "Executor for Kommander dialogs"
+#~ msgstr "Executor para diálogos Kommander"
+
+#~ msgid "R"
+#~ msgstr "R"
+
+#~ msgid "R - a language for statistical computing"
+#~ msgstr "R - uma linguagem para computação estatística"
+
+#~ msgid "Virtual Network Connection"
+#~ msgstr "Conexão Virtual à Rede"
+
+#~ msgid "A remote frame buffer tool"
+#~ msgstr "Uma ferramenta frame buffer remota"
+
+#~ msgid "Rhythmbox"
+#~ msgstr "Rhythmbox"
+
+#~ msgid "Music Management Application"
+#~ msgstr "Aplicação de Manutenção de Música"
+
+#~ msgid "RME Digicontrol"
+#~ msgstr "RME Digicontrol"
+
+#~ msgid "Control panel for RME Hammerfall"
+#~ msgstr "Painel de controlo para RME Hammerfall"
+
+#~ msgid "Rocks n Diamonds"
+#~ msgstr "Rocks n Diamonds"
+
+#~ msgid "A boulderdash like game"
+#~ msgstr "Um jogo tipo boulderdash"
+
+#~ msgid "Rosegarden"
+#~ msgstr "Rosegarden"
+
+#~ msgid "MIDI and Audio Sequencer and Editor"
+#~ msgstr "Editor e Sequenciador de MIDI e Áudio"
+
+#~ msgid "Browse Available Software"
+#~ msgstr "Procurar Software Disponivel"
+
+#~ msgid ""
+#~ "A graphical front end for browsing available packages for installation "
+#~ "(no root password needed)"
+#~ msgstr ""
+#~ "Um interface gráfico para procurar pacotes disponiveis para instalar (não "
+#~ "e necessário senha root)"
+
+#~ msgid "Install Software"
+#~ msgstr "Instalar Software"
+
+#~ msgid "A graphical front end for installing packages"
+#~ msgstr "Um interface gráfico para instalar pacotes"
+
+#~ msgid "Remove Software"
+#~ msgstr "Remover Software"
+
+#~ msgid "A graphical front end for removing packages"
+#~ msgstr "Um interface gráfico para remover pacotes"
+
+#~ msgid "Mandrakelinux Update"
+#~ msgstr "Actualizações Mandrakelinux"
+
+#~ msgid "Mandrake Update"
+#~ msgstr "Actualizações Mandrake"
+
+#~ msgid "A graphical front end for software updates"
+#~ msgstr "Um interface gráfico para actualizar software"
+
+#~ msgid "Software Media Manager"
+#~ msgstr "Gestor de Média do Software"
+
+#~ msgid ""
+#~ "A graphical front end to add/remove/edit media for installing packages"
+#~ msgstr ""
+#~ "Um interface gráfico para adicionar/remover/editar as médias para "
+#~ "instalar os pacotes"
+
+#~ msgid "Medium installer"
+#~ msgstr "Instalador de Médias"
+
+#~ msgid "A graphical front end for adding media"
+#~ msgstr "Um interface gráfico para adicionar médias"
+
+#~ msgid "Frontend for rp-pppoe"
+#~ msgstr "Interface para rp-pppoe"
+
+#~ msgid "Beginners Guide to Linux"
+#~ msgstr "Guia Linux para Aprendizes"
+
+#~ msgid "Rute Users Tutorial and Exposition"
+#~ msgstr "Rute - Tutorial e Apresentação para os Utilizadores"
+
+#~ msgid "RXvt"
+#~ msgstr "RXvt"
+
+#~ msgid ""
+#~ "A version of the rxvt terminal with support for Traditional Chinese, "
+#~ "Simplified Chinese, Japanese and Korean."
+#~ msgstr ""
+#~ "Uma versão do terminal rxvt com suporte para Chinês Tradicional, Chinês "
+#~ "Simplificado, Japonês e Coreano."
+
+#~ msgid "CRXvt (Big5)"
+#~ msgstr "CRXvt (Big5)"
+
+#~ msgid "Traditional Chinese rxvt terminal"
+#~ msgstr "Terminal rxvt em Chinês Tradicional"
+
+#~ msgid "GBRXvt (GB2312)"
+#~ msgstr "GBRXvt (GB2312)"
+
+#~ msgid "Simplified Chinese rxvt terminal"
+#~ msgstr "Terminal rxvt em Chinês Simplificado"
+
+#~ msgid "JRXvt (JIS)"
+#~ msgstr "JRXvt (JIS)"
+
+#~ msgid "Japanese rxvt terminal"
+#~ msgstr "Terminal rxvt japonês"
+
+#~ msgid "KRXvt (KSC5601)"
+#~ msgstr "KRXvt (KSC5601)"
+
+#~ msgid "Korean rxvt terminal"
+#~ msgstr "Terminal rxvt coreano"
+
+#~ msgid "Samba Configuration (SWAT)"
+#~ msgstr "Configuração Samba (SWAT)"
+
+#~ msgid "The Swat Samba Administration Tool"
+#~ msgstr "A Ferramenta para Admnistração Swat Samba"
+
+#~ msgid "Screem"
+#~ msgstr "Screem"
+
+#~ msgid "Website creation environment"
+#~ msgstr "Ambiente para de Websites"
+
+#~ msgid "Scribus"
+#~ msgstr "Scribus"
+
+#~ msgid "Scribus layout program"
+#~ msgstr "Programa de disposição (PAO) Scribus"
+
+#~ msgid "Skencil"
+#~ msgstr "Skencil"
+
+#~ msgid "Vector-based drawing program"
+#~ msgstr "Programa de desenho tipo Vectores"
+
+#~ msgid "Kobo Deluxe"
+#~ msgstr "Kobo Deluxe"
+
+#~ msgid "Arcade video game"
+#~ msgstr "Jogo vídeo arcada"
+
+#~ msgid "Slrn"
+#~ msgstr "Slrn"
+
+#~ msgid "A powerful, easy to use, threaded Internet news reader"
+#~ msgstr "Um poderoso, de fácil uso, leitor de foruns da internet"
+
+#~ msgid "Smb4K"
+#~ msgstr "Smb4K"
+
+#~ msgid "The SMB Share Browser"
+#~ msgstr "O Browser de Partilhas SMB"
+
+#~ msgid "Gtv Mpeg player"
+#~ msgstr "Leitor Mpeg Gtv"
+
+#~ msgid "Gtv Mpeg video player"
+#~ msgstr "Leitor de vídeos Mpeg Gtv"
+
+#~ msgid "Sound Juicer CD Ripper"
+#~ msgstr "Ripper de CDs Sound Juicer"
+
+#~ msgid "Rip music from your CDs"
+#~ msgstr "Extrai(ripa) música dos seus CDs"
+
+#~ msgid "Spruce"
+#~ msgstr "Spruce"
+
+#~ msgid "Another email client"
+#~ msgstr "Outro cliente de correio eletrônico"
+
+#~ msgid "Stardict"
+#~ msgstr "Stardict"
+
+#~ msgid "GUI international dictionary"
+#~ msgstr "GUI dicionário internacional"
+
+#~ msgid "SuperTux"
+#~ msgstr "SuperTux"
+
+#~ msgid "Sup*r Mar*o clone"
+#~ msgstr "Clone Sup*r Mar*o"
+
+#~ msgid "Terminal Server Administration"
+#~ msgstr "Administração do Servidor de Terminais"
+
+#~ msgid "Setup/Administer Terminal Server and clients."
+#~ msgstr "Configurar/Administrar o Servidor de Terminais e Clientes."
+
+#~ msgid "XDvi"
+#~ msgstr "XDvi"
+
+#~ msgid "DVI files viewer"
+#~ msgstr "Visualizador de Ficheiros DVI"
+
+#~ msgid "TightVNC"
+#~ msgstr "TightVNC"
+
+#~ msgid "Control a pc from anywhere"
+#~ msgstr "Controla um pc de qualquer lado"
+
+#~ msgid "Timeconfig"
+#~ msgstr "Timeconfig"
+
+#~ msgid "Configure Time parameters"
+#~ msgstr "Configurar parâmetros da Hora"
+
+#~ msgid "TiMidity++"
+#~ msgstr "TiMidity++"
+
+#~ msgid "MIDI file player"
+#~ msgstr "Leitor de Ficheiros MIDI"
+
+#~ msgid "TkCVS"
+#~ msgstr "TkCVS"
+
+#~ msgid "Graphical HMI for CVS"
+#~ msgstr "HMI Gráfico para CVS"
+
+#~ msgid "TkDiff"
+#~ msgstr "TkDiff"
+
+#~ msgid "Graphical HMI for diff"
+#~ msgstr "HMI gráfico para diff"
+
+#~ msgid "IDLE"
+#~ msgstr "IDLE"
+
+#~ msgid "IDE for Python"
+#~ msgstr "IDE para Python"
+
+#~ msgid "Tower Toppler"
+#~ msgstr "Tower Toppler"
+
+#~ msgid "Reimplementation of the old game known as Tower Toppler or Nebulous"
+#~ msgstr ""
+#~ "Reimplementação do antigo jogo conhecido como Tower Toppler ou Nebulous"
+
+#~ msgid "Totem Movie Player"
+#~ msgstr "Leitor de Filmes Totem"
+
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduz filmes e músicas"
+
+#~ msgid "Totem Media Player"
+#~ msgstr "Leitor de Média Totem"
+
+#~ msgid "Trophy"
+#~ msgstr "Trophy"
+
+#~ msgid "Trophy is a 2D car racing action game for Linux."
+#~ msgstr "Trophy é uma corrida de carros em 2D para Linux."
+
+#~ msgid "Tuxracer"
+#~ msgstr "TuxRacer"
+
+#~ msgid "A great racing game starring Tux"
+#~ msgstr "Um bom jogo de corrida com o Tux"
+
+#~ msgid "TVtime"
+#~ msgstr "TVtime"
+
+#~ msgid "High quality television application"
+#~ msgstr "Aplicação de grande qualidade de televisão"
+
+#~ msgid "GODBCConfig"
+#~ msgstr "GODBCConfig"
+
+#~ msgid "GODBCConfig (root user)"
+#~ msgstr "GODBCConfig (utilizador root)"
+
+#~ msgid "ODBCConfig"
+#~ msgstr "ODBCConfig"
+
+#~ msgid "ODBCConfig (root user)"
+#~ msgstr "ODBCConfig (utilizador root)"
+
+#~ msgid "DataManager"
+#~ msgstr "Gestor de Dados"
+
+#~ msgid "ODBCtest"
+#~ msgstr "ODBCtest"
+
+#~ msgid "UsbView"
+#~ msgstr "UsbView"
+
+#~ msgid "USB viewer"
+#~ msgstr "Visualizador USB"
+
+#~ msgid "User Administration"
+#~ msgstr "Administração de Utilizadores"
+
+#~ msgid "Add or remove users and groups"
+#~ msgstr "Adicionar ou remover utilizadores e grupos"
+
+#~ msgid "A frontend to change user password"
+#~ msgstr "Um interface para mudar a senha do utilizador"
+
+#~ msgid "VI editor"
+#~ msgstr "Editor VI"
+
+#~ msgid "All-purpose text editor"
+#~ msgstr "Editor de texto genérico"
+
+#~ msgid "Walk500"
+#~ msgstr "Walk500"
+
+#~ msgid "An interface for Rio 500"
+#~ msgstr "Um interface para o Rio 500"
+
+#~ msgid "Window Maker"
+#~ msgstr "Window Maker"
+
+#~ msgid "Desktops"
+#~ msgstr "Ambientes de Trabalho"
+
+#~ msgid "Hide Others"
+#~ msgstr "Esconder Outros"
+
+#~ msgid "Workspace"
+#~ msgstr "Área de Trabalho"
+
+#~ msgid "Show All"
+#~ msgstr "Mostrar Todos"
+
+#~ msgid "Arrange Icons"
+#~ msgstr "Arranjar Ícones"
+
+#~ msgid "Lock"
+#~ msgstr "Bloquear"
+
+#~ msgid "Save Session"
+#~ msgstr "Guardar Sessão"
+
+#~ msgid "Clear Session"
+#~ msgstr "Limpar Sessão"
+
+#~ msgid "Themes"
+#~ msgstr "Temas"
+
+#~ msgid "Black"
+#~ msgstr "Preto"
+
+#~ msgid "Solid"
+#~ msgstr "Sólido"
+
+#~ msgid "Blue"
+#~ msgstr "Azul"
+
+#~ msgid "Indigo"
+#~ msgstr "Indigo"
+
+#~ msgid "Bleumarine"
+#~ msgstr "Azul-marinho"
+
+#~ msgid "Purple"
+#~ msgstr "Purpura"
+
+#~ msgid "Wheat"
+#~ msgstr "Trigo"
+
+#~ msgid "Dark Gray"
+#~ msgstr "Cinzento Escuro"
+
+#~ msgid "Red Wine"
+#~ msgstr "Vinho Tinto"
+
+#~ msgid "Sunset"
+#~ msgstr "Pôr-do-Sol"
+
+#~ msgid "Gradient"
+#~ msgstr "Gradiente"
+
+#~ msgid "Sky"
+#~ msgstr "Céu"
+
+#~ msgid "Blue Shades"
+#~ msgstr "Sombras Azuis"
+
+#~ msgid "Indigo Shades"
+#~ msgstr "Sombras Indigo"
+
+#~ msgid "Purple Shades"
+#~ msgstr "Sombras Purpura"
+
+#~ msgid "Wheat Shades"
+#~ msgstr "Sombras Trigo"
+
+#~ msgid "Grey Shades"
+#~ msgstr "Sombras Cinzentas"
+
+#~ msgid "Wine Shades"
+#~ msgstr "Sombras Vinho"
+
+#~ msgid "Scaled"
+#~ msgstr "Escalado"
+
+#~ msgid "Images"
+#~ msgstr "Imagens"
+
+#~ msgid "Tiled"
+#~ msgstr "Lado-a-Lado"
+
+#~ msgid "Save Theme"
+#~ msgstr "Guardar Tema"
+
+#~ msgid "Save IconSet"
+#~ msgstr "Guardar Definições de Ícones"
+
+#~ msgid "Preferences Utility"
+#~ msgstr "Utilitário de Preferências"
+
+#~ msgid "Info Panel"
+#~ msgstr "Painel Info"
+
+#~ msgid "Legal"
+#~ msgstr "Legal"
+
+#~ msgid "Copy"
+#~ msgstr "Cópia"
+
+#~ msgid "Selection"
+#~ msgstr "Selecção"
+
+#~ msgid "Search in manual"
+#~ msgstr "Procurar em Manual"
+
+#~ msgid "Wine"
+#~ msgstr "Wine"
+
+#~ msgid "Notepad"
+#~ msgstr "Notepad"
+
+#~ msgid "Progman"
+#~ msgstr "Progman"
+
+#~ msgid "Filemanager"
+#~ msgstr "Gestor de Ficheiros"
+
+#~ msgid "Configurator"
+#~ msgstr "Configurador"
+
+#~ msgid "Registry Editor"
+#~ msgstr "Editor de Registos"
+
+#~ msgid "Minesweeper"
+#~ msgstr "Campo Minado"
+
+#~ msgid "WMnet"
+#~ msgstr "WMnet"
+
+#~ msgid "A little X doc.app network monitor"
+#~ msgstr "Um pequeno monitor de rede X doc.app"
+
+#~ msgid "Calculator"
+#~ msgstr "Calculadora"
+
+#~ msgid "Scientific calculator for X"
+#~ msgstr "Calculadora Cientifica para X"
+
+#~ msgid "XDitview"
+#~ msgstr "XDitview"
+
+#~ msgid "Ditroff previewer"
+#~ msgstr "Pré-visualizador Ditroff"
+
+#~ msgid "XEdit"
+#~ msgstr "XEdit"
+
+#~ msgid "Small editor"
+#~ msgstr "Pequeno editor"
+
+#~ msgid "XEyes"
+#~ msgstr "XEyes"
+
+#~ msgid "Watchful Eyes"
+#~ msgstr "Olhos Vigilantes"
+
+#~ msgid "ICO"
+#~ msgstr "ICO"
+
+#~ msgid "Animate an icosahedron or other polyhedron"
+#~ msgstr "Animar um icosahedron ou outro polyhedron"
+
+#~ msgid "Font Selector"
+#~ msgstr "Selector de Tipo de Letra"
+
+#~ msgid "Select X Fonts"
+#~ msgstr "Seleccionar Tipos de Letra X"
+
+#~ msgid "XLoad"
+#~ msgstr "XLoad"
+
+#~ msgid "Display system load"
+#~ msgstr "Exibir a carga do sistema"
+
+#~ msgid "XawTV"
+#~ msgstr "XawTV"
+
+#~ msgid "The X11 Video4Linux Stream Capture Viewer"
+#~ msgstr "Visualizador para o sistema de captura de vídeo X11 Video4Linux"
+
+#~ msgid "XBoard"
+#~ msgstr "XBoard"
+
+#~ msgid "GUI chessboard game"
+#~ msgstr "GUI de jogo de xadrez"
+
+#~ msgid "X-CD-Roast"
+#~ msgstr "X-CD-Roast"
+
+#~ msgid "Xchat"
+#~ msgstr "Xchat"
+
+#~ msgid "Graphical IRC client"
+#~ msgstr "Cliente IRC Gráfico"
+
+#~ msgid "Xcpustate"
+#~ msgstr "Xcpustate"
+
+#~ msgid "Cpu load indicator"
+#~ msgstr "Indicador da carga do processador"
+
+#~ msgid "Xdaliclock"
+#~ msgstr "Xdaliclock"
+
+#~ msgid "A clock for the X Window System"
+#~ msgstr "Um relógio para o sistema X Window"
+
+#~ msgid "Xearth"
+#~ msgstr "Xearth"
+
+#~ msgid "Display the Earth on your desktop"
+#~ msgstr "Exibe a Terra no ecrã"
+
+#~ msgid "XEmacs"
+#~ msgstr "XEmacs"
+
+#~ msgid "The XEmacs editor"
+#~ msgstr "O editor XEmacs"
+
+#~ msgid "XFig"
+#~ msgstr "XFig"
+
+#~ msgid "Vector Graphics Drawing Tool"
+#~ msgstr "Ferramenta de Desenho Gráficos de Vectores"
+
+#~ msgid "Xine"
+#~ msgstr "Xine"
+
+#~ msgid "Xine Video Player"
+#~ msgstr "Leitor de Vídeo Xine"
+
+#~ msgid "Xmailbox"
+#~ msgstr "Xmailbox"
+
+#~ msgid "Mail notifier"
+#~ msgstr "Notificador de correio electrônico"
+
+#~ msgid "XMovie"
+#~ msgstr "XMovie"
+
+#~ msgid "Video player"
+#~ msgstr "Leitor de Vídeo"
+
+#~ msgid "X Office Jet Panel"
+#~ msgstr "Painel Jet X Office"
+
+#~ msgid ""
+#~ "Displays the contents of the front panel LCD screen of your HP Office Jet "
+#~ "in a window on your desktop"
+#~ msgstr ""
+#~ "Exibe o conteúdo do painel frontal do ecrã LCD do seu HP Office Jet numa "
+#~ "janela no seu ambiente de trabalho"
+
+#~ msgid "Bitmap"
+#~ msgstr "Bitmap"
+
+#~ msgid "Bitmap: editor for X bitmap files"
+#~ msgstr "Bitmap: editor para ficheiros bitmap X"
+
+#~ msgid "Editres"
+#~ msgstr "Editres"
+
+#~ msgid "Editres: resource editor for X Toolkit applications"
+#~ msgstr "Editres: editor de recursos para aplicações X Toolkit"
+
+#~ msgid "Xclipboard"
+#~ msgstr "Xclipboard"
+
+#~ msgid "Xclipboard: clipboard for text cut and paste operations in X"
+#~ msgstr ""
+#~ "Xclipboard: área de transferência para as operações cortar e colar em X"
+
+#~ msgid "Xclock (analog)"
+#~ msgstr "Xclock (análogo)"
+
+#~ msgid "Xclock (analog): analog clock for X"
+#~ msgstr "Xclock (análogo): relógio analógico para X"
+
+#~ msgid "Xclock (digital)"
+#~ msgstr "Xclock (digital)"
+
+#~ msgid "Xclock (digital): digital clock for X"
+#~ msgstr "Xclock (digital): relógio digital para X"
+
+#~ msgid "Xconsole"
+#~ msgstr "Xconsole"
+
+#~ msgid "Xconsole: monitor system console messages with X"
+#~ msgstr "Xconsole: monitor do sistema de mensagens da consola com X"
+
+#~ msgid "Xcutsel"
+#~ msgstr "Xcutsel"
+
+#~ msgid "Xcutsel: interchange between cut buffer and selection in X"
+#~ msgstr "Xcutsel: Intercâmbio entre a área de corte e selecção em X"
+
+#~ msgid "Xmag"
+#~ msgstr "Xmag"
+
+#~ msgid "Xmag: magnify parts of the X screen"
+#~ msgstr "Xmag: amplie partes do ecrã do X"
+
+#~ msgid "Xkill"
+#~ msgstr "Xkill"
+
+#~ msgid "Xkill: kill X clients"
+#~ msgstr "Xkill: mata/kill clientes X"
+
+#~ msgid "Xlogo"
+#~ msgstr "Xlogo"
+
+#~ msgid "Xlogo: display X logo"
+#~ msgstr "Xlogo: exibir o logotipo do X"
+
+#~ msgid "Xrefresh"
+#~ msgstr "Xrefresh"
+
+#~ msgid "Xrefresh: redraw X screen"
+#~ msgstr "Xrefresh: refrescar o ecrã X"
+
+#~ msgid "X Window Snapshot"
+#~ msgstr "X Window Snapshot"
+
+#~ msgid "X Window Snapshot: take snapshot of any X window (xwd|xwud)"
+#~ msgstr ""
+#~ "X Window Snapshot: captura (fotografa) qualquer janela do X (xwd|xwud)"
+
+#~ msgid "Twm"
+#~ msgstr "Twm"
+
+#~ msgid "Twm: Tab Window Manager"
+#~ msgstr "Twm: Gestor de Janelas Tab "
+
+#~ msgid "XPat 2"
+#~ msgstr "XPat 2"
+
+#~ msgid "Solitaire game"
+#~ msgstr "Jogo Solitária"
+
+#~ msgid "Xpdf"
+#~ msgstr "Xpdf"
+
+#~ msgid "Views PDF files"
+#~ msgstr "Visualiza ficheiros PDF"
+
+#~ msgid "XPP - X Printing Panel"
+#~ msgstr "XPP- Painel de Impressao X"
+
+#~ msgid "Frontend for easy printing with CUPS"
+#~ msgstr "Interface para fácil impressão com CUPS"
+
+#~ msgid "XSane"
+#~ msgstr "XSane"
+
+#~ msgid "Xsane is a frontend for the scanner program sane"
+#~ msgstr "Xsane é um interface para o programa de digitalização sane"
+
+#~ msgid "Screensaver"
+#~ msgstr "Protecção de Ecrã"
+
+#~ msgid "Configure the settings of the screensaver"
+#~ msgstr "Configurar as definições da protecção de ecrã"
+
+#~ msgid "Xsysinfo"
+#~ msgstr "Xsysinfo"
+
+#~ msgid "System information"
+#~ msgstr "Informações do Sistema"
+
+#~ msgid "XTerm"
+#~ msgstr "XTerm"
+
+#~ msgid "The standard terminal emulator for the X Window System"
+#~ msgstr "O terminal standard para o sistema de janelas X"
+
+#~ msgid "Graphical OpenGL traceroute"
+#~ msgstr "Traceroute Gráfico OpenGL"
+
+#~ msgid "Xwpick"
+#~ msgstr "Xwpick"
+
+#~ msgid "X Window System screenshot grabber"
+#~ msgstr "Instantâneo(foto) do sistema de janelas X"
+
+#~ msgid "xxgdb"
+#~ msgstr "xxgdb"
+
+#~ msgid "An X Window System graphical interface for the GNU gdb debugger"
+#~ msgstr "Um interface gráfico para o GNU debugger gdb no Sistema X Window"
+
+#~ msgid "Get help with GNOME"
+#~ msgstr "Obter ajuda com o GNOME"
+
+#~ msgid "Yudit"
+#~ msgstr "Yudit"
+
+#~ msgid "Unicode i18n Editor"
+#~ msgstr "Editor i18n Unicode"
+
+#~ msgid "A TV viewer for gnome"
+#~ msgstr "Um visualizador de TV para o Gnome"
+
+#~ msgid "3d-Desktop"
+#~ msgstr "Ambiente de Trabalho 3D"
+
+#~ msgid "OpenGL virtual desktop switcher"
+#~ msgstr "Alternador de Desktops Virtual OpenGL"
+
+#~ msgid "Connect-four for pygame."
+#~ msgstr "Conectar-quatro para o pygame"
+
+#~ msgid "Abe's Amazing Adventure!!"
+#~ msgstr "A Incrivel Aventura do Abe!!"
+
+#~ msgid "AbiWord"
+#~ msgstr "AbiWord"
+
+#~ msgid "RTF and Microsoft Word (up to 97) document editor"
+#~ msgstr "Editor de documentos RTF e Microsoft Word (até 97)"
+
+#~ msgid "Abuse"
+#~ msgstr "Abuse"
+
+#~ msgid "The classic Crack-Dot-Com game"
+#~ msgstr "O jogo clássico Crack-Dot-Com"
+
+#~ msgid "AcidRip"
+#~ msgstr "AcidRip"
+
+#~ msgid "Video ripping and conversion"
+#~ msgstr "Cópia e conversão de vídeos"
+
+#~ msgid "Multimedia Keys"
+#~ msgstr "Teclas Multimédia"
+
+#~ msgid "Configure multimedia keys behaviour"
+#~ msgstr "Configure o comportamento das teclas multimédia"
+
+#~ msgid "AconnectGUI"
+#~ msgstr "AconnectGUI"
+
+#~ msgid "ALSA connection GUI"
+#~ msgstr "GUI conexão ALSA"
+
+#~ msgid "Adonthell - Waste's Edge"
+#~ msgstr "Adonthell - Waste's Edge"
+
+#~ msgid "Official game package for Adonthell"
+#~ msgstr "Pacote do Jogo Oficial para Adonthell"
+
+#~ msgid "AfterStep"
+#~ msgstr "AfterStep"
+
+#~ msgid "AfterStep Window Manager"
+#~ msgstr "Gestor de Janelas AfterStep"
+
+#~ msgid "Airfart"
+#~ msgstr "Airfart"
+
+#~ msgid "Discovers wireless networks"
+#~ msgstr "Descobre redes sem fio"
+
+#~ msgid "AirStrike"
+#~ msgstr "AirStrike"
+
+#~ msgid "Incredibly addictive 2D dogfight game"
+#~ msgstr "Jogo 2D de ataque"
+
+#~ msgid "Akpi"
+#~ msgstr "Akpi"
+
+#~ msgid "A small application to monitor your battery with the ACPI"
+#~ msgstr "Uma pequena aplicação para monitorizar a sua bateria com o ACPI"
+
+#~ msgid "aKregator"
+#~ msgstr "aKregator"
+
+#~ msgid "A KDE RSS Aggregator"
+#~ msgstr "Um agregador RSS para o KDE"
+
+#~ msgid "First person shooter game"
+#~ msgstr "Jogo de tiro"
+
+#~ msgid "Alert Applet"
+#~ msgstr "Applet de Alerta"
+
+#~ msgid "System Tray Alert Applet"
+#~ msgstr "Applet de Alerta do System Tray"
+
+#~ msgid "Alevt"
+#~ msgstr "Alevt"
+
+#~ msgid "Teletext/Videotext decoder and browser"
+#~ msgstr "Descodificador e browser de Teletexto/Videotexto"
+
+#~ msgid "Alexandria"
+#~ msgstr "Alexandria"
+
+#~ msgid "GNOME library manager"
+#~ msgstr "Gestor de bibliotecas GNOME"
+
+#~ msgid " 2D arcade shooter game"
+#~ msgstr " Jogo arcada de tiro 2D"
+
+#~ msgid "Alien Pool"
+#~ msgstr "Alien Pool"
+
+#~ msgid "Arcade-style mix of asteroids and pool"
+#~ msgstr "Mistura estilo arcada de asteróides e pool"
+
+#~ msgid "Alleyoop memory checker"
+#~ msgstr "Alleyoop verificador de memória"
+
+#~ msgid "Graphical frontend to Valgrind memory checker"
+#~ msgstr "Um interface gráfico para o verificador de memória Valgrind"
+
+#~ msgid "ALSA-patch-bay"
+#~ msgstr "ALSA-patch-bay"
+
+#~ msgid "ALSA sequencer connections"
+#~ msgstr "Conexões do sequenciador ALSA"
+
+#~ msgid "JACK-patch-bay"
+#~ msgstr "JACK-patch-bay"
+
+#~ msgid "JACK audio daemon connections"
+#~ msgstr "Daemon de ligações áudio JACK"
+
+#~ msgid "The Alsa Player"
+#~ msgstr "O Leitor Alsa"
+
+#~ msgid "Amaya"
+#~ msgstr "Amaya"
+
+#~ msgid "W3C's browser/web authoring tool"
+#~ msgstr "Browser/Editor Web do W3C"
+
+#~ msgid "Amphetamine"
+#~ msgstr "Amphetamine"
+
+#~ msgid "Amphetamine is a cool Jump'n Run game"
+#~ msgstr "Amphetamine é um bom jogo de Saltar e Correr"
+
+#~ msgid "Alsa Modular Synth"
+#~ msgstr "Sintetizador Modular Alsa"
+
+#~ msgid "Modular Synthesizer for ALSA"
+#~ msgstr "Sintetizador Modular para Alsa"
+
+#~ msgid "aMSN"
+#~ msgstr "aMSN"
+
+#~ msgid "AMSynth"
+#~ msgstr "AMSynth"
+
+#~ msgid "A GTK software synthesizer"
+#~ msgstr "Um sintetizador de software GTK"
+
+#~ msgid "Angel Wars"
+#~ msgstr "Angel Wars"
+
+#~ msgid "Fast-paced, old-fashioned side-scrolling space shooter"
+#~ msgstr "Jogo de tiro no espaço à maneira antiga"
+
+#~ msgid "Anjuta IDE"
+#~ msgstr "Anjuta IDE"
+
+#~ msgid "Anjuta Integrated Development Environment for C/C++"
+#~ msgstr "Anjuta Ambiente de Programação Integrado para C/C++"
+
+#~ msgid "ANT-phone"
+#~ msgstr "ANT-phone"
+
+#~ msgid "ISDN Telephone"
+#~ msgstr "Telefone ISDN"
+
+#~ msgid "Wireless network GUI"
+#~ msgstr "GUI para Redes sem fio (wireless)"
+
+#~ msgid "Ardour"
+#~ msgstr "Ardour"
+
+#~ msgid "Digital Audio Workstation"
+#~ msgstr "Área de Trabalho de Áudio Digital"
+
+#~ msgid "Asteroids Arena"
+#~ msgstr "Asteróides Arena"
+
+#~ msgid "An OpenGL Asteroids clone based on ClanLib."
+#~ msgstr "Um clone OpenGL de Asteroids baseado no ClanLib."
+
+#~ msgid "GUI for Genpak"
+#~ msgstr "GUI para Genpak"
+
+#~ msgid "ArkHart"
+#~ msgstr "ArkHart"
+
+#~ msgid "A roleplaying game in an original world called Arkhart"
+#~ msgstr "Um jogo de RPG num mundo original chamado Arkhart"
+
+#~ msgid "Arson"
+#~ msgstr "Arson"
+
+#~ msgid "A CD burner, and Audio CD Ripper"
+#~ msgstr "Um gravador CD, e um Ripper de CD Áudio"
+
+#~ msgid "Advanced Strategic Command"
+#~ msgstr "Commando Estratégico Avançado"
+
+#~ msgid "BLAM!"
+#~ msgstr "BLAM!"
+
+#~ msgid "GNOME RSS aggregator"
+#~ msgstr "Agregador RSS GNOME"
+
+#~ msgid "Asteroids3D"
+#~ msgstr "Asteróides 3D"
+
+#~ msgid "A 3D, first-person game of blowing up asteroids"
+#~ msgstr "Um jogo 3D, jogo de primeira pessoa de estoirar asteróides"
+
+#~ msgid "Atanks"
+#~ msgstr "Atanks"
+
+#~ msgid "A worms clone"
+#~ msgstr "Um clone de worms"
+
+#~ msgid "Atomix"
+#~ msgstr "Atomix"
+
+#~ msgid "Build molecules out of single atoms"
+#~ msgstr "Constrói moléculas a partir de atomos"
+
+#~ msgid "AutoZen"
+#~ msgstr "AutoZen"
+
+#~ msgid "Brainwave controller"
+#~ msgstr "Controlador de ondas cerebrais"
+
+#~ msgid "AviPlay"
+#~ msgstr "Leitor de Avi"
+
+#~ msgid "Video player for AVI/ASF/WMF files"
+#~ msgstr "Leitor de vídeo para os ficheiros AVI/ASF/WMF"
+
+#~ msgid "AviRecompress"
+#~ msgstr "AviRecompressor"
+
+#~ msgid "Simple editor and recompressor for AVI files"
+#~ msgstr "Simples editor e recompressor para ficheiros AVI"
+
+#~ msgid "AviCap"
+#~ msgstr "Captura AVI"
+
+#~ msgid "Video grabber for AVI files"
+#~ msgstr "Capturar vídeo para ficheiros AVI"
+
+#~ msgid "AVview"
+#~ msgstr "AVver"
+
+#~ msgid "ATI audio/video viewer"
+#~ msgstr "Visualizador áudio/video ATI"
+
+#~ msgid "Universal Instant Messaging Client"
+#~ msgstr "Cliente Universal de Mensagens Instantâneas"
+
+#~ msgid "Bacula Console (gnome)"
+#~ msgstr "Consola Bacula (gnome)"
+
+#~ msgid "Bacula Director Console"
+#~ msgstr "Consola Bacula Director"
+
+#~ msgid "Bacula Console (wxWindows)"
+#~ msgstr "Consola Bacula (wxWindows)"
+
+#~ msgid "BandSaw"
+#~ msgstr "BandSaw"
+
+#~ msgid "Band Saw monitor large numbers of computers by monitoring syslog"
+#~ msgstr ""
+#~ "O Band Saw monitoriza um elevado número de computadores ao monitorizar o "
+#~ "syslog"
+
+#~ msgid "Barrage"
+#~ msgstr "Barrage"
+
+#~ msgid "A rather violent action game"
+#~ msgstr "Um jogo bastante violento"
+
+#~ msgid "Basilisk II"
+#~ msgstr "Basilisk II"
+
+#~ msgid "A Macintosh Emulator"
+#~ msgstr "Um emulador Macintosh"
+
+#~ msgid "Energy Saving"
+#~ msgstr "Poupar Energia"
+
+#~ msgid "Configure energy saving for your system"
+#~ msgstr "Configure a poupança de energia para o seu sistema"
+
+#~ msgid "Bbconf"
+#~ msgstr "Bbconf"
+
+#~ msgid "Bbconf is a complete GUI config tool for blackbox"
+#~ msgstr ""
+#~ "Bbconf é uma ferramenta completa de configuração gráfica para blackbox"
+
+#~ msgid "Bbkeys"
+#~ msgstr "Bbkeys"
+
+#~ msgid "BB Run"
+#~ msgstr "BB Run"
+
+#~ msgid "BlackBox Run Window"
+#~ msgstr "Janela de Execução BlackBox"
+
+#~ msgid "Beagle Search"
+#~ msgstr "Pesquisa Beagle"
+
+#~ msgid "Search your data"
+#~ msgstr "Procurar nos seus dados"
+
+#~ msgid "File tools"
+#~ msgstr "Ferramentas de Ficheiros"
+
+#~ msgid "Beast"
+#~ msgstr "Beast"
+
+#~ msgid "Composition and Synthesis"
+#~ msgstr "Composição e Síntese"
+
+#~ msgid "Beep Media Player"
+#~ msgstr "Leitor de média Beep"
+
+#~ msgid "Bibletime"
+#~ msgstr "Bibletime"
+
+#~ msgid "An easy to use Bible study tool."
+#~ msgstr "Uma ferramenta fácil de usar para estudar a Bíblia."
+
+#~ msgid "BidWatcher"
+#~ msgstr "BidWatcher"
+
+#~ msgid "Tool for eBay users"
+#~ msgstr "Ferramenta para utilizadores do eBay"
+
+#~ msgid "bigForth"
+#~ msgstr "bigForth"
+
+#~ msgid "bigForth language - Shell"
+#~ msgstr "Linguagem bigForth - Linha de Commandos"
+
+#~ msgid "BitTornado"
+#~ msgstr "BitTornado"
+
+#~ msgid "Download BitTorrent files"
+#~ msgstr "Transfere ficheiros BitTorrent"
+
+#~ msgid "BitTornado Creator"
+#~ msgstr "Criador BitTornado"
+
+#~ msgid "Create BitTorrent metadata files"
+#~ msgstr "Cria ficheiros de metadados BitTorrent"
+
+#~ msgid "2D chemical structure drawing tool"
+#~ msgstr "Ferramenta de desenho de estruturas químicas em 2D"
+
+#~ msgid "BK_Edit"
+#~ msgstr "BK_Edit"
+
+#~ msgid "Bookmarks Editor"
+#~ msgstr "Editor de Favoritos"
+
+#~ msgid "Blender"
+#~ msgstr "Blender"
+
+#~ msgid "A fully functional 3D modeling/rendering/animation package"
+#~ msgstr "Um sistema completo de modelização/produção/animação 3D"
+
+#~ msgid "BlobWars"
+#~ msgstr "BlobWars"
+
+#~ msgid "BlobWars Episode I : Metal Blob Solid"
+#~ msgstr "BlobWars Episódio I : Metal Blob Solid"
+
+#~ msgid "Boa-constructor"
+#~ msgstr "Boa-constructor"
+
+#~ msgid "Python IDE"
+#~ msgstr "IDE Python"
+
+#~ msgid "BoboBot"
+#~ msgstr "BoboBot"
+
+#~ msgid "Mario-like game"
+#~ msgstr "Jogo tipo Mario"
+
+#~ msgid "BomberInstinct"
+#~ msgstr "BomberInstinct"
+
+#~ msgid "Bomberman clone"
+#~ msgstr "Um clone de Bomberman"
+
+#~ msgid "BomberMaze"
+#~ msgstr "BomberMaze"
+
+#~ msgid "Gnome bomberman game"
+#~ msgstr "Jogo Bomberman do Gnome"
+
+#~ msgid "Bookcase"
+#~ msgstr "Bookcase"
+
+#~ msgid "A collection manager"
+#~ msgstr "Um gestor de colecções"
+
+#~ msgid "Bootsplashchooser"
+#~ msgstr "Bootsplashchooser"
+
+#~ msgid "Gui tool for installing a bootsplash theme"
+#~ msgstr "Ferramenta para instalar um tema de arranque"
+
+#~ msgid "Boson"
+#~ msgstr "Boson"
+
+#~ msgid "Real-time strategy game"
+#~ msgstr "Jogo de Estratégia em Tempo Real"
+
+#~ msgid "BoUnit"
+#~ msgstr "BoUnit"
+
+#~ msgid "Unit Editor for Boson"
+#~ msgstr "Editor de Unidades para o Boson"
+
+#~ msgid "BPMDJ"
+#~ msgstr "BPMDJ"
+
+#~ msgid "DJ Software"
+#~ msgstr "Software DJ"
+
+#~ msgid "Music sequencer"
+#~ msgstr "Sequenciador de Musica"
+
+#~ msgid "BubbleMon"
+#~ msgstr "BubbleMon"
+
+#~ msgid "Monitoring-duck-in-a-jar dockapp"
+#~ msgstr "Monitorização-pato-no-jarro dockapp"
+
+#~ msgid "Bugsquish"
+#~ msgstr "Bugsquish"
+
+#~ msgid "Kill bugs with mouse"
+#~ msgstr "Mata(kill) bugs com o rato"
+
+#~ msgid "Burgerspace"
+#~ msgstr "Burgerspace"
+
+#~ msgid "Burgerspace is a Burgertime(TM) clone"
+#~ msgstr "Burgerspace é um clone do Burgertime(TM)"
+
+#~ msgid "Camdump (GPhoto 2)"
+#~ msgstr "Camdump (GPhoto 2)"
+
+#~ msgid "Automatically load photos from digital camera"
+#~ msgstr "Carrega automáticamente fotos da sua màquina digital"
+
+#~ msgid "Camlgrenouille"
+#~ msgstr "Camlgrenouille"
+
+#~ msgid "Broadband connection test program"
+#~ msgstr "Programa para testar a transmissão da rede"
+
+#~ msgid "Camorama"
+#~ msgstr "Camorama"
+
+#~ msgid "A GNOME webcam application"
+#~ msgstr "Uma aplicação webcam GNOME"
+
+#~ msgid "Camstream"
+#~ msgstr "Camstream"
+
+#~ msgid "Webcam tool"
+#~ msgstr "Ferramenta para Webcam"
+
+#~ msgid "CanonUtil"
+#~ msgstr "CanonUtil"
+
+#~ msgid "Maintenance tool for Canon inkjet printers"
+#~ msgstr "Ferramenta de manutenção para impressoras Canon a jacto de tinta"
+
+#~ msgid "A GUI tool to rename and tag mp3 and ogg/vorbis files"
+#~ msgstr "Ferramenta GUI para renomear e marcar ficheiros mp3 e ogg/vorbis"
+
+#~ msgid "CBoard"
+#~ msgstr "CBoard"
+
+#~ msgid "Console frontend of GNUchess"
+#~ msgstr "Consola/Interface do GNUchess"
+
+#~ msgid "cdbakeoven"
+#~ msgstr "cdbakeoven"
+
+#~ msgid "CD Bake Oven"
+#~ msgstr "CD Bake Oven"
+
+#~ msgid "CD-ROM Devices"
+#~ msgstr "Dispositivos CD-ROM"
+
+#~ msgid "Detected and Configured CD-ROM devices"
+#~ msgstr "Dispositivos CD-ROM Detectados e Configurados"
+
+#~ msgid "CDBakeOven"
+#~ msgstr "CDBakeOven"
+
+#~ msgid "Recording Options"
+#~ msgstr "Opções de Gravação"
+
+#~ msgid "CD Bake Oven recording options"
+#~ msgstr "Opções de Gravação do CD Bake Oven"
+
+#~ msgid "CD Bake Oven Information"
+#~ msgstr "Informação CD Bake Oven"
+
+#~ msgid "Audio Copy Settings"
+#~ msgstr "Configurações para Copiar Áudio"
+
+#~ msgid "New CD Settings"
+#~ msgstr "Definições para Novo Cd"
+
+#~ msgid "New CD (ISO Image) Settings"
+#~ msgstr "Definições para Novo CD (Imagem ISO)"
+
+#~ msgid "Customize Defaults"
+#~ msgstr "Personalizar Padrões"
+
+#~ msgid "CD Bake Oven Default Settings"
+#~ msgstr "Configurações Padrão do CD Bake Oven"
+
+#~ msgid "CDloop is an audio CD player with special looping capabilities"
+#~ msgstr "CDloop é um leitor de CD áudio com funções especiais de repetição"
+
+#~ msgid "CDvST"
+#~ msgstr "CDvST"
+
+#~ msgid "Certain Death via Space Things"
+#~ msgstr "Certas Mortes via Coisas do Espaço (Certain Death via Space Things)"
+
+#~ msgid "An astronomy simultor"
+#~ msgstr "Um simulador de astronomia"
+
+#~ msgid "CGoban"
+#~ msgstr "CGoban"
+
+#~ msgid "Graphical game of Go"
+#~ msgstr "Jogo gráfico de Go"
+
+#~ msgid "A program for creating music modules"
+#~ msgstr "Um programa para fazer módulos de música"
+
+#~ msgid "A program for drawing organic molecules"
+#~ msgstr "Um programa para desenhar moléculas orgânicas"
+
+#~ msgid "Cheops-NG"
+#~ msgstr "Cheops-NG"
+
+#~ msgid "Network Browser and Tools (requires running agent)"
+#~ msgstr "Browser e Ferramentas de Rede (requer um agente em funcionamento)"
+
+#~ msgid "Cheops-NG Homepage"
+#~ msgstr "Página de Cheops-NG"
+
+#~ msgid "Websites"
+#~ msgstr "Websites"
+
+#~ msgid "Childsplay"
+#~ msgstr "Childsplay"
+
+#~ msgid "Games for kids"
+#~ msgstr "Jogos para miúdos"
+
+#~ msgid "CinePaint"
+#~ msgstr "CinePaint"
+
+#~ msgid "A tool for manipulating images"
+#~ msgstr "Uma ferramenta para manipular imagens"
+
+#~ msgid "Civil"
+#~ msgstr "Civil"
+
+#~ msgid "Civil scenario editor"
+#~ msgstr "Editor de senário Civil"
+
+#~ msgid "CD burning GUI"
+#~ msgstr "GUI para gravar CDs"
+
+#~ msgid "Cog"
+#~ msgstr "Cog"
+
+#~ msgid "Edit your gnome preferences"
+#~ msgstr "Edita as suas preferências gnome"
+
+#~ msgid "Netscape cleaner"
+#~ msgstr "Limpador do Netscape"
+
+#~ msgid "Thinkpad Settings"
+#~ msgstr "Configurações Thinkpad"
+
+#~ msgid "Thinkpad settings"
+#~ msgstr "Configurações Thinkpad"
+
+#~ msgid "Conglomerate XML Editor"
+#~ msgstr "Editor XML Conglomerado"
+
+#~ msgid "Edit XML files"
+#~ msgstr "Editar ficheiros XML"
+
+#~ msgid "Copter-Commander"
+#~ msgstr "Copter-Commander"
+
+#~ msgid "Copter Commander"
+#~ msgstr "Copter Commander"
+
+#~ msgid "Copter-Commander Glx"
+#~ msgstr "Copter-Commander Glx"
+
+#~ msgid "Copter Commander OpenGL"
+#~ msgstr "Copter Commander OpenGL"
+
+#~ msgid "creox"
+#~ msgstr "creox"
+
+#~ msgid "The Realtime Sound Effector"
+#~ msgstr "O Processador de Sons em Tempo Real"
+
+#~ msgid "Crimson Fields"
+#~ msgstr "Crimson Fields"
+
+#~ msgid "Tactical war game with hexagonal grid"
+#~ msgstr "Jogo de guerra táctica com uma grelha hexagonal"
+
+#~ msgid "Critical Mass"
+#~ msgstr "Critical Mass"
+
+#~ msgid "Arcade Shooter"
+#~ msgstr "Atirador Arcada"
+
+#~ msgid "GTK Crossfire Client"
+#~ msgstr "Cliente Crossfire GTK"
+
+#~ msgid "GTK client of Crossfire, a graphical adventure game"
+#~ msgstr "Cliente GTK do Crossfire, um jogo de aventura gráfico"
+
+#~ msgid "Traditional Crossfire Client"
+#~ msgstr "Cliente Crossfire Tradicional"
+
+#~ msgid "Standard client of Crossfire, a graphical adventure game"
+#~ msgstr "Cliente padrão do Crossfire, um jogo de aventura gráfico"
+
+#~ msgid "Cssed"
+#~ msgstr "Cssed"
+
+#~ msgid "CSS editor for web developers."
+#~ msgstr "Editor CSS para programadores web"
+
+#~ msgid "Cursor Themes"
+#~ msgstr "Temas do Cursor"
+
+#~ msgid "Choose a Cursor Theme"
+#~ msgstr "Escolha um Tema de Cursores"
+
+#~ msgid "Cuyo"
+#~ msgstr "Cuyo"
+
+#~ msgid "A tetris like game"
+#~ msgstr "Um jogo tipo Tetris"
+
+#~ msgid "Downloader for X"
+#~ msgstr "Downloader do X"
+
+#~ msgid "Web Downloader for X"
+#~ msgstr "Downloader do X"
+
+#~ msgid "DAP"
+#~ msgstr "DAP"
+
+#~ msgid "Digital audio processing suite"
+#~ msgstr "Suite de processamento de áudio digital"
+
+#~ msgid "Dasher"
+#~ msgstr "Dasher"
+
+#~ msgid "Predictive text entry system"
+#~ msgstr "Sistema de entrada de texto predictivo"
+
+#~ msgid "Data Display Debugger"
+#~ msgstr "Depurador de Dados"
+
+#~ msgid "Dead-FTP"
+#~ msgstr "Dead-FTP"
+
+#~ msgid "Gnome ftp client"
+#~ msgstr "Cliente ftp Gnome"
+
+#~ msgid "Defendguin"
+#~ msgstr "Defendguin"
+
+#~ msgid "A Defender Clone"
+#~ msgstr "Um clone do Defender"
+
+#~ msgid "Denemo"
+#~ msgstr "Denemo"
+
+#~ msgid "Musical score editor"
+#~ msgstr "Editor de contagem musical"
+
+#~ msgid "DevHelp"
+#~ msgstr "DevHelp"
+
+#~ msgid "Developers Help program"
+#~ msgstr "Programa de Ajuda para Programadores"
+
+#~ msgid "DIE"
+#~ msgstr "DIE"
+
+#~ msgid "3D multiplayer deathmatch style game with cars instead of people"
+#~ msgstr "Jogo multiplayer 3D, estilo deathmatch com carros em vez de pessoas"
+
+#~ msgid "A simple web browser"
+#~ msgstr "Um simples web browser"
+
+#~ msgid "Web browsers"
+#~ msgstr "Web Browsers"
+
+#~ msgid "Distccmon"
+#~ msgstr "Distccmon"
+
+#~ msgid "Distcc monitor"
+#~ msgstr "Monitor Distcc"
+
+#~ msgid "DjVulibre viewer"
+#~ msgstr "Visualizador DjVulibre"
+
+#~ msgid "Dlume"
+#~ msgstr "Dlume"
+
+#~ msgid "An easy to use address book"
+#~ msgstr "Um livro de endereços de fácil uso"
+
+#~ msgid "AddressBooks"
+#~ msgstr "Livros de Endereços"
+
+#~ msgid "Dopewars"
+#~ msgstr "Dopewars"
+
+#~ msgid "Make a fortune dealing drugs on the streets of New York"
+#~ msgstr "Faça uma fortuna negoziando drogas nas ruasde Nova Iorque"
+
+#~ msgid "DOSBox"
+#~ msgstr "DOSBox"
+
+#~ msgid "A DOS emulator"
+#~ msgstr "Um emulador do DOS"
+
+#~ msgid "Downman"
+#~ msgstr "Downman"
+
+#~ msgid "Download manager"
+#~ msgstr "Gestor de Downloads"
+
+#~ msgid "X Cron and At frontend"
+#~ msgstr "Interface X para Cron e At"
+
+#~ msgid "A graphical frontend for cron and at"
+#~ msgstr "Um interface gráfico para Cron e At"
+
+#~ msgid "Dr.Geo"
+#~ msgstr "Dr.Geo"
+
+#~ msgid "Dr.Geo Math Tool"
+#~ msgstr "Ferramenta Matemática Dr.Geo"
+
+#~ msgid "Drivel"
+#~ msgstr "Drivel"
+
+#~ msgid "A live journal for Gnome"
+#~ msgstr "Um jornal ao vivo para Gnome."
+
+#~ msgid "Dr. Python"
+#~ msgstr "Dr. Python"
+
+#~ msgid "Python Editor and IDE"
+#~ msgstr "Editor Python e IDE"
+
+#~ msgid "DVR"
+#~ msgstr "DVR"
+
+#~ msgid "Digital Video Recorder"
+#~ msgstr "Gravador Digital de Vídeos"
+
+#~ msgid "Dzt"
+#~ msgstr "Dzt"
+
+#~ msgid "YATGT"
+#~ msgstr "YATGT"
+
+#~ msgid "EasyChem"
+#~ msgstr "EasyChem"
+
+#~ msgid "2D Molecule Editor"
+#~ msgstr "Editor de moléculas 2D"
+
+#~ msgid "An utility for viewing/editing MP3 tags with a GTK+ GUI."
+#~ msgstr "Um utilitário para ver/editar marcas MP3 com um GUI GTK+."
+
+#~ msgid "Eboard"
+#~ msgstr "Eboard"
+
+#~ msgid "FICS chess-server interface"
+#~ msgstr "Interface para o servidor de xadrez FICS"
+
+#~ msgid "EcaMegaPedal"
+#~ msgstr "EcaMegaPedal"
+
+#~ msgid "Realtime audio effects"
+#~ msgstr "Efeitos áudio em tempo real"
+
+#~ msgid "Ecasound"
+#~ msgstr "Ecasound"
+
+#~ msgid "Sound processing, multitrack recording, and mixing tools"
+#~ msgstr ""
+#~ "Processamento de som, gravação multipistas, e ferramentas de mistura"
+
+#~ msgid "Eca Monitor"
+#~ msgstr "Eca Monitor"
+
+#~ msgid "Eca Signalview"
+#~ msgstr "Eca Visualizador de Sinal"
+
+#~ msgid "EcaWave"
+#~ msgstr "EcaWave"
+
+#~ msgid "Multitrack audio editing"
+#~ msgstr "Editor áudio multipistas"
+
+#~ msgid "EFax-GTK"
+#~ msgstr "EFax-GTK"
+
+#~ msgid "Send faxes with efax"
+#~ msgstr "Envia faxes com efax"
+
+#~ msgid "Egoboo"
+#~ msgstr "Egoboo"
+
+#~ msgid "Egoboo is a 3D dungeon crawling adventure in the spirit of NetHack."
+#~ msgstr "Egoboo é um jogo de aventura 3D no espírito do NetHack."
+
+#~ msgid "Egon"
+#~ msgstr "Egon"
+
+#~ msgid "Siag Office Egon Animator"
+#~ msgstr "Animador Egon do Siag Office"
+
+#~ msgid "Elm"
+#~ msgstr "Elm"
+
+#~ msgid "Elm the mail reader"
+#~ msgstr "Leitor de correio eletrônico Elm"
+
+#~ msgid "A GTK file manager"
+#~ msgstr "Um gestor de ficheiros GTK"
+
+#~ msgid "A GTK+2 file manager"
+#~ msgstr "Um gestor de ficheiros GTK+2"
+
+#~ msgid "EMI"
+#~ msgstr "EMI"
+
+#~ msgid "Ecasound Mastering Interface"
+#~ msgstr "Interface Master Ecasound"
+
+#~ msgid "Personal finance management"
+#~ msgstr "Gestão de Finanças Pessoais"
+
+#~ msgid "Endeavour"
+#~ msgstr "Endeavour"
+
+#~ msgid "File browser with management support for all types of disk objects"
+#~ msgstr ""
+#~ "Gestor de ficheiros com suporte de manutenção para todos os tipos de "
+#~ "objectos disco"
+
+#~ msgid "Enigma"
+#~ msgstr "Enigma"
+
+#~ msgid "Enigma is a puzzle game"
+#~ msgstr "Enigma é um jogo de puzzle"
+
+#~ msgid "Enigma is a puzzle game similar to Oxyd"
+#~ msgstr "Enigma é um jogo de puzzle similar ao Oxyd"
+
+#~ msgid "Epic"
+#~ msgstr "Epic"
+
+#~ msgid "EPIC is the (E)nhanced (P)rogrammable (I)RC-II (C)lient."
+#~ msgstr "EPIC é o (E)voluido e (P)rogramavel (I)RC-II (C)liente."
+
+#~ msgid "Eric"
+#~ msgstr "Eric"
+
+#~ msgid "Ermixer"
+#~ msgstr "Ermixer"
+
+#~ msgid "A full featured OSS mixer"
+#~ msgstr "Um misturador OSS completo"
+
+#~ msgid "Etherape"
+#~ msgstr "Etherape"
+
+#~ msgid "Graphical network viewer"
+#~ msgstr "Visualizador gráfico da rede"
+
+#~ msgid "EVMS GUI"
+#~ msgstr "EVMS GUI"
+
+#~ msgid "EVMS textmode"
+#~ msgstr "EVMS em modo texto"
+
+#~ msgid "Evolvotron"
+#~ msgstr "Evolvotron"
+
+#~ msgid "Interactive generative art software"
+#~ msgstr "Gerador interactivo de software artístico"
+
+#~ msgid "ExEf"
+#~ msgstr "ExEf"
+
+#~ msgid "Extreme Effect is a real-time audio effects processor"
+#~ msgstr "Extreme Effect é um processador de efeitos de som em tempo real"
+
+#~ msgid "Exmh"
+#~ msgstr "Exmh"
+
+#~ msgid "a tk-based mail reader"
+#~ msgstr "Um leitor de correio eletrônico baseado em tk"
+
+#~ msgid "A tk-based mail reader"
+#~ msgstr "Um leitor de correio eletrônico baseado em tk"
+
+#~ msgid "eXtace"
+#~ msgstr "eXtace"
+
+#~ msgid "eXtace - An Extace Waveform Viewer"
+#~ msgstr "eXtace - Um visualizador de ondas Extace"
+
+#~ msgid "Flash for Linux"
+#~ msgstr "Flash para Linux"
+
+#~ msgid "SWF animation editor"
+#~ msgstr "Editor de animações SWF"
+
+#~ msgid "Fbdesk"
+#~ msgstr "Fbdesk"
+
+#~ msgid "Fluxbox-application to create and manage icons on your desktop"
+#~ msgstr "Aplicação Fluxbox para criar e gerir ícones no seu ecrã"
+
+#~ msgid "Fluxbox"
+#~ msgstr "Fluxbox"
+
+#~ msgid "action"
+#~ msgstr "acção"
+
+#~ msgid "Feh"
+#~ msgstr "Feh"
+
+#~ msgid "Image viewer at heart, though it does other cool stuff."
+#~ msgstr ""
+#~ "Visulizador de imagens com múltiplas e interessantes funcionalidades"
+
+#~ msgid "Filelight"
+#~ msgstr "Filelight"
+
+#~ msgid "Graphical disk usage statistics"
+#~ msgstr "Estatística gráfica de uso dos discos"
+
+#~ msgid "Firestarter"
+#~ msgstr "Firestarter"
+
+#~ msgid "Firewall tool"
+#~ msgstr "Ferramenta firewall"
+
+#~ msgid "Fityk"
+#~ msgstr "Fityk"
+
+#~ msgid "Data analysis"
+#~ msgstr "Análise de dados"
+
+#~ msgid "FlightGear"
+#~ msgstr "FlightGear"
+
+#~ msgid "The FlightGear Flight Simulator"
+#~ msgstr "O simulador de voo FlightGear"
+
+#~ msgid "A window manager based on blackbox with many improvements."
+#~ msgstr "Um gestor de janelas baseado em Blackbox com muitas melhorias"
+
+#~ msgid "Config"
+#~ msgstr "Configuração"
+
+#~ msgid "SystemStyles"
+#~ msgstr "Estilos do Sistema"
+
+#~ msgid "UserStyles"
+#~ msgstr "Estilos do Utilizador"
+
+#~ msgid "Reload Configuration"
+#~ msgstr "Recarregar Configuração"
+
+#~ msgid "Reload Menus"
+#~ msgstr "Recarregar Menus"
+
+#~ msgid "Regenerate Menus when you installed new software"
+#~ msgstr "Regenera os Menus quando instalou novo software"
+
+#~ msgid "Run"
+#~ msgstr "Run"
+
+#~ msgid "Start an application"
+#~ msgstr "Inicia uma aplicação"
+
+#~ msgid "FontForge"
+#~ msgstr "FontForge"
+
+#~ msgid "A font editor"
+#~ msgstr "Um editor de tipos de letra"
+
+#~ msgid "FooBillard"
+#~ msgstr "FooBillard"
+
+#~ msgid "OpenGL billard game"
+#~ msgstr "Jogo OpenGL de bilhar"
+
+#~ msgid "FOX Calculator"
+#~ msgstr "Calculadora FOX"
+
+#~ msgid "Calculator using the FOX toolkit"
+#~ msgstr "Calculadora que usa a ferramenta FOX"
+
+#~ msgid "FOX Adie"
+#~ msgstr "FOX Adie"
+
+#~ msgid "A.D.I.E. - Advanced Interactive Editor using the FOX toolkit"
+#~ msgstr "A.D.I.E. - Editor Interactivo Avançado que usa a ferramenta FOX"
+
+#~ msgid "FOX Shutterbug"
+#~ msgstr "FOX Shutterbug"
+
+#~ msgid "Takes a screenshot and saves it to a file"
+#~ msgstr "Tira um instantâneo e grava-o num ficheiro"
+
+#~ msgid "Fpm"
+#~ msgstr "Fpm"
+
+#~ msgid "Fpm password manager"
+#~ msgstr "Fpm gestor de senhas"
+
+#~ msgid "FrameWorks"
+#~ msgstr "FrameWorks"
+
+#~ msgid "Stop-motion animation tool"
+#~ msgstr "Ferramenta de animação para parar o movimento"
+
+#~ msgid "Fred"
+#~ msgstr "Fred"
+
+#~ msgid "Free Fallin' Fred"
+#~ msgstr "Free Fallin' Fred"
+
+#~ msgid "Freebirth"
+#~ msgstr "Freebirth"
+
+#~ msgid "Bass synth/sequencer/sample player for linux"
+#~ msgstr "Leitor  de synth/sequencia/exemplo de contrabaixo para Linux"
+
+#~ msgid "The Free Civilization Clone (editor)"
+#~ msgstr "O Clone Livre de Civilização (editor)"
+
+#~ msgid "Freedroid"
+#~ msgstr "Freedroid"
+
+#~ msgid "Clone of the C64 Game Paradroid"
+#~ msgstr "Clone do jogo para C64 Paradroid"
+
+#~ msgid "FreedroidRPG"
+#~ msgstr "FreedroidRPG"
+
+#~ msgid "A Diablo clone with the Tux as hero and the MS as evil power"
+#~ msgstr "Um clone do Diablo com o Tux como herói e a MS como poder demoníaco"
+
+#~ msgid "FreeLords"
+#~ msgstr "FreeLords"
+
+#~ msgid "A Linux clone of the old dos game W*arLords."
+#~ msgstr "Um clone Linux do antigo jogo dos W*arLords."
+
+#~ msgid "Freevo"
+#~ msgstr "Freevo"
+
+#~ msgid "Freevo is an open-source digital video jukebox"
+#~ msgstr "Freevo é uma jukebox de video digital open-source"
+
+#~ msgid "FreqTweak"
+#~ msgstr "FreqTweak"
+
+#~ msgid "Sound manipulator"
+#~ msgstr "Manipulador de Som"
+
+#~ msgid "FretScale"
+#~ msgstr "FretScale"
+
+#~ msgid "Calculates fret distances for stringed musical instruments"
+#~ msgstr ""
+#~ "Calculador de distâncias entre barras para instrumentos de música e cordas"
+
+#~ msgid "F-Spot"
+#~ msgstr "F-Spot"
+
+#~ msgid "Image Database"
+#~ msgstr "Base de Dados de Imagens"
+
+#~ msgid "3D file browser"
+#~ msgstr "Gestor de Ficheiros 3D"
+
+#~ msgid "FTE"
+#~ msgstr "FTE"
+
+#~ msgid "FTE Text Editor"
+#~ msgstr "Editor de Texto FTE"
+
+#~ msgid "Fvwm"
+#~ msgstr "Fvwm"
+
+#~ msgid "FVWM Windows manager"
+#~ msgstr "Gestor de Janelas FVWM"
+
+#~ msgid "FVWM 2"
+#~ msgstr "FVWM 2"
+
+#~ msgid "g3DGMV"
+#~ msgstr "g3DGMV"
+
+#~ msgid "3D Map Viewer"
+#~ msgstr "Visualizador de Mapas 3D"
+
+#~ msgid "Gabedit"
+#~ msgstr "Gabedit"
+
+#~ msgid "Computational Chem GUI"
+#~ msgstr "GUI para Computational Chem"
+
+#~ msgid "Gaby - Personal Database Manager"
+#~ msgstr "Gaby - Gestor de Dados Pessoais"
+
+#~ msgid "Gai-album"
+#~ msgstr "Gai-album"
+
+#~ msgid "Xmms cover viewer"
+#~ msgstr "Visualizador de capas Xmms"
+
+#~ msgid "Gai-bgswitcher"
+#~ msgstr "Gai-bgswitcher"
+
+#~ msgid "Background switcher"
+#~ msgstr "Alternador do fundo do ecrã"
+
+#~ msgid "Gai-blobs"
+#~ msgstr "Gai-blobs"
+
+#~ msgid "Blobs viewer :)"
+#~ msgstr "Visualizador de Blobs :)"
+
+#~ msgid "Gai-leds"
+#~ msgstr "Gai-leds"
+
+#~ msgid "Displays the status of the keyboard leds"
+#~ msgstr "Exibe o estado dos leds do teclado"
+
+#~ msgid "Gai-mailcounter"
+#~ msgstr "Gai-mailcounter"
+
+#~ msgid "Mail counter"
+#~ msgstr "Contador de Email"
+
+#~ msgid "Gai-pal"
+#~ msgstr "Gai-pal"
+
+#~ msgid "A dear friend"
+#~ msgstr "Um amigo querido"
+
+#~ msgid "Gai-sun"
+#~ msgstr "Gai-sun"
+
+#~ msgid "Display time when they sun sets and rise"
+#~ msgstr "Exibe as horas a que o sol se levanta e se põe"
+
+#~ msgid "Gai-visual-studio"
+#~ msgstr "Gai-visual-studio"
+
+#~ msgid "Visualizing the XMMS output"
+#~ msgstr "Visualiza a saída do XMMS"
+
+#~ msgid "Galan"
+#~ msgstr "Galan"
+
+#~ msgid "Audio processing"
+#~ msgstr "Processamento de áudio"
+
+#~ msgid "Galculator"
+#~ msgstr "Galculator"
+
+#~ msgid "Calculator (basic and scientific)"
+#~ msgstr "Calculadora (básica e científica)"
+
+#~ msgid "Gamazons"
+#~ msgstr "Gamazons"
+
+#~ msgid "Amazons chess game"
+#~ msgstr "Jogo de xadrez Amazons"
+
+#~ msgid "Gambas"
+#~ msgstr "Gambas"
+
+#~ msgid "A visually oriented BASIC programming environment"
+#~ msgstr "Un ambiente de programação visual com orientação BASIC"
+
+#~ msgid "Gambas Database Manager"
+#~ msgstr "Gambas - Gestor de Base de Dados"
+
+#~ msgid "A graphical database manager for Gambas"
+#~ msgstr "Um gestor gráfico de basede dados para o Gambas"
+
+#~ msgid "3D Molecule Viewer"
+#~ msgstr "Visualizador de moléculas 3D"
+
+#~ msgid "GPL Arcade Volleyball"
+#~ msgstr "GPL Arcada Voleibol"
+
+#~ msgid "2-D Volleyball"
+#~ msgstr "Voleibol em 2D"
+
+#~ msgid "GChemPaint"
+#~ msgstr "GChemPaint"
+
+#~ msgid "GNOME 2D chemical structure drawing tool"
+#~ msgstr "Ferramenta de desenho GNOME de estruturas químicas em 2D"
+
+#~ msgid "Gnome Chord"
+#~ msgstr "Gnome Chord"
+
+#~ msgid "Guitar chords helper"
+#~ msgstr "Ajudante de acordes de guitarra"
+
+#~ msgid "Gnome Scales"
+#~ msgstr "Escalas Gnome"
+
+#~ msgid "Guitar scales helper"
+#~ msgstr "Ajudante de escalas de guitarra"
+
+#~ msgid "Gnome Chord Creator"
+#~ msgstr "Criador de Acordes Gnome"
+
+#~ msgid "Guitar chords creator"
+#~ msgstr "Criador de acordes de guitarra "
+
+#~ msgid "Gco"
+#~ msgstr "Gco"
+
+#~ msgid "GNOME Comic Organizer"
+#~ msgstr "Organizador Comico Gnome"
+
+#~ msgid "Gcompris"
+#~ msgstr "Gcompris"
+
+#~ msgid "Educational game"
+#~ msgstr "Jogo educativo"
+
+#~ msgid "Gcompris editor"
+#~ msgstr "Editor Gcompris"
+
+#~ msgid "The game editor of gcompris"
+#~ msgstr "O jogo ditor de gcompris"
+
+#~ msgid "Gconfpref"
+#~ msgstr "Gconfpref"
+
+#~ msgid "GNOME crystal structure tool"
+#~ msgstr "Ferramenta de estruturas em cristal GNOME"
+
+#~ msgid "gCVS"
+#~ msgstr "gCVS"
+
+#~ msgid "GTK frontend for CVS"
+#~ msgstr "Interface GTK para CVS"
+
+#~ msgid "GDAM"
+#~ msgstr "GDAM"
+
+#~ msgid "Digital DJ System"
+#~ msgstr "Sistema DJ Digital"
+
+#~ msgid "Gdesklets"
+#~ msgstr "Gdesklets"
+
+#~ msgid "Put applets on your GNOME desktop"
+#~ msgstr "Coloque applets no seu ambiente de trabalho GNOME"
+
+#~ msgid "On-line dictionary"
+#~ msgstr "Dicionário online"
+
+#~ msgid "Gdigidoc"
+#~ msgstr "Gdigidoc"
+
+#~ msgid "Frontend built for DigiDoc library"
+#~ msgstr "Interface feito para a livraria DigiDoc"
+
+#~ msgid "Molecule/crystal viewer"
+#~ msgstr "Visualizador de moléculas/cristais"
+
+#~ msgid "Geda project manager"
+#~ msgstr "Gestor de Projectos Geda"
+
+#~ msgid "Tasks management"
+#~ msgstr "Gerir Tarefas"
+
+#~ msgid "Vertical scrolling arcade shooter"
+#~ msgstr "Jogo arcada de tiro de rolagem vertical"
+
+#~ msgid "Geki3-KXL"
+#~ msgstr "Geki3-KXL"
+
+#~ msgid "Horizontal scrolling arcade shooter"
+#~ msgstr "Jogo arcada de tiro de rolagem horizontal"
+
+#~ msgid "Gem Drop X"
+#~ msgstr "Gem Drop X"
+
+#~ msgid "Tetris meets Space Invaders"
+#~ msgstr "Tetris conhece os Invasores do Espaço"
+
+#~ msgid "GenChemLab"
+#~ msgstr "GenChemLab"
+
+#~ msgid "Chemistry Lab Simulations"
+#~ msgstr "Simulações de Química em Laboratório"
+
+#~ msgid "Genius math tool"
+#~ msgstr "Ferramenta Matemática Genius"
+
+#~ msgid "Genius Mathematical Tool and Calculator"
+#~ msgstr "Ferramenta Matemática e Calculadora Genius"
+
+#~ msgid "A file manager"
+#~ msgstr "Um gestor de ficheiros"
+
+#~ msgid "Gfcc"
+#~ msgstr "Gfcc"
+
+#~ msgid "GTK+ Firewall Control Center"
+#~ msgstr "Centro de Controlo de Firewalls GTK+"
+
+#~ msgid "GNU Forth"
+#~ msgstr "GNU Forth"
+
+#~ msgid "GNU Forth - Shell"
+#~ msgstr "GNU Forth - linha de commando"
+
+#~ msgid "GNU Gradebook"
+#~ msgstr "GNU Gradebook"
+
+#~ msgid "Teacher's gradebook"
+#~ msgstr "Livro de notas dos professores"
+
+#~ msgid "GGZ GNOME Game Client"
+#~ msgstr "Cliente de Jogo GGZ GNOME"
+
+#~ msgid "GGZ Gaming Zone game client with GNOME interface"
+#~ msgstr "Cliente de Jogo GGZ com um interface GNOME"
+
+#~ msgid "GGZ MOTD editor"
+#~ msgstr "Editor GGZ MOTD"
+
+#~ msgid "GGZ Gaming Zone MOTD editor"
+#~ msgstr "Editor MOTD de zona de jogo GGZ"
+
+#~ msgid "GGZ GTK+ Game Client"
+#~ msgstr "Cliente de Jogo GGZ GTK+"
+
+#~ msgid "GGZ Gaming Zone game client with GTK+ interface"
+#~ msgstr "Cliente de Jogos GGZ com interface GTK+"
+
+#~ msgid "GGZ KDE Game Client"
+#~ msgstr "Cliente de Jogos GGZ KDE"
+
+#~ msgid "GGZ Gaming Zone game client with KDE interface"
+#~ msgstr "Cliente de Jogos GGZ com interface KDE"
+
+#~ msgid "GGZ MOTD File Editor"
+#~ msgstr "Editor de Ficheiro GGZ MOTD"
+
+#~ msgid "Editor for creating GGZ Gaming Zone MOTD file"
+#~ msgstr "Editor para criar o ficheiro MOTD do GGZ Zona de Jogo"
+
+#~ msgid "Ghemical"
+#~ msgstr "Ghemical"
+
+#~ msgid "GNOME MM/QM Frontend"
+#~ msgstr "Interface GNOME MM/QM"
+
+#~ msgid "GNOME Hexadecimal Editor"
+#~ msgstr "Editor Hexadecimal GNOME"
+
+#~ msgid "Gimagview"
+#~ msgstr "Gimagview"
+
+#~ msgid "The GIMP"
+#~ msgstr "O GIMP"
+
+#~ msgid "Ginsh - GiNaC interactive shell"
+#~ msgstr "Ginsh - consola interactiva GiNaC"
+
+#~ msgid "Giram"
+#~ msgstr "Giram"
+
+#~ msgid "Giram Is Really A Modeller"
+#~ msgstr "Giram é Mesmo Um Modelador"
+
+#~ msgid "GJay"
+#~ msgstr "GJay"
+
+#~ msgid "DJ Collection Manager"
+#~ msgstr "Gestor de Colecções DJ"
+
+#~ msgid "Gjots"
+#~ msgstr "Gjots"
+
+#~ msgid "A simple note jotting utility"
+#~ msgstr "Um utilitário simples de notas"
+
+#~ msgid "GL-117"
+#~ msgstr "GL-117"
+
+#~ msgid "Action flight simulator"
+#~ msgstr "Simulador Action flight"
+
+#~ msgid "Create labels and business cards"
+#~ msgstr "Cria etiquetas e cartões profissionais"
+
+#~ msgid "An audio processing tool"
+#~ msgstr "Uma ferramenta de processamento de áudio"
+
+#~ msgid "Glaxium"
+#~ msgstr "Glaxium"
+
+#~ msgid "OpenGL-based space-ship shoot'em up"
+#~ msgstr "Jogo de tiro espacial OpenGL"
+
+#~ msgid "GlChess"
+#~ msgstr "GlChess"
+
+#~ msgid "3d Chess game"
+#~ msgstr "Jogo de Xadrez 3D"
+
+#~ msgid "Glinuxsms"
+#~ msgstr "Glinuxsms"
+
+#~ msgid "Glinuxsms is a GNOME2 GUI/front-end for linuxsms."
+#~ msgstr "Glinuxsms é um GUI/interface GNOME2 para linuxsms."
+
+#~ msgid "GLiv"
+#~ msgstr "GLiv"
+
+#~ msgid "OpenGL graphics viewer"
+#~ msgstr "Visualizador de gráficos OpenGL"
+
+#~ msgid "Globulation2"
+#~ msgstr "Globulation2"
+
+#~ msgid "Globulation2 - a state of the art Real Time Strategy (RTS) game"
+#~ msgstr ""
+#~ "Globulation2 - um jogo de estratégia em tempo real (RTS) de nível actual"
+
+#~ msgid "Gltron"
+#~ msgstr "Gltron"
+
+#~ msgid "3d lightcycle game"
+#~ msgstr "Jogo lightcycle 3D"
+
+#~ msgid "gmasqdialer"
+#~ msgstr "gmasqdialer"
+
+#~ msgid "Gnome Client for the masqdialer modem server"
+#~ msgstr "Cliente Gnome para o servidor de modem masqdialer"
+
+#~ msgid "Memory usage"
+#~ msgstr "Uso de memória"
+
+#~ msgid "Gmencoder"
+#~ msgstr "Gmencoder"
+
+#~ msgid "Video Ripper/Encoder GUI"
+#~ msgstr "GUI para Ripar/Codificar Vídeo"
+
+#~ msgid "GModConfig"
+#~ msgstr "GModConfig"
+
+#~ msgid "Kernel Module Utilities"
+#~ msgstr "Utilidades para Módulos Kernel"
+
+#~ msgid "GModConfigEdit"
+#~ msgstr "GModConfigEdit"
+
+#~ msgid "Kernel Module Info Editor"
+#~ msgstr "Editor de Informações dos Módulos Kernel"
+
+#~ msgid "GMorgan"
+#~ msgstr "GMorgan"
+
+#~ msgid "MIDI Auto-Accompaniment"
+#~ msgstr "Auto-Acompanhamento MIDI"
+
+#~ msgid "gMudix"
+#~ msgstr "gMudix"
+
+#~ msgid "GMudix GTK mud client"
+#~ msgstr "GMudix cliente mud GTK"
+
+#~ msgid "Gnocatan"
+#~ msgstr "Gnocatan"
+
+#~ msgid "Gnocatan game client"
+#~ msgstr "Cliente de jogo Gnocatan"
+
+#~ msgid "Gnocatan Server"
+#~ msgstr "Servidor Gnocatan"
+
+#~ msgid "Gnocatan GUI server"
+#~ msgstr "Servidor GUI Gnocatan"
+
+#~ msgid "Gnochive"
+#~ msgstr "Gnochive"
+
+#~ msgid "GUI frontend for several archive formats"
+#~ msgstr "Interface GUI para vários formatos de arquivos"
+
+#~ msgid "Gnochm"
+#~ msgstr "Gnochm"
+
+#~ msgid "A chm file viewer for gnome"
+#~ msgstr "Um visualizador de ficheiros chm para gnome"
+
+#~ msgid "Gnofin"
+#~ msgstr "Gnofin"
+
+#~ msgid "A personal finance application for GNOME"
+#~ msgstr "Uma aplicação de finanças pessoal para GNOME"
+
+#~ msgid "Wave file editor"
+#~ msgstr "Editor de ficheiros wave"
+
+#~ msgid "xGnokii"
+#~ msgstr "xGnokii"
+
+#~ msgid "Tool suite for Nokia mobile phones"
+#~ msgstr "Ferramenta para telemóveis Nokia"
+
+#~ msgid "Gnomad 2"
+#~ msgstr "Gnomad 2"
+
+#~ msgid "A tool for managing Creative Nomad Jukeboxes"
+#~ msgstr "Uma ferramenta para gerir as Jukeboxes Creative Nomad"
+
+#~ msgid "Blog Entry Poster"
+#~ msgstr "Entrada de Poster Blog"
+
+#~ msgid "Post an entry to a web log"
+#~ msgstr "Coloca uma entrada para um registo web"
+
+#~ msgid "Bluephone"
+#~ msgstr "Bluephone"
+
+#~ msgid "Bluetooth phone utility"
+#~ msgstr "Utilitário de telefone Bluetooth"
+
+#~ msgid "Gnome-Breakout"
+#~ msgstr "Gnome Breakout"
+
+#~ msgid "Gnome breakout"
+#~ msgstr "Gnome breakout"
+
+#~ msgid "Gnome Bittorent"
+#~ msgstr "Gnome Bittorent"
+
+#~ msgid "Gnome frontend for bittorrent files"
+#~ msgstr "Interface Gnome para ficheiros bittorrent"
+
+#~ msgid "Gnome Commander"
+#~ msgstr "Gnome Commander"
+
+#~ msgid "Filemanager similar to the Norton Commander(TM)"
+#~ msgstr "Gestor de ficheiros similar ao Norton Commander(TM)"
+
+#~ msgid "File searching tool"
+#~ msgstr "Ferramenta de procura de ficheiros"
+
+#~ msgid "Gnome-Jabber"
+#~ msgstr "Gnome-Jabber"
+
+#~ msgid "A gnome jabber client"
+#~ msgstr "Um cliente jabber gnome"
+
+#~ msgid "Gnome-Kerberos"
+#~ msgstr "Gnome-Kerberos"
+
+#~ msgid "GNOME keyring manager"
+#~ msgstr "Gestor GNOME keyring"
+
+#~ msgid "Manage your secrets with the GNOME keyring"
+#~ msgstr "Gere os teus segredos com o GNOME keyring"
+
+#~ msgid "LinuxConf"
+#~ msgstr "LinuxConf"
+
+#~ msgid "Netconf"
+#~ msgstr "Netconf"
+
+#~ msgid "Userconf"
+#~ msgstr "Userconf"
+
+#~ msgid "Gnome-mud"
+#~ msgstr "Gnome-mud"
+
+#~ msgid "GNOME-Mud is a mudclient for the GNOME platform."
+#~ msgstr "GNOME-Mud é um cliente mud para a plataforma GNOME."
+
+#~ msgid "Network information"
+#~ msgstr "Informações da rede"
+
+#~ msgid "Remote shell"
+#~ msgstr "Shell Remota"
+
+#~ msgid "Open a shell on a remote server"
+#~ msgstr "Abrir uma shell num servidor remoto"
+
+#~ msgid "Remote desktop"
+#~ msgstr "Desktop Remoto"
+
+#~ msgid "Open a desktop on a remote computer"
+#~ msgstr "Abrir um desktop num computador remoto"
+
+#~ msgid "GNOME Package Viewer"
+#~ msgstr "Visualizador de Pacotes GNOME"
+
+#~ msgid "Retrieve information about installed GNOME desktop libraries"
+#~ msgstr "Recuperar informações acerca as livrarias GNOME desktop instaladas"
+
+#~ msgid "Finance management"
+#~ msgstr "Gestão de finanças"
+
+#~ msgid "Gnome PPP"
+#~ msgstr "Gnome PPP"
+
+#~ msgid "GNOME 2 frontend for wvdial"
+#~ msgstr "Interface GNOME 2 para wvdial"
+
+#~ msgid "A FM-Tuner program for Gnome."
+#~ msgstr "Um programa de rádio FM para Gnome."
+
+#~ msgid "Gnome Sword"
+#~ msgstr "Gnome Sword"
+
+#~ msgid "Bible Study Software for Linux and the Gnome Desktop"
+#~ msgstr "Programa de Estudo da Bíblia para Linux e Gnome"
+
+#~ msgid "Boot Manager"
+#~ msgstr "Gestor de Arranque"
+
+#~ msgid "Network adapter setup."
+#~ msgstr "Configuração dos adaptadores de rede"
+
+#~ msgid "Services Manager"
+#~ msgstr "Gestor de Serviços"
+
+#~ msgid "Time"
+#~ msgstr "Tempo"
+
+#~ msgid "Time, date and timezone."
+#~ msgstr "Hora, date e fuso horário"
+
+#~ msgid "Users and groups."
+#~ msgstr "Utilizadores e grupos."
+
+#~ msgid "Gnometab"
+#~ msgstr "Gnometab"
+
+#~ msgid "Gnometab is a guitar tablature editor."
+#~ msgstr "Gnometab é um editor de tabelas para guitarra."
+
+#~ msgid "VLC Gnome media player"
+#~ msgstr "VLC Leitor de média Gnome"
+
+#~ msgid "VLC is a free MPEG, MPEG2, DVD and DivX player"
+#~ msgstr "VLC é um leitor livre de MPEG, MPEG2, DVD e DivX"
+
+#~ msgid "GnoTime Tracking Tool"
+#~ msgstr "Gestor de Tempo GnoTime"
+
+#~ msgid "To-Do List Organizer, Diary and Billing System"
+#~ msgstr "Organizador de Listas de Tarefas, Sistema Diário e Compras"
+
+#~ msgid "Time management"
+#~ msgstr "Gestor de Tempo"
+
+#~ msgid "GNUbiff"
+#~ msgstr "GNUbiff"
+
+#~ msgid "Mail notification program"
+#~ msgstr "Programa de notificação de correio eletrônico"
+
+#~ msgid "GNU Go chess"
+#~ msgstr "GNU Go Xadrez"
+
+#~ msgid "Get more territory by circling around opponent pieces"
+#~ msgstr "Tenha mais territórios ao circular à voltas das peças do adversário"
+
+#~ msgid "GNUitar"
+#~ msgstr "GNUitar"
+
+#~ msgid "Guitar effects"
+#~ msgstr "Efeitos de guitarra"
+
+#~ msgid "GNU Robbo"
+#~ msgstr "GNU Robbo"
+
+#~ msgid "Logic game"
+#~ msgstr "Jogo de lógica"
+
+#~ msgid "Gnu Sound Editor"
+#~ msgstr "Editor de Sons GNU"
+
+#~ msgid "Gossip"
+#~ msgstr "Gossip"
+
+#~ msgid "Jabber Instant Messaging"
+#~ msgstr "Jabber - Mensagens Instantâneas"
+
+#~ msgid "Gournal"
+#~ msgstr "Gournal"
+
+#~ msgid "Handwriting notepad"
+#~ msgstr "Notepad (escrever à mão)"
+
+#~ msgid "GNU Privacy Assistant"
+#~ msgstr "Assistente de Privacidade GNU"
+
+#~ msgid "Graphical User Interface for GnuPG"
+#~ msgstr "Interface Gráfico do Utilizador para GnuPG"
+
+#~ msgid "G-Page"
+#~ msgstr "G-Page"
+
+#~ msgid "Send text messages by SMS"
+#~ msgstr "Envia mensagens de texto por SMS"
+
+#~ msgid "Periodic table"
+#~ msgstr "Tabela Periódica"
+
+#~ msgid "A front end for Gnupg"
+#~ msgstr "Um interface para Gnupg"
+
+#~ msgid "Gphone"
+#~ msgstr "Gphone"
+
+#~ msgid "Internet telephone"
+#~ msgstr "Telefone por Internet"
+
+#~ msgid "Gpppoem"
+#~ msgstr "Gpppoem"
+
+#~ msgid "Pppoe monitor"
+#~ msgstr "Monitor Pppoe"
+
+#~ msgid "GProftpd"
+#~ msgstr "GProftpd"
+
+#~ msgid "Proftpd administration tool"
+#~ msgstr "Ferramenta de Administração Proftpd"
+
+#~ msgid "GPS3D"
+#~ msgstr "GPS3D"
+
+#~ msgid "GPS 'viz' utility"
+#~ msgstr "Utilitário 'viz' GPS"
+
+#~ msgid "GpsDrive"
+#~ msgstr "GpsDrive"
+
+#~ msgid "A GPS based navigation tool for Gnome"
+#~ msgstr "Uma ferramente de navegação GPS para Gnome"
+
+#~ msgid "MGPSPoint"
+#~ msgstr "GPSPoint"
+
+#~ msgid "GPS Data Transfer"
+#~ msgstr "Transferência de dados GPS"
+
+#~ msgid "Gq"
+#~ msgstr "Gq"
+
+#~ msgid "GQ is a GTK-based LDAP client."
+#~ msgstr "GQ é um cliente LDAP baseado em GTK"
+
+#~ msgid "Gqmpeg"
+#~ msgstr "Gqmpeg"
+
+#~ msgid "Graphical Frontend of Audio Players"
+#~ msgstr "Interface Gráfico para Leitores Áudio"
+
+#~ msgid "gQueue"
+#~ msgstr "gQueue"
+
+#~ msgid "Control print jobs"
+#~ msgstr "Controlo de Tarefas de Impressão"
+
+#~ msgid "Grace"
+#~ msgstr "Grace"
+
+#~ msgid "Graphical visualization of scientific data"
+#~ msgstr "Visualizador gráfico de dados scientificos"
+
+#~ msgid "GRAMPS"
+#~ msgstr "GRAMPS"
+
+#~ msgid "Genealogy Program"
+#~ msgstr "Programa de Genealogia"
+
+#~ msgid "Grany"
+#~ msgstr "Grany"
+
+#~ msgid "The cellular automaton simulator"
+#~ msgstr "O simulador célular automaton"
+
+#~ msgid "Grass"
+#~ msgstr "Grass"
+
+#~ msgid "Geographic Resources Analysis Support System"
+#~ msgstr "Sistema de Suporte para Análise de Recursos Geográficos"
+
+#~ msgid "Grass53"
+#~ msgstr "Grass53"
+
+#~ msgid "Grass57"
+#~ msgstr "Grass57"
+
+#~ msgid "GNOME RCM"
+#~ msgstr "GNOME RCM"
+
+#~ msgid "GUI for remote connections"
+#~ msgstr "GUI para conexões remotas"
+
+#~ msgid "Rdesktop"
+#~ msgstr "Rdesktop"
+
+#~ msgid "Connect to Windows Terminal Servers"
+#~ msgstr "Conectar a Servidores de Terminal Windows"
+
+#~ msgid "Greenwich"
+#~ msgstr "Greenwich"
+
+#~ msgid "Whois client"
+#~ msgstr "Cliente Whois"
+
+#~ msgid "Econometric analysis"
+#~ msgstr "Analise Econométrica"
+
+#~ msgid "An electronic strongbox"
+#~ msgstr "Uma caixa sólida electrónica"
+
+#~ msgid "Personnal Finances Manager"
+#~ msgstr "Gestor de Finanças Pessoais"
+
+#~ msgid "A RPN calculator"
+#~ msgstr "Uma calculadora RPN"
+
+#~ msgid "Gscmxx"
+#~ msgstr "Gscmxx"
+
+#~ msgid "Frontend for your Siemens mobile phone"
+#~ msgstr "Interface para o seu telemóvel Siemens"
+
+#~ msgid "Gst-editor"
+#~ msgstr "Gst-editor"
+
+#~ msgid "GStreamer Editor"
+#~ msgstr "Editor GStreamer"
+
+#~ msgid "Gst-launch"
+#~ msgstr "Gst-launch"
+
+#~ msgid "GStreamer launcher"
+#~ msgstr "Executa o GStreamer"
+
+#~ msgid "Gst-inspect"
+#~ msgstr "Gst-inspect"
+
+#~ msgid "GStreamer Inspector"
+#~ msgstr "Inspector GStreamer"
+
+#~ msgid "GStreamer player"
+#~ msgstr "Leitor GStreamer"
+
+#~ msgid "GStreamer Streaming media framework player"
+#~ msgstr "Leitor de média 'streaming' GStreamer"
+
+#~ msgid "Graphical process signaling"
+#~ msgstr "Indicador de processos gráfico"
+
+#~ msgid "GTetrinet"
+#~ msgstr "GTetrinet"
+
+#~ msgid "TetriNET game client for Linux"
+#~ msgstr "Cliente Linux de jogos TetriNET"
+
+#~ msgid "GThumb"
+#~ msgstr "GThumb"
+
+#~ msgid "View and organize your images"
+#~ msgstr "Ver e organizar as suas imagens"
+
+#~ msgid "Task management application"
+#~ msgstr "Aplicação para gerir tarefas"
+
+#~ msgid "Gtk frontend to asp2php"
+#~ msgstr "Interface Gtk para asp2php"
+
+#~ msgid "GtkAtlantic"
+#~ msgstr "GtkAtlantic"
+
+#~ msgid "Play Monopoly"
+#~ msgstr "Jogar Monopoly"
+
+#~ msgid "GtkDive"
+#~ msgstr "GtkDive"
+
+#~ msgid "Buehlmann ZH-L16 model diving simulation"
+#~ msgstr "Simulação de mergulhos pelo modelo Buehlmann ZH-L16"
+
+#~ msgid "Graphical file finding program"
+#~ msgstr "Programa para procurar ficheiros gráficos"
+
+#~ msgid "GTK Guitar Effects"
+#~ msgstr "Efeitos para Guitarra GTK"
+
+#~ msgid "Realtime effects"
+#~ msgstr "Efeitos em tempo real"
+
+#~ msgid "gtkguitune"
+#~ msgstr "gtkguitune"
+
+#~ msgid "GTK-IPTables"
+#~ msgstr "GTK-IPTables"
+
+#~ msgid "IPTables Rules Configuration"
+#~ msgstr "Configuração das Regras IPTables"
+
+#~ msgid "GTK Frontend for CUPS"
+#~ msgstr "Interface GTK para CUPS"
+
+#~ msgid "GTK Frontend to GTKlp CUPS Queue"
+#~ msgstr "Interface GTK para a fila CUPS"
+
+#~ msgid "Gtk version of motd"
+#~ msgstr "Versão Gtk do motd"
+
+#~ msgid "GTKPod"
+#~ msgstr "GTKPod"
+
+#~ msgid "Interface to iPod"
+#~ msgstr "Interface para o iPod"
+
+#~ msgid "A Tetris clone"
+#~ msgstr "Um clone do Tetris"
+
+#~ msgid "GTK Theme Switch"
+#~ msgstr "Mudar de tema GTK"
+
+#~ msgid "Change GTK1 Theme"
+#~ msgstr "Mudar Tema GTK1"
+
+#~ msgid "GTKWave"
+#~ msgstr "GTKWave"
+
+#~ msgid "GTKWave Electronic Waveform Viewer"
+#~ msgstr "GTKWave - Um visualizador de ondas electrónicas"
+
+#~ msgid "GTodo"
+#~ msgstr "GTodo"
+
+#~ msgid "TODO List manager for Gnome 2"
+#~ msgstr "Gestor de lista de tarefas para Gnome 2"
+
+#~ msgid "gtranslator"
+#~ msgstr "gtranslator"
+
+#~ msgid "Gettext translation file editor"
+#~ msgstr "Editor de catálogos de traduções gettext"
+
+#~ msgid "GTray"
+#~ msgstr "GTray"
+
+#~ msgid "Menus"
+#~ msgstr "Menus"
+
+#~ msgid "Extra preferences for application menus"
+#~ msgstr "Preferências suplementares para os menus dos programas"
+
+#~ msgid "Extra session preferences"
+#~ msgstr "Preferências suplementares da sessão"
+
+#~ msgid "Extra nautilus preferences"
+#~ msgstr "Preferências suplementares do nautilus"
+
+#~ msgid "Extra galeon preferences"
+#~ msgstr "Preferências extra do galeon"
+
+#~ msgid "Firewall utility"
+#~ msgstr "Utilitário Firewall"
+
+#~ msgid "Audacity guide"
+#~ msgstr "Guia do Audacity"
+
+#~ msgid "Blender guide"
+#~ msgstr "Guia do Blender"
+
+#~ msgid "Celestia guide"
+#~ msgstr "Guia do Celestia"
+
+#~ msgid "Chemtool guide"
+#~ msgstr "Guia do Chemtool"
+
+#~ msgid "Dia guide"
+#~ msgstr "Guia do Dia"
+
+#~ msgid "Digikam guide"
+#~ msgstr "Guia do Digikam"
+
+#~ msgid "The Gimp guide"
+#~ msgstr "Guia do Gimp"
+
+#~ msgid "K3b guide"
+#~ msgstr "Guia do K3b"
+
+#~ msgid "Kontact guide"
+#~ msgstr "Guia do Kontact"
+
+#~ msgid "Kalzium guide"
+#~ msgstr "Guia do Kalzium"
+
+#~ msgid "Kig guide"
+#~ msgstr "Guia do Kig"
+
+#~ msgid "Kile guide"
+#~ msgstr "Guia do Kile"
+
+#~ msgid "Kino guide"
+#~ msgstr "Guia do Kino"
+
+#~ msgid "Kmail guide"
+#~ msgstr "Guia do Kmail"
+
+#~ msgid "Kmplot guide"
+#~ msgstr "Guia do Kmplot"
+
+#~ msgid "Konqueror guide"
+#~ msgstr "Guia do Konqueror"
+
+#~ msgid "Kooka guide"
+#~ msgstr "Guia do Kooka"
+
+#~ msgid "Korganizer guide"
+#~ msgstr "Guia do KOrganizador"
+
+#~ msgid "Maxima guide"
+#~ msgstr "Guia do Maxima"
+
+#~ msgid "Mozilla Composer guide"
+#~ msgstr "Guia do Mozilla Composer"
+
+#~ msgid "MySQLCC guide"
+#~ msgstr "Guia do MySQLCC"
+
+#~ msgid "OpenOffice.org Calc guide"
+#~ msgstr "Guia do OpenOffice.org Calc"
+
+#~ msgid "OpenOffice.org Draw guide"
+#~ msgstr "Guia do OpenOffice.org Draw"
+
+#~ msgid "OpenOffice.org Impress guide"
+#~ msgstr "Guia do OpenOffice.org Impress"
+
+#~ msgid "OpenOffice.org Writer guide"
+#~ msgstr "Guia do OpenOffice.org Writer"
+
+#~ msgid "PhpBB2 guide"
+#~ msgstr "Guia do PhpBB2"
+
+#~ msgid "Planner guide"
+#~ msgstr "Guia do Planner"
+
+#~ msgid "Quanta Plus guide"
+#~ msgstr "Guia do Quanta +"
+
+#~ msgid "Rasmol guide"
+#~ msgstr "Guia do Rasmol"
+
+#~ msgid "Scilab guide"
+#~ msgstr "Guia do Scilab"
+
+#~ msgid "Scribus guide"
+#~ msgstr "Guia do Scribus"
+
+#~ msgid "Sketch guide"
+#~ msgstr "Guia do Sketch"
+
+#~ msgid "Spip guide"
+#~ msgstr "Guia do Spip"
+
+#~ msgid "XChat guide"
+#~ msgstr "Guia do XChat"
+
+#~ msgid "gURLChecker"
+#~ msgstr "gURLChecker"
+
+#~ msgid "Web page link checker"
+#~ msgstr "Verificador de ligações web"
+
+#~ msgid "GVeeJay"
+#~ msgstr "GVeeJay"
+
+#~ msgid "Video Editing, Mixing, and Effects"
+#~ msgstr "Edição Vídeo, Mistura e Efeitos"
+
+#~ msgid "VLC Gtk media player"
+#~ msgstr "VLC - Leitor de média GTK"
+
+#~ msgid "Gweled"
+#~ msgstr "Gweled"
+
+#~ msgid "Clone of Bejeweled"
+#~ msgstr "Clone do Bejeweled"
+
+#~ msgid "Gwenview"
+#~ msgstr "Gwenview"
+
+#~ msgid "A simple image viewer"
+#~ msgstr "Um simples visualizador de imagens"
+
+#~ msgid "Gwenview - hack"
+#~ msgstr "Hack - Gwenview"
+
+#~ msgid "A simple image viewer - hack "
+#~ msgstr "Hack - um simples visualizador de imagens"
+
+#~ msgid "Gwget download manager"
+#~ msgstr "Gwget gestor de downloads"
+
+#~ msgid "Download manager using wget as backend"
+#~ msgstr "Gestor de downloads que usa o wget"
+
+#~ msgid "Gxine"
+#~ msgstr "Gxine"
+
+#~ msgid "A yahoo chat client"
+#~ msgstr "Um cliente de chat yahoo"
+
+#~ msgid "VRML 97 Editor"
+#~ msgstr "Editor VRML 97"
+
+#~ msgid "Device Manager"
+#~ msgstr "Gestor de Dispositivos"
+
+#~ msgid "Shows information about hardware on your system"
+#~ msgstr "Mostra informações acerca do hardware do seu sistema"
+
+#~ msgid "HelixPlayer"
+#~ msgstr "HelixPlayer"
+
+#~ msgid "A multimedia player"
+#~ msgstr "Um leitor multimédia"
+
+#~ msgid "Heroes"
+#~ msgstr "Heróis"
+
+#~ msgid "Game like Nibbles but different."
+#~ msgstr "Jogo tipo Nibbles mas diferente."
+
+#~ msgid "Hexcalc"
+#~ msgstr "Hexcalc"
+
+#~ msgid "Hexadecimal calculator"
+#~ msgstr "Calculadora Hexadecimal"
+
+#~ msgid "Hexxagon (GTK)"
+#~ msgstr "Hexxagon (GTK)"
+
+#~ msgid "Othello clone"
+#~ msgstr "Clone do othello"
+
+#~ msgid "Hexxagon (text)"
+#~ msgstr "Hexxagon (texto)"
+
+#~ msgid "A solar system browser"
+#~ msgstr "Um browser do sistema solar"
+
+#~ msgid "Horgand"
+#~ msgstr "Horgand"
+
+#~ msgid "FM Organ Synthesizer"
+#~ msgstr "Sintetizador de Orgão FM"
+
+#~ msgid "Htmldoc"
+#~ msgstr "Htmldoc"
+
+#~ msgid "Converting Html files to PDF or PostScript"
+#~ msgstr "Converte ficheiros Html para PDF ou PostScript"
+
+#~ msgid "Hugin"
+#~ msgstr "Hugin"
+
+#~ msgid "A panorama tools GUI "
+#~ msgstr "Um panorama de ferramentas GUI"
+
+#~ msgid "Panoviewer"
+#~ msgstr "Panoviewer"
+
+#~ msgid "A panorama viewer"
+#~ msgstr "Um visualizador de panorama"
+
+#~ msgid "Hydrogen"
+#~ msgstr "Hidrogénio"
+
+#~ msgid "Drum Machine"
+#~ msgstr "Caixa de Tambor"
+
+#~ msgid "Infernal Contractor II"
+#~ msgstr "Infernal Contractor II"
+
+#~ msgid "ImgSeek"
+#~ msgstr "ImgSeek"
+
+#~ msgid "ImgSeek Photo Manager"
+#~ msgstr "ImgSeek Gestor de Fotos"
+
+#~ msgid "Im-Ja Configurator"
+#~ msgstr "Im-Ja Configurador"
+
+#~ msgid "Configurator for the GTK+2 Japanese Input Module"
+#~ msgstr "Configurador para o Módulo de Entrada Japonês GTK+2"
+
+#~ msgid "WYSIWYG layout program"
+#~ msgstr "Programa de disposição WYSIWYG "
+
+#~ msgid "Inkscape"
+#~ msgstr "Inkscape"
+
+#~ msgid "Vector graphic editor"
+#~ msgstr "Editor gráfico de vectores"
+
+#~ msgid "Inventory"
+#~ msgstr "Inventário"
+
+#~ msgid "Simple Inventory Program"
+#~ msgstr "Simples Programa de Inventário"
+
+#~ msgid "IV"
+#~ msgstr "IV"
+
+#~ msgid "Image browser"
+#~ msgstr "Browser de Imagens"
+
+#~ msgid "Drum machine styled audio sequencer"
+#~ msgstr "Sequenciador de áudio tipo o Drum machine"
+
+#~ msgid "JackEQ"
+#~ msgstr "JackEQ"
+
+#~ msgid "Live EQ console for JACK"
+#~ msgstr "Consola EQ ao vivo para JACK"
+
+#~ msgid "JackMix"
+#~ msgstr "JackMix"
+
+#~ msgid "Mixer for JACK audio server"
+#~ msgstr "Mixer para o servidor de áudio JACK"
+
+#~ msgid "JACK-Rack"
+#~ msgstr "JACK-Rack"
+
+#~ msgid "Effect rack"
+#~ msgstr "Efeitos de cremalheira"
+
+#~ msgid "Jahshaka"
+#~ msgstr "Jahshaka"
+
+#~ msgid "Video editing and effects"
+#~ msgstr "Edição de video e efeitos"
+
+#~ msgid "Jamboree"
+#~ msgstr "Jamboree"
+
+#~ msgid "Simple Music Player"
+#~ msgstr "Simples Leitor de Música"
+
+#~ msgid "JAMIN"
+#~ msgstr "JAMIN"
+
+#~ msgid "Audio mastering interface"
+#~ msgstr "Interface de mistura áudio"
+
+#~ msgid "Jigdo"
+#~ msgstr "Jigdo"
+
+#~ msgid "Jigsaw Download"
+#~ msgstr "Download Jigsaw"
+
+#~ msgid "Jools"
+#~ msgstr "Jools"
+
+#~ msgid "Graphical puzzle game"
+#~ msgstr "Jogo gráfico de puzzle"
+
+#~ msgid "Junkie"
+#~ msgstr "Junkie"
+
+#~ msgid "GTK2 ftp client"
+#~ msgstr "Cliente ftp GTK2"
+
+#~ msgid "KAConnect"
+#~ msgstr "KAConnect"
+
+#~ msgid "ALSA connections"
+#~ msgstr "Conexões ALSA"
+
+#~ msgid "Kalbum"
+#~ msgstr "Kalbum"
+
+#~ msgid "Create albums out of a collection of images"
+#~ msgstr "Cria albums a partir duma colecção de imagems"
+
+#~ msgid "Kapacity"
+#~ msgstr "Kapacity"
+
+#~ msgid "Kapacity battery monitor"
+#~ msgstr "Monitor de bateria Kapacity"
+
+#~ msgid "karamba"
+#~ msgstr "karamba"
+
+#~ msgid "A simple KDE Application"
+#~ msgstr "Uma simples aplicação KDE"
+
+#~ msgid "Karchiver"
+#~ msgstr "Karchiver"
+
+#~ msgid "Managing archive files"
+#~ msgstr "Gerir ficheiros de arquivo"
+
+#~ msgid "kasablanca"
+#~ msgstr "kasablanca"
+
+#~ msgid "Literature database"
+#~ msgstr "Base de dados de literatura"
+
+#~ msgid "Katoob"
+#~ msgstr "Katoob"
+
+#~ msgid "Light weight multilingual text editor that uses gtk2"
+#~ msgstr "Editor ligeiro de texto multilingual que usa gtk2"
+
+#~ msgid "KBarcode is a barcode and label printing application."
+#~ msgstr "KBarcode é uma aplicação barcode e de impressão de etiquetas"
+
+#~ msgid "Kbeam"
+#~ msgstr "Kbeam"
+
+#~ msgid "Infrared connection with devices"
+#~ msgstr "Conexão de infravermelhos com dispositivos"
+
+#~ msgid "KBudget is a budgeting and personal finance program for KDE"
+#~ msgstr "KBudget é um programa de gestão de finanças pessoais para KDE"
+
+#~ msgid "Kcdlabel"
+#~ msgstr "Kcdlabel"
+
+#~ msgid "KCDLabel is a program used to create covers for CD cases."
+#~ msgstr "KCDLabel é um programa usado para criar capas para caixas de CD."
+
+#~ msgid "Kcpuload"
+#~ msgstr "Kcpuload"
+
+#~ msgid "Small applet which displays cpu time for KDE kicker"
+#~ msgstr ""
+#~ "Mini-aplicação que exibe o tempo do processador na barra de tarefas do KDE"
+
+#~ msgid "Kdevmon"
+#~ msgstr "Kdevmon"
+
+#~ msgid "Kdiff3"
+#~ msgstr "Kdiff3"
+
+#~ msgid "Utility for comparing/merging up to three text files or directories"
+#~ msgstr ""
+#~ "Utilitário para comparar/fundir até três ficheiros de texto ou directorias"
+
+#~ msgid "KDirStat"
+#~ msgstr "KDirStat"
+
+#~ msgid "KEuroCalc"
+#~ msgstr "KEuroCalc"
+
+#~ msgid "A currency converter and calculator"
+#~ msgstr "Um conversor de moeda e calculadora"
+
+#~ msgid "Kexchange"
+#~ msgstr "Kâmbio"
+
+#~ msgid "Exchange rate and currency conversion program"
+#~ msgstr "Programa de taxas e conversão de moeda"
+
+#~ msgid "Kexi"
+#~ msgstr "Kexi"
+
+#~ msgid "A Database Management Application"
+#~ msgstr "Aplicação de gestão de bases de dados"
+
+#~ msgid "KFormDesigner"
+#~ msgstr "KFormDesigner"
+
+#~ msgid "KFileReplace"
+#~ msgstr "KFileReplace"
+
+#~ msgid "Search and Replace strings inside all files of a directory"
+#~ msgstr ""
+#~ "Procura e Substitui strings dentro de todos os ficheiros de uma directoria"
+
+#~ msgid "Fireworks3D (GL)"
+#~ msgstr "Fireworks3D (GL)"
+
+#~ msgid "KFLog"
+#~ msgstr "KFLog"
+
+#~ msgid "KFlog Flight Analysis"
+#~ msgstr "KFlog Análise de Vôo"
+
+#~ msgid "KGeography"
+#~ msgstr "KGeography"
+
+#~ msgid "KGGS"
+#~ msgstr "KGGS"
+
+#~ msgid "Play othello online"
+#~ msgstr "Jogar othello online"
+
+#~ msgid "A website downloader"
+#~ msgstr "Programa para transferir websites"
+
+#~ msgid "Wireless network configuration GUI"
+#~ msgstr "GUI da configuração da Rede Sem-Fios (wireless)"
+
+#~ msgid "Kiki the nanobot"
+#~ msgstr "Kiki o nanobot"
+
+#~ msgid "Integrated LaTeX Environment for KDE3"
+#~ msgstr "Ambiente LaTeX Integrado para KDE3"
+
+#~ msgid "Kimg2mpg"
+#~ msgstr "Kimg2mpg"
+
+#~ msgid "MPEG portfolio creator"
+#~ msgstr "Criador de portfolio MPEG"
+
+#~ msgid "KLCC"
+#~ msgstr "KLCC"
+
+#~ msgid "LineControl Client For KDE"
+#~ msgstr "Cliente LineControl para KDE"
+
+#~ msgid "Tools to configure modern keyboard with lineakd"
+#~ msgstr "Ferramentas para configurar os teclados modernos com lineakd"
+
+#~ msgid "Klogic"
+#~ msgstr "Klogic"
+
+#~ msgid "A digital circuit simulation"
+#~ msgstr "Um simulador de circuito digital"
+
+#~ msgid "KLVEmkdvd"
+#~ msgstr "KLVEmkdvd"
+
+#~ msgid "DVD authoring GUI"
+#~ msgstr "GUI de criação de DVD"
+
+#~ msgid "Kmasqdialer"
+#~ msgstr "Kmasqdialer"
+
+#~ msgid "KDE Client for the masqdialer modem server"
+#~ msgstr "Cliente KDE para o servidor de modem masqdialer"
+
+#~ msgid "KMediaGrab"
+#~ msgstr "KMediaGrab"
+
+#~ msgid "Video recorder and transcoder"
+#~ msgstr "Gravador de video e transcoder"
+
+#~ msgid "KMerlin"
+#~ msgstr "KMerlin"
+
+#~ msgid "A KDE MSN Messenger"
+#~ msgstr "Um MSN Messenger KDE"
+
+#~ msgid "KMess"
+#~ msgstr "KMess"
+
+#~ msgid "MSN Messenger Clone for KDE 3"
+#~ msgstr "Clone do MSN Messenger para KDE 3"
+
+#~ msgid "KMIDITracker"
+#~ msgstr "KMIDITracker"
+
+#~ msgid "MIDI Tracker"
+#~ msgstr "Analisador MIDI"
+
+#~ msgid "QT Molecule Viewer"
+#~ msgstr "Visualizador QT de Moléculas"
+
+#~ msgid "MPlayer frontend for KDE"
+#~ msgstr "Interface MPlayer para KDE"
+
+#~ msgid "KMyFirewall"
+#~ msgstr "KMyFirewall"
+
+#~ msgid "An IPTables based firewall configuration tool for the KDE."
+#~ msgstr ""
+#~ "Uma ferramente de configuração de firewall baseada em IPTables para KDE"
+
+#~ msgid "KMyMoney"
+#~ msgstr "KMyMoney"
+
+#~ msgid "Personal Finance Manager"
+#~ msgstr "Gestor de Finanças Pessoal"
+
+#~ msgid "Network Monitor"
+#~ msgstr "Monitor de Rede"
+
+#~ msgid "Monitor network interfaces"
+#~ msgstr "Monitoriza interfaces de rede"
+
+#~ msgid "KDE frontend to iptables"
+#~ msgstr "Interface KDE para iptables"
+
+#~ msgid "KNETLoad"
+#~ msgstr "KNETLoad"
+
+#~ msgid "Network loadmeter for KPanel, works with most devices."
+#~ msgstr ""
+#~ "Indicador de carga da Rede para o Kpanel, funciona com a maioria dos "
+#~ "dispositivos."
+
+#~ msgid "KNetmap"
+#~ msgstr "KNetmap"
+
+#~ msgid "KDE Network Mapper"
+#~ msgstr "Mapeador de Rede KDE"
+
+#~ msgid "Network Settings"
+#~ msgstr "Definições de Rede"
+
+#~ msgid "Configure your Network  settings"
+#~ msgstr "Configure as suas definições de Rede"
+
+#~ msgid "Configure Network settings"
+#~ msgstr "Configure as definições de Rede"
+
+#~ msgid "Knights"
+#~ msgstr "Knights"
+
+#~ msgid "A graphical chess interface"
+#~ msgstr "Um interface gráfico de xadrez"
+
+#~ msgid "Knoda - Database Front End"
+#~ msgstr "Knoda - Interface para Bases de Dados"
+
+#~ msgid "KnowIt"
+#~ msgstr "KnowIt"
+
+#~ msgid "KNutClient"
+#~ msgstr "KNutClient"
+
+#~ msgid "Client for NUT"
+#~ msgstr "Cliente para NUT"
+
+#~ msgid "Kodos"
+#~ msgstr "Kodos"
+
+#~ msgid "Visual regular expression editor"
+#~ msgstr "Editor expressões regulares Visual"
+
+#~ msgid "Kolourpaint"
+#~ msgstr "Kolourpaint"
+
+#~ msgid "Free and easy-to-use paint program for KDE"
+#~ msgstr "Programa de pintura livre e de fácil uso para KDE"
+
+#~ msgid "Komba2"
+#~ msgstr "Komba2"
+
+#~ msgid "Networkbrowser"
+#~ msgstr "Browser da Rede"
+
+#~ msgid "Komnibook"
+#~ msgstr "Komnibook"
+
+#~ msgid "KDE frontend for the omnibook kernel module"
+#~ msgstr "Interface do KDE para o modulo omnibook do kernel"
+
+#~ msgid "Komposé"
+#~ msgstr "Kompose"
+
+#~ msgid "An Apple Exposé like Taskmanager"
+#~ msgstr "Um expositor Apple tipo o Taskmanager"
+
+#~ msgid "konserve"
+#~ msgstr "konserve"
+
+#~ msgid "Konversation"
+#~ msgstr "Konversation"
+
+#~ msgid "Konversation is an irc client"
+#~ msgstr "Konversation é um cliente irc"
+
+#~ msgid "konvert"
+#~ msgstr "konvert"
+
+#~ msgid "XKoules"
+#~ msgstr "XKoules"
+
+#~ msgid "Space action game for X"
+#~ msgstr "Jogo de acção espacial para X"
+
+#~ msgid "KPopup"
+#~ msgstr "KPopup"
+
+#~ msgid "Send and receive WinPopup messages"
+#~ msgstr "Envia e Recebe mensagens Winpopup"
+
+#~ msgid "Amateur radio PSK31 application for KDE"
+#~ msgstr "Programa KDE para rádio amador PSK31"
+
+#~ msgid "Kradio"
+#~ msgstr "Kradio"
+
+#~ msgid "A V4L/V4L2-Radio Application"
+#~ msgstr "Um programa de rádio V4L/V4L2"
+
+#~ msgid "Query/manage game servers (CS, ET, ...)"
+#~ msgstr "Gerir servidores de jogos (CS, ET, ...)"
+
+#~ msgid "Krename"
+#~ msgstr "Krename"
+
+#~ msgid "A batch renamer"
+#~ msgstr "Programa para renomear"
+
+#~ msgid "Krusader"
+#~ msgstr "Krusader"
+
+#~ msgid "Twin-Panel File Manager"
+#~ msgstr "Gestor de Ficheiros de Painel Duplo"
+
+#~ msgid "KSalup"
+#~ msgstr "KSalup"
+
+#~ msgid "Local area network (LAN) messaging tool."
+#~ msgstr "Ferramenta para mensagens numa rede local (LAN)."
+
+#~ msgid "Samba Configuration"
+#~ msgstr "Configuração do Samba"
+
+#~ msgid "KcmSambaConf - a KControl module for configuring a samba server"
+#~ msgstr ""
+#~ "KcmSambaConf - um módulo do KControl para configurar um servidor Samba"
+
+#~ msgid "KScope"
+#~ msgstr "KScope"
+
+#~ msgid "KSendFax"
+#~ msgstr "KSendFax"
+
+#~ msgid "ksensors"
+#~ msgstr "KSensors"
+
+#~ msgid "KSetiSpy"
+#~ msgstr "KSetiSpy"
+
+#~ msgid "A SETI@home monitoring tool"
+#~ msgstr "Uma ferramenta de monitorização SETI@home"
+
+#~ msgid "Kshowmail"
+#~ msgstr "Kshowmail"
+
+#~ msgid "A powerful POP3 mail checker"
+#~ msgstr "Um poderoso verificador de correio POP3"
+
+#~ msgid "KSmoothDock"
+#~ msgstr "KSmoothDock"
+
+#~ msgid "Ksociograma"
+#~ msgstr "Ksociograma"
+
+#~ msgid "Technical application for teachers"
+#~ msgstr "Aplicação técnica para professores"
+
+#~ msgid "Kst"
+#~ msgstr "Kst"
+
+#~ msgid "Steak"
+#~ msgstr "Steak"
+
+#~ msgid "German/English dictionary"
+#~ msgstr "Dicionário Alemão/Inglês"
+
+#~ msgid "KStreamripper"
+#~ msgstr "KStreamripper"
+
+#~ msgid "Save streams"
+#~ msgstr "Guardar streams"
+
+#~ msgid "Touch Pad"
+#~ msgstr "Touch Pad"
+
+#~ msgid "configure your synaptics touch pad"
+#~ msgstr "configurar o seu touch pad ksynaptics"
+
+#~ msgid "A file tree browser"
+#~ msgstr "Um browser de ficheiros"
+
+#~ msgid "Kuake"
+#~ msgstr "Kuake"
+
+#~ msgid "Quake style Konsole"
+#~ msgstr "Konsole no estilo Quake"
+
+#~ msgid "Kugel"
+#~ msgstr "Kugel"
+
+#~ msgid "Kugel board game"
+#~ msgstr "Jogo de tabuleiro Kugel"
+
+#~ msgid "KVDR"
+#~ msgstr "KVDR"
+
+#~ msgid "Video Disk Recorder"
+#~ msgstr "Gravador de Vídeos no Disco"
+
+#~ msgid "KVIrc 3"
+#~ msgstr "KVIrc 3"
+
+#~ msgid "Connect to Internet Relay Chat"
+#~ msgstr "Conectar ao IRC (Internet Relay Chat)"
+
+#~ msgid "VLC KDE media player"
+#~ msgstr "VLC Leitor de média KDE"
+
+#~ msgid "Kvpn"
+#~ msgstr "Kvpn"
+
+#~ msgid "KDE frontend to vpnc"
+#~ msgstr "Interface KDE para o vpnc"
+
+#~ msgid "KWaveControl"
+#~ msgstr "KWaveControl"
+
+#~ msgid "Wireless networking GUI"
+#~ msgstr "GUI para redes sem fio"
+
+#~ msgid "Kxmleditor"
+#~ msgstr "Kxml Editor"
+
+#~ msgid "Kde XML editor"
+#~ msgstr "Editor XML do KDE"
+
+#~ msgid "Plotting and data analysis application"
+#~ msgstr "Programa de visualização e análise gráfica de dados"
+
+#~ msgid "LADCCA GUI"
+#~ msgstr "LADCCA GUI"
+
+#~ msgid "Jack/ALSA Session Manager"
+#~ msgstr "Gestor de Sessões Jack/ALSA"
+
+#~ msgid "LADCCA Synth"
+#~ msgstr "LADCCA Synth"
+
+#~ msgid "Simple Synthesizer"
+#~ msgstr "Simples Sintetizador"
+
+#~ msgid "Lavaps"
+#~ msgstr "Lavaps"
+
+#~ msgid "A graphical process viewer"
+#~ msgstr "Visualizador gráfico de processos"
+
+#~ msgid "LeaBook"
+#~ msgstr "LeaBook"
+
+#~ msgid "The Fabulous Lea Book"
+#~ msgstr "O Fabuloso Livro do Lea"
+
+#~ msgid "Leif"
+#~ msgstr "Leif"
+
+#~ msgid "LGeneral"
+#~ msgstr "LGeneral"
+
+#~ msgid "A Panzer General clone"
+#~ msgstr "Um clone do Panzer General"
+
+#~ msgid "Liferea"
+#~ msgstr "Liferea"
+
+#~ msgid "News aggregator simulating FeedReader"
+#~ msgstr "Agregador de fóruns simulando o FeedReader"
+
+#~ msgid "Lincity"
+#~ msgstr "Lincity"
+
+#~ msgid "A City Simulation Game"
+#~ msgstr "Um Jogo de simulação de uma Cidade"
+
+#~ msgid "French professional analytical accounting program"
+#~ msgstr "Programa analítico profissional de contabilidade francês"
+
+#~ msgid "LinCVS"
+#~ msgstr "LinCVS"
+
+#~ msgid "LinCVS is a graphical interface for cvs."
+#~ msgstr "LinCVS é um interface gráfico para cvs."
+
+#~ msgid "Links (hacked version)"
+#~ msgstr "Links (versão mudada)"
+
+#~ msgid "Lynx-like text/graphic WWW browser"
+#~ msgstr "Browser gráfico/textual WWW tipo o Lynx"
+
+#~ msgid "Places rectangular shapes."
+#~ msgstr "Coloca formas rectangulares"
+
+#~ msgid "LinPhone"
+#~ msgstr "LinPhone"
+
+#~ msgid "Voice over IP"
+#~ msgstr "Voz atravez de IP"
+
+#~ msgid "LinPopUp"
+#~ msgstr "LinPopUp"
+
+#~ msgid "A Linux enhanced port of winpopup"
+#~ msgstr "Uma porta Linux melhorada do winpopup"
+
+#~ msgid "LinTalk"
+#~ msgstr "LinTalk"
+
+#~ msgid "LAN Messaging"
+#~ msgstr "Mensagens na Rede Local (LAN)"
+
+#~ msgid "LinuxSMS"
+#~ msgstr "LinuxSMS"
+
+#~ msgid "Cool script to send SMS."
+#~ msgstr "Bom script para enviar SMS"
+
+#~ msgid "Liquidwar"
+#~ msgstr "Liquidwar"
+
+#~ msgid "A unique multiplayer wargame"
+#~ msgstr "Um jogo multi-jogador de guerra"
+
+#~ msgid "Graphical timeline editor"
+#~ msgstr "Editor gráfico de tempo"
+
+#~ msgid "GTK2 Video Editing System"
+#~ msgstr "Sistema de Edição de Video GTK2"
+
+#~ msgid "LPhoto"
+#~ msgstr "LPhoto"
+
+#~ msgid "LPhoto photo album"
+#~ msgstr "Álbum de fotos LPhoto"
+
+#~ msgid "LongPlayer"
+#~ msgstr "LongPlayer"
+
+#~ msgid "Playlist manager"
+#~ msgstr "Gestor de Listas de Músicas"
+
+#~ msgid "LSongs"
+#~ msgstr "LSongs"
+
+#~ msgid "LSongs media player"
+#~ msgstr "Leitor de média LSongs"
+
+#~ msgid "LTris"
+#~ msgstr "LTris"
+
+#~ msgid "Nice tetris clone"
+#~ msgstr "Bom clone do Tetris"
+
+#~ msgid "Luma"
+#~ msgstr "Luma"
+
+#~ msgid "KDE LDAP manager"
+#~ msgstr "Gestor de LDAP KDE"
+
+#~ msgid "Lumiere"
+#~ msgstr "Lumiere"
+
+#~ msgid "Video Player"
+#~ msgstr "Leitor de video"
+
+#~ msgid "Luola"
+#~ msgstr "Luola"
+
+#~ msgid "Fly a small V shaped ship in a 2D arcade game"
+#~ msgstr "Voe numa pequena nave em V num jogo 2D"
+
+#~ msgid "LVE"
+#~ msgstr "LVE"
+
+#~ msgid "Linux Video Editor"
+#~ msgstr "Editor de Vídeo Linux"
+
+#~ msgid "MadBomber"
+#~ msgstr "MadBomber"
+
+#~ msgid "Catch the bombs"
+#~ msgstr "Apanhe as bombas"
+
+#~ msgid "Madman, a music manager."
+#~ msgstr "Madman, um gestor de música"
+
+#~ msgid "Mammut"
+#~ msgstr "Mammut"
+
+#~ msgid "Fourier transform"
+#~ msgstr "Tranformação Fourier"
+
+#~ msgid "ManEdit"
+#~ msgstr "ManEdit"
+
+#~ msgid "UNIX manual pages editor"
+#~ msgstr "Editor de paginas de manual UNIX"
+
+#~ msgid "Marlin"
+#~ msgstr "Marlin"
+
+#~ msgid "A GNOME sample editor"
+#~ msgstr "Um editor de amostras GNOME"
+
+#~ msgid "MASConf"
+#~ msgstr "MASConf"
+
+#~ msgid "MAS Internet Conferencing"
+#~ msgstr "MAS Conferência por Internet"
+
+#~ msgid "MASMix"
+#~ msgstr "MASMix"
+
+#~ msgid "MAS Mixer"
+#~ msgstr "MAS Mixer"
+
+#~ msgid "MASPlayer"
+#~ msgstr "MAS Leitor"
+
+#~ msgid "MAS Audio Player"
+#~ msgstr "MAS Leitor de áudio"
+
+#~ msgid "Maxima"
+#~ msgstr "Maxima"
+
+#~ msgid "Tcl/Tk interface to Maxima"
+#~ msgstr "Interface Tcl/Tk para Maxima"
+
+#~ msgid "Gmdb"
+#~ msgstr "Gmdb"
+
+#~ msgid "GNOME MDB Viewer"
+#~ msgstr "Visualizador de MDB do GNOME"
+
+#~ msgid "Meld"
+#~ msgstr "Meld"
+
+#~ msgid "Meld is a GNOME 2 visual diff and merge tool"
+#~ msgstr "Meld é uma ferramenta GNOME 2 de visualização diff e integração"
+
+#~ msgid "Memprof"
+#~ msgstr "Memprof"
+
+#~ msgid "Tool for memory profiling and leak detection"
+#~ msgstr "Ferramenta para verificar a memória e detectar vazamentos"
+
+#~ msgid "Mergeant"
+#~ msgstr "Mergeant"
+
+#~ msgid "DBMS admin tool"
+#~ msgstr "Ferramenta de administração DBMS"
+
+#~ msgid "MGM"
+#~ msgstr "MGM"
+
+#~ msgid "System Monitor"
+#~ msgstr "Monitor do Sistema"
+
+#~ msgid "MHWaveEdit"
+#~ msgstr "MHWaveEdit"
+
+#~ msgid "WAV audio editor"
+#~ msgstr "Editor de áudio WAV"
+
+#~ msgid "Mirror Magic"
+#~ msgstr "Mirror Magic"
+
+#~ msgid "A puzzle game with mirrors and ray of lights"
+#~ msgstr "Um jogo de puzzle com espelhos e raios de luz"
+
+#~ msgid "Mixxx"
+#~ msgstr "Mixxx"
+
+#~ msgid "Digital DJ and mixing software"
+#~ msgstr "Software de mistura e DJ Digital"
+
+#~ msgid "Matroska Info"
+#~ msgstr "Matroska Info"
+
+#~ msgid "Shows information of Matroska video or audio files"
+#~ msgstr "Mostra informação dos ficheiros áudio ou vídeo Matroska"
+
+#~ msgid "Mkvmerge GUI"
+#~ msgstr "Mkvmerge GUI"
+
+#~ msgid "Create Matroska video or audio files"
+#~ msgstr "Cria ficheiros áudio ou vídeo Matroska"
+
+#~ msgid "Mlterm"
+#~ msgstr "Mlterm"
+
+#~ msgid "A multi-lingual terminal emulator"
+#~ msgstr "Programa de emulação de terminal multi-línguas"
+
+#~ msgid "MlView XML editor"
+#~ msgstr "Editor XML MlView"
+
+#~ msgid "Tree oriented XML editor"
+#~ msgstr "Editor XML em árvore"
+
+#~ msgid "GTK Text Editor"
+#~ msgstr "Editor de Texto GTK"
+
+#~ msgid "Molrender"
+#~ msgstr "Molrender"
+
+#~ msgid "Molecular Rendering GUI"
+#~ msgstr "GUI Mostrador de Moléculas"
+
+#~ msgid "Moneydrake"
+#~ msgstr "Moneydrake"
+
+#~ msgid "Mandrake Currency Converter"
+#~ msgstr "Conversor de Moeda Mandrake"
+
+#~ msgid "Monkey Bubble"
+#~ msgstr "Monkey Bubble"
+
+#~ msgid "Monkey Bubble Arcade Game"
+#~ msgstr "Jogo de Arcada Monkey Bubble"
+
+#~ msgid "MonoDevelop"
+#~ msgstr "MonoDevelop"
+
+#~ msgid "Full-featured IDE for mono and Gtk#"
+#~ msgstr "IDE complecto para mono e Gtk#"
+
+#~ msgid "Monodoc"
+#~ msgstr "Monodoc"
+
+#~ msgid "Monodoc Documentation Browser"
+#~ msgstr "Browser de Documentação Monodoc"
+
+#~ msgid "Monster Masher"
+#~ msgstr "Monster Masher"
+
+#~ msgid "Mash monsters and save the gnomes"
+#~ msgstr "Esmague monstros e salve os gnomos"
+
+#~ msgid "Mozilla Firefox"
+#~ msgstr "Mozilla Firefox"
+
+#~ msgid "The Mozilla Firefox project is a redesign of Mozilla's browser"
+#~ msgstr "O projecto Mozilla Firefox é uma evolução do browser Mozilla"
+
+#~ msgid "Mozilla Thunderbird"
+#~ msgstr "Mozilla Thunderbird"
+
+#~ msgid "Mozilla Thunderbird is a redesign of Mozilla's Mail/News Client"
+#~ msgstr "O Mozilla Thunderbird é uma evolução Cliente de Mail/News Mozilla"
+
+#~ msgid "Maitretarot Client"
+#~ msgstr "Cliente Maitretarot"
+
+#~ msgid "Xmtr"
+#~ msgstr "Xmtr"
+
+#~ msgid "Ping/Traceroute network diagnostic tool"
+#~ msgstr "Ferramenta de diagnostico rede por ping/traceroute"
+
+#~ msgid "Muine Music Player"
+#~ msgstr "Leitor de Música Muine"
+
+#~ msgid "Listen to your music"
+#~ msgstr "Ouça a Sua Música"
+
+#~ msgid "Multi-aterm"
+#~ msgstr "Multi-aterm"
+
+#~ msgid "Multi-Gnome-Terminal"
+#~ msgstr "Multi-Gnome-Terminal"
+
+#~ msgid "The Enhanced GNOME Terminal."
+#~ msgstr "O Terminal avançado GNOME"
+
+#~ msgid "MultiSync"
+#~ msgstr "MultiSync"
+
+#~ msgid "Integrates Multiple PIMs"
+#~ msgstr "Integra múltiplos PIMs (informações pessoais)"
+
+#~ msgid "MusE"
+#~ msgstr "MusE"
+
+#~ msgid "MIDI sequencer"
+#~ msgstr "Sequenciador MIDI"
+
+#~ msgid "Mandrake Update Notifications"
+#~ msgstr "Notificações de Actualização Mandrake"
+
+#~ msgid "A utility to notify you of updates to your Mandrake system"
+#~ msgstr ""
+#~ "Um utilitário para o notificar de actualizações para o seu sistema "
+#~ "Mandrake"
+
+#~ msgid "MySQLCC"
+#~ msgstr "MySQLCC"
+
+#~ msgid "MySQL Control Center"
+#~ msgstr "Centro de Controlo MySQL"
+
+#~ msgid "Nabi"
+#~ msgstr "Nabi"
+
+#~ msgid "Simple Hangul XIM"
+#~ msgstr "Simples Hangul XIM"
+
+#~ msgid "Natmonitor "
+#~ msgstr "Natmonitor "
+
+#~ msgid "This little utility monitor hosts bandwidth usage in your home lan."
+#~ msgstr ""
+#~ "Este pequeno utilitário monitoriza o uso da largura de banda de outras "
+#~ "máquinas na sua rede local."
+
+#~ msgid "Nessus"
+#~ msgstr "Nessus"
+
+#~ msgid "Nessus Security Scanner"
+#~ msgstr "Verificador de Segurança Nessus"
+
+#~ msgid "NetHack Falcon's Eye"
+#~ msgstr "NetHack Olho de Falcão"
+
+#~ msgid "netPanzer"
+#~ msgstr "netPanzer"
+
+#~ msgid "An online multiplayer tactical warfare game"
+#~ msgstr "Um jogo online multi-jogador de guerra táctica"
+
+#~ msgid "Neverball"
+#~ msgstr "Neverball"
+
+#~ msgid "Tilt the floor to roll the ball"
+#~ msgstr "Toque o chão para rodar a bola"
+
+#~ msgid "Neverputt"
+#~ msgstr "Neverputt"
+
+#~ msgid "Golf game based on neverball"
+#~ msgstr "Jogo de golfe baseado no neverball"
+
+#~ msgid "NiL"
+#~ msgstr "NiL"
+
+#~ msgid "NiL Isn't Liero"
+#~ msgstr "NiL não é Liero"
+
+#~ msgid "Notebook"
+#~ msgstr "Notebook"
+
+#~ msgid "GNOME logbook"
+#~ msgstr "logbook GNOME"
+
+#~ msgid "Noteedit"
+#~ msgstr "Noteedit"
+
+#~ msgid "NoteMeister"
+#~ msgstr "NoteMeister"
+
+#~ msgid "Notes and ideas organizer"
+#~ msgstr "Organizador de notas e ideias"
+
+#~ msgid "Nuclear Chess"
+#~ msgstr "Xadrez Nuclear"
+
+#~ msgid "Chess variant that cause surronding pieces to disappear"
+#~ msgstr "Variante de xadrez que faz desaparecer as peças que se rendem"
+
+#~ msgid "Overclocking tool for NVIDIA graphic boards"
+#~ msgstr "Ferramenta para acelerar as placas gráficas NVIDIA"
+
+#~ msgid "Nxtvepg"
+#~ msgstr "Nxtvepg"
+
+#~ msgid "NexTView EPG decoder and browser"
+#~ msgstr "NexTView Descodificador EPG e browser"
+
+#~ msgid "Octave"
+#~ msgstr "Octave"
+
+#~ msgid "High-level language for numerical computations"
+#~ msgstr "Uma linguagem de alto-nível para computação númerica"
+
+#~ msgid "OilWar"
+#~ msgstr "OilWar"
+
+#~ msgid "Very simple mouse shooting game"
+#~ msgstr "Jogo de tiro muito simples com o rato"
+
+#~ msgid "Simple personal account manager for KDE and KOffice"
+#~ msgstr "Simples gestor de contas pessoais para KDE e KOffice"
+
+#~ msgid "OpenGrade"
+#~ msgstr "OpenGrade"
+
+#~ msgid "Digital Gradebook"
+#~ msgstr "Livro de Notas Digital"
+
+#~ msgid "Orbital Eunuchs Sniper"
+#~ msgstr "Orbital Eunuchs Sniper"
+
+#~ msgid "Oxine"
+#~ msgstr "Oxine"
+
+#~ msgid "OSD Xine Video Player"
+#~ msgstr "Leitor de vídeo Xine OSD"
+
+#~ msgid "Panzers"
+#~ msgstr "Panzers"
+
+#~ msgid "A multiplayer 3D tank game"
+#~ msgstr "Um jogo multi-jogador de tanques de guerra em 3D"
+
+#~ msgid "Partimage"
+#~ msgstr "Partimage"
+
+#~ msgid "Passepartout"
+#~ msgstr "Passepartout"
+
+#~ msgid "Desktop Publishing for X (PAO)"
+#~ msgstr "Puúblicar o Desktop do X (PAO)"
+
+#~ msgid "Logical game"
+#~ msgstr "Jogo de lógica"
+
+#~ msgid "WWW file grabber"
+#~ msgstr "Apanha ficheiros WWW"
+
+#~ msgid "Peacock"
+#~ msgstr "Peacock"
+
+#~ msgid "Peacock is a HTML editor for Gnome."
+#~ msgstr "Peacock é um editor HTML para Gnome."
+
+#~ msgid "Penguin Command"
+#~ msgstr "Penguin Command"
+
+#~ msgid "A clone of the classic Missile Command game"
+#~ msgstr "Um clone do jogo clássico Missile Command"
+
+#~ msgid "PfaEdit"
+#~ msgstr "PfaEdit"
+
+#~ msgid "Emilia 3d Pinball"
+#~ msgstr "Pinball Emilia 3D"
+
+#~ msgid "Pingus"
+#~ msgstr "Pingus"
+
+#~ msgid "Pingus - A free Lemmings clone"
+#~ msgstr "Pingus - Um clone livre de Lemmings"
+
+#~ msgid "KPsion"
+#~ msgstr "KPsion"
+
+#~ msgid "My Psion PDA"
+#~ msgstr "O meu PDA Psion"
+
+#~ msgid "Psion Clipboard Utility"
+#~ msgstr "Psion Utilitário da Áre de Transferência"
+
+#~ msgid "Plucker Desktop"
+#~ msgstr "Plucker Desktop"
+
+#~ msgid "Plucker Graphical Interface"
+#~ msgstr "Interface Gráfico Plucker"
+
+#~ msgid "Poedit"
+#~ msgstr "Poedit"
+
+#~ msgid "Gettext translation file editor in wxGTK interface"
+#~ msgstr "Editor de catálogos de traduções gettext com interface wxGTK"
+
+#~ msgid "PolyXCalc"
+#~ msgstr "PolyXCalc"
+
+#~ msgid "Polymer calculation GUI"
+#~ msgstr "Polymer GUI para cálculos"
+
+#~ msgid "PolyXDef"
+#~ msgstr "PolyXDef"
+
+#~ msgid "Polymer design GUI"
+#~ msgstr "Polymer GUI de desenho"
+
+#~ msgid "PolyXEdit"
+#~ msgstr "PolyXEdit"
+
+#~ msgid "Polymer sequence editor"
+#~ msgstr "Editor de sequências Polymer"
+
+#~ msgid "POPFile - Automatic Email Classification"
+#~ msgstr "POPFile - Classificação Automática do Correio Electrónico"
+
+#~ msgid "An email classification tool with a Naive Bayes classifier."
+#~ msgstr ""
+#~ "Uma ferramenta para classificar email com o classificador Naive Bayes"
+
+#~ msgid "Potrace"
+#~ msgstr "Potrace"
+
+#~ msgid "Potracegui interface for potrace"
+#~ msgstr "Potracegui interface para o potrace"
+
+#~ msgid "A terminal emulator for the X11 Window System."
+#~ msgstr "Um emulador de terminal para o Sistema X11 Window"
+
+#~ msgid "Powertweak"
+#~ msgstr "Powertweak"
+
+#~ msgid "Powertweak GTK userinterface"
+#~ msgstr "Interface de utilizador GTK para o powertweak"
+
+#~ msgid "PrBooM"
+#~ msgstr "PrBooM"
+
+#~ msgid "An enhanced version of DooM - classic 3D shoot-em-up game."
+#~ msgstr "Uma versão melhorada do DooM - um jogo de tiro clássico em 3D."
+
+#~ msgid "PrBooM Multiplayer"
+#~ msgstr "PrBooM Multijogadores"
+
+#~ msgid "PrBooM Homepage"
+#~ msgstr "Homepage do PrBooM"
+
+#~ msgid "PrBooM-GL"
+#~ msgstr "PrBooM-GL"
+
+#~ msgid "PrBooM-GL Multiplayer"
+#~ msgstr "PrBooM-GL Multijogadores"
+
+#~ msgid "Perl RIO Util"
+#~ msgstr "Utilitário Perl RIO"
+
+#~ msgid "GUI for RIO MP3 player"
+#~ msgstr "GUI para o leitor de MP3 RIO"
+
+#~ msgid "PrismStumbler"
+#~ msgstr "PrismStumbler"
+
+#~ msgid "Find and connect to wireless networks"
+#~ msgstr "Procure e conecte a redes sem fio (wireless)"
+
+#~ msgid "GTK Mail Client"
+#~ msgstr "Cliente de Correio Eletrônico GTK"
+
+#~ msgid "Protux"
+#~ msgstr "Protux"
+
+#~ msgid "Multitrack digital audio suite"
+#~ msgstr "Editor multi-pistas de áudio digital"
+
+#~ msgid "ProzGUI"
+#~ msgstr "ProzGUI"
+
+#~ msgid "PSI"
+#~ msgstr "PSI"
+
+#~ msgid "PSI Jabber client using QT3"
+#~ msgstr "PSI cliente Jabber que usa QT3"
+
+#~ msgid "PSIndustrializer"
+#~ msgstr "PSIndustrializer"
+
+#~ msgid "Digital Percussion Creation"
+#~ msgstr "Criação de Percussões Digitais"
+
+#~ msgid "Putty"
+#~ msgstr "Putty"
+
+#~ msgid "Free SSH, Telnet and Rlogin client"
+#~ msgstr "Cliente livre para SSH, Telnet e Rlogin"
+
+#~ msgid "Pathetic Writer"
+#~ msgstr "Escritor Patético"
+
+#~ msgid "Siag Office Pathetic writer"
+#~ msgstr "Escritor Patético do Siag Office"
+
+#~ msgid "PWM"
+#~ msgstr "PWM"
+
+#~ msgid "PWM - A light window manager"
+#~ msgstr "PWM - Um gestor de janelas ligeiro"
+
+#~ msgid "Pybliographic"
+#~ msgstr "Pybliografia"
+
+#~ msgid "A tool for managing bibliographic databases"
+#~ msgstr "Uma ferramenta para gerir bases de dados bibliográficas"
+
+#~ msgid "pydance"
+#~ msgstr "pydance"
+
+#~ msgid "Dance Dance Revolution simulator"
+#~ msgstr "Dance Dance Simulador de revolução"
+
+#~ msgid "PyDict"
+#~ msgstr "PyDict"
+
+#~ msgid "An English/Chinese Dictionary written with python/gtk"
+#~ msgstr "Um dicionário Inglês/Chinês escrito com python/gtk"
+
+#~ msgid "Python controlled molecular graphics"
+#~ msgstr "Gráficos moleculares controlados com python"
+
+#~ msgid "Qalculate!"
+#~ msgstr "Qalculate"
+
+#~ msgid "Versatile desktop calculator"
+#~ msgstr "Calculadora versátil"
+
+#~ msgid "QAMix"
+#~ msgstr "QAMix"
+
+#~ msgid "ALSA Mixer"
+#~ msgstr "ALSA Mixer"
+
+#~ msgid "QARecord"
+#~ msgstr "QARecord"
+
+#~ msgid "ALSA recording GUI"
+#~ msgstr "GUI de gravação ALSA"
+
+#~ msgid "QDVDAuthor"
+#~ msgstr "QDVDAuthor"
+
+#~ msgid "DVD creator"
+#~ msgstr "Criador de DVD"
+
+#~ msgid "QFaxReader"
+#~ msgstr "QFaxReader"
+
+#~ msgid "Multipage TIFF viewer"
+#~ msgstr "Visualizador de TIFF multipáginas"
+
+#~ msgid "Qjackconnect"
+#~ msgstr "Qjackconnect"
+
+#~ msgid "Qt-based Jackit Connector"
+#~ msgstr "Conector Jackit baseado em Qt"
+
+#~ msgid "QJackCTL"
+#~ msgstr "QJackCTL"
+
+#~ msgid "Controls the JACK Audio daemon"
+#~ msgstr "Controla o daemon Áudio JACK"
+
+#~ msgid "QJoyPad"
+#~ msgstr "QJoyPad"
+
+#~ msgid "QJoyPad - Emulate keyboard or mouse actions with a joystick"
+#~ msgstr "QJoyPad - Emula acções do teclado ou do rato com um joystick"
+
+#~ msgid "Synaptics TouchPad"
+#~ msgstr "TouchPad da Synaptics"
+
+#~ msgid "A QT application to configure Synaptics TouchPad"
+#~ msgstr "Uma aplicação QT para configurar o TouchPad da Synaptics"
+
+#~ msgid "QSynth"
+#~ msgstr "QSynth"
+
+#~ msgid "Soft Synth GUI"
+#~ msgstr "GUI para Soft Synth"
+
+#~ msgid "QtRadio - listen to the radio with QtRadio."
+#~ msgstr "QtRadio - ouça rádio com QtRadio."
+
+#~ msgid "Quark"
+#~ msgstr "Quark"
+
+#~ msgid "Quark Music Player"
+#~ msgstr "Leitor de msica Quark"
+
+#~ msgid "Quat"
+#~ msgstr "Quat"
+
+#~ msgid "Generate 3D fractal objects"
+#~ msgstr "Gera objectos fraccionados 3D"
+
+#~ msgid "Quicklist"
+#~ msgstr "Quicklist"
+
+#~ msgid "Keep track of things"
+#~ msgstr "Guarda um histórico das coisas"
+
+#~ msgid "QuiteInsane"
+#~ msgstr "QuiteInsane"
+
+#~ msgid "QuiteInsane is a graphical scanning frontend for SANE"
+#~ msgstr "QuiteInsane é um interface de digitalização para o SANE"
+
+#~ msgid "QVCD"
+#~ msgstr "QVCD"
+
+#~ msgid "Video CD Creator"
+#~ msgstr "Criador de Vídeo CD"
+
+#~ msgid "RA Pai Gaw Poker"
+#~ msgstr "RA Pai Gaw Poker"
+
+#~ msgid "Poker-like card game"
+#~ msgstr "Jogo de cartas tipo Poker"
+
+#~ msgid "RapidSVN"
+#~ msgstr "RapidSVN"
+
+#~ msgid "GUI for Subversion"
+#~ msgstr "GUI para Subversion"
+
+#~ msgid "RasMol"
+#~ msgstr "RasMol"
+
+#~ msgid "Molecular Graphics Visualization Tool"
+#~ msgstr "Ferramenta de Visualização Gráfica de Moléculas"
+
+#~ msgid "RBBR"
+#~ msgstr "RBBR"
+
+#~ msgid "RuBy BRowser"
+#~ msgstr "Browser Ruby"
+
+#~ msgid "Regexxer"
+#~ msgstr "Regexxer"
+
+#~ msgid "GUI search/replace tool supporting Perl regular expression"
+#~ msgstr "GUI para procurar/substituir que suporta expressões regulares Perl"
+
+#~ msgid "Rekall"
+#~ msgstr "Rekall"
+
+#~ msgid "Rekall - KDE Database frontend"
+#~ msgstr "Rekall - Um interface KDE para Bases de Dados"
+
+#~ msgid "Rekall-runtime"
+#~ msgstr "Rekall-runtime"
+
+#~ msgid "Rekall - KDE Database frontend Rt version"
+#~ msgstr "Rekall - Um interface KDE para Bases de Dados versao Rt"
+
+#~ msgid "Revelation password manager"
+#~ msgstr "Revelation gestor de senhas"
+
+#~ msgid "Organize and secure your passwords"
+#~ msgstr "Organiza e guarda as suas senhas"
+
+#~ msgid "A graphical frontend to the grep command."
+#~ msgstr "Interface gráfico para o commando grep"
+
+#~ msgid "Rezound"
+#~ msgstr "Rezound"
+
+#~ msgid "Digital audio editor"
+#~ msgstr "Editor de áudio digital"
+
+#~ msgid "ripperX"
+#~ msgstr "ripperX"
+
+#~ msgid "RipperX can rip audio cd's and encode them to mp3's"
+#~ msgstr "RipperX pode extrair áudio dos CDs e codifica-los para mp3"
+
+#~ msgid "Data Plotting and Graphing"
+#~ msgstr "Gráficos de Dados"
+
+#~ msgid "Root-tail"
+#~ msgstr "Root-tail"
+
+#~ msgid "Root-tail prints text directly to a root window"
+#~ msgstr "Root-tail mostra texto directamente numa janela root"
+
+#~ msgid "File Manager of the ROX desktop environment"
+#~ msgstr "Gestor de Ficheiros do ambiente de trabalho ROX"
+
+#~ msgid "Sagasu text search tool"
+#~ msgstr "Sagusa ferramenta de procura de texto"
+
+#~ msgid "Search strings in multiple files"
+#~ msgstr "Procura strings em vários ficheiros"
+
+#~ msgid "Sakura Player"
+#~ msgstr "Leitor Sakura"
+
+#~ msgid "TFMX music player for KDE2"
+#~ msgstr "Leitor de música TFMX para KDE2"
+
+#~ msgid "Sawfish"
+#~ msgstr "Sawfish"
+
+#~ msgid "Sawfish WindowManager"
+#~ msgstr "Gestor de Janelas Sawfish"
+
+#~ msgid "Scaffold Development Environment"
+#~ msgstr "Ambiente de Programaç o Scaffold"
+
+#~ msgid "Develop software in an integrated environment"
+#~ msgstr "Desenvolva software num ambiente integrado"
+
+#~ msgid "Scid"
+#~ msgstr "Scid"
+
+#~ msgid "Chess games database"
+#~ msgstr "Base de dados de jogos de Xadrez"
+
+#~ msgid "SciGraphica"
+#~ msgstr "SciGraphica"
+
+#~ msgid "Data Plotting and Visualization"
+#~ msgstr "Visualização gráfica de Dados"
+
+#~ msgid "Scilab"
+#~ msgstr "Scilab"
+
+#~ msgid "Environment for numerical computations"
+#~ msgstr "Ambiente para computaçSonuméricoa"
+
+#~ msgid "Scintilla Text Editor"
+#~ msgstr "Editor de Texto Scintilla"
+
+#~ msgid "Scorched 3D"
+#~ msgstr "Scorched 3D"
+
+#~ msgid "Scorched Earth 3D OpenGL Remake"
+#~ msgstr "Versão 3D do jogo Scorched Earth"
+
+#~ msgid "Scotty-tkined"
+#~ msgstr "Scotty-tkined"
+
+#~ msgid "Scotty-tkined network editor"
+#~ msgstr "Editor de rede Scotty-tkined"
+
+#~ msgid "A Bomberman clone"
+#~ msgstr "Um clone do Bomberman"
+
+#~ msgid "SDLRoids"
+#~ msgstr "SDLRoids"
+
+#~ msgid "SDLRoids - an enhanced shoot-the-asteroids"
+#~ msgstr "SDLRoids - um jogo melhorado do atira-aos-asteroides"
+
+#~ msgid "GPG Keys Manager"
+#~ msgstr "Gestor de Chaves GPG"
+
+#~ msgid "Manage your GPG keys"
+#~ msgstr "Gira as suas chaves GPG"
+
+#~ msgid "PGP Preferences"
+#~ msgstr "Preferências PGP"
+
+#~ msgid "Configure PGP"
+#~ msgstr "Configurar PGP"
+
+#~ msgid "Search and Rescue"
+#~ msgstr "Procurar e Salvar"
+
+#~ msgid "The Search and Rescue helicopter simulator"
+#~ msgstr "O simulador de helicóptero Procurar e Salvar"
+
+#~ msgid "SegusoLand"
+#~ msgstr "SegusoLand"
+
+#~ msgid "Execute tasks by gradually narrowing options"
+#~ msgstr "Executa tarefas ao estreitar opções gradualmente"
+
+#~ msgid "Seq24"
+#~ msgstr "Seq24"
+
+#~ msgid "Loop-based MIDI sequencer"
+#~ msgstr "Sequenciador MIDI baseado em loop"
+
+#~ msgid "SoundFontCombi"
+#~ msgstr "SoundFontCombi"
+
+#~ msgid "MIDI event mixer"
+#~ msgstr "Mixer de eventos MIDI"
+
+#~ msgid "SheepShaver"
+#~ msgstr "SheepShaver"
+
+#~ msgid "A MacOS run-time environment"
+#~ msgstr "Um executor em ambiente MacOS"
+
+#~ msgid "Showimg"
+#~ msgstr "Showimg"
+
+#~ msgid "A picture viewer for KDE"
+#~ msgstr "Um visualizador de fotos para KDE"
+
+#~ msgid "Xfiler"
+#~ msgstr "Xfiler"
+
+#~ msgid "Siag File manager"
+#~ msgstr "Gestor de Ficheiros Siag"
+
+#~ msgid "Xedplus"
+#~ msgstr "Xedplus"
+
+#~ msgid "Siag text editor"
+#~ msgstr "Editor de texto Siag"
+
+#~ msgid "Gvu"
+#~ msgstr "Gvu"
+
+#~ msgid "Siag Postscript viewer"
+#~ msgstr "Visualizador de PostScript Siag"
+
+#~ msgid "Silc-client"
+#~ msgstr "Silc-cliente"
+
+#~ msgid "Client for the secure Internet Live Conferencing (SILC) protocol"
+#~ msgstr ""
+#~ "Cliente para o protocolo (SILC) de Conferencia Segura ao vivo por "
+#~ "Internet "
+
+#~ msgid "SIM"
+#~ msgstr "SIM"
+
+#~ msgid "Simple Instant Messenger."
+#~ msgstr "Simples Mensageiro Instantâneo"
+
+#~ msgid "Sim (for KDE)"
+#~ msgstr "Sim (para KDE)"
+
+#~ msgid "ICQ-client"
+#~ msgstr "Cliente ICQ"
+
+#~ msgid "SimpleCDR-X"
+#~ msgstr "SimplesCDR-X"
+
+#~ msgid "SimSam"
+#~ msgstr "SimSam"
+
+#~ msgid "Simple Sampler"
+#~ msgstr "Simples Sampler"
+
+#~ msgid "Sirius"
+#~ msgstr "Sirius"
+
+#~ msgid "An othello chess"
+#~ msgstr "Um jogo de xadros thello"
+
+#~ msgid "Snd"
+#~ msgstr "Snd"
+
+#~ msgid "Freeware sound editor"
+#~ msgstr "Editor lFreeware de Som"
+
+#~ msgid "Open Ski Jumping"
+#~ msgstr "Open Ski Jumping"
+
+#~ msgid "Slune"
+#~ msgstr "Slune"
+
+#~ msgid "A multiplayer 3D racing and car-crashing game in Python"
+#~ msgstr ""
+#~ "Um jogo multi-jogadores 3D de corridas e acidentes de carros em Python"
+
+#~ msgid "Gsmtprc "
+#~ msgstr "Gsmtprc "
+
+#~ msgid "The graphical frontend for smtprc."
+#~ msgstr "Um interface gráfico para smtprc"
+
+#~ msgid "GPL sound font editor"
+#~ msgstr "Editor GPL de tipos de sons"
+
+#~ msgid "SnackAmp"
+#~ msgstr "SnackAmp"
+
+#~ msgid "Music player"
+#~ msgstr "Leitor de música"
+
+#~ msgid "Sodipodi"
+#~ msgstr "Sodipodi"
+
+#~ msgid "Sodipodi Vector Graphics Viewer"
+#~ msgstr "Visualizador de Grficos Vectoriais Sodipodi"
+
+#~ msgid "SolarWolf"
+#~ msgstr "SolarWolf"
+
+#~ msgid "2D frantic arcade game of collecting boxes and dodging bullets"
+#~ msgstr "Jogo de arcade 2D de colecionarcaixas e oevitarbalas"
+
+#~ msgid "Solfege"
+#~ msgstr "Solfege"
+
+#~ msgid "Ear Training"
+#~ msgstr "Treino de Orelha"
+
+#~ msgid "Songs"
+#~ msgstr "Songs"
+
+#~ msgid "Multitrack wave editor"
+#~ msgstr "Editor áudio multi-pistas"
+
+#~ msgid "Songwrite"
+#~ msgstr "Songwrite"
+
+#~ msgid "Guitar TAB editor"
+#~ msgstr "Editor de Tabelas para Guitarra"
+
+#~ msgid "A module tracker"
+#~ msgstr "Um seguidor de módulos"
+
+#~ msgid "SpaceAryarya-KXL"
+#~ msgstr "SpaceAryarya-KXL"
+
+#~ msgid "2D/3D scrolling arcade shooter"
+#~ msgstr "Jogo de tiro arcada em 2D/3D"
+
+#~ msgid "Grass (Spearfish)"
+#~ msgstr "Grass (Spearfish)"
+
+#~ msgid "Grass using the Spearfish sample data set"
+#~ msgstr "Grass usando as definiçdes de dados de amostrasSpearfish"
+
+#~ msgid "Specimen"
+#~ msgstr "Specimen"
+
+#~ msgid "MIDI software sampler"
+#~ msgstr "Software de amostras MIDI"
+
+#~ msgid "SpiralLoops"
+#~ msgstr "SpiralLoops"
+
+#~ msgid "Synthesized Loops"
+#~ msgstr "Loops Sintetizados"
+
+#~ msgid "SpiralSynth"
+#~ msgstr "SpiralSynth"
+
+#~ msgid "Software Synthesizer"
+#~ msgstr "Software Sintetizador"
+
+#~ msgid "Spiral Modular Synth"
+#~ msgstr "Sintetizador modular de espirais"
+
+#~ msgid "Spiral Modular Software Synthesizer"
+#~ msgstr "Software sintetizador modular de espirais"
+
+#~ msgid "Record sporting activities"
+#~ msgstr "Regista actividades desportivas"
+
+#~ msgid "Sqlgui"
+#~ msgstr "Sqlgui"
+
+#~ msgid "Squaroid"
+#~ msgstr "Squaroid"
+
+#~ msgid "A game about making squares"
+#~ msgstr "Um jogo sobre como fazer quadrados"
+
+#~ msgid "Ssc"
+#~ msgstr "Ssc"
+
+#~ msgid "Arcade space game"
+#~ msgstr "Jogo de Arcade no Espaço"
+
+#~ msgid "Project: Starfighter"
+#~ msgstr "Project: Starfighter"
+
+#~ msgid "Star Voyager"
+#~ msgstr "Star Voyager"
+
+#~ msgid "Space Exploration Game"
+#~ msgstr "Jogo de Exploração do Espaço"
+
+#~ msgid "Stellarium"
+#~ msgstr "Stellarium"
+
+#~ msgid "3D Planetarium"
+#~ msgstr "Planetarium 3D"
+
+#~ msgid "Stickers"
+#~ msgstr "Stickers"
+
+#~ msgid "Sticker"
+#~ msgstr "Sticker"
+
+#~ msgid "StompBoxes"
+#~ msgstr "StompBoxes"
+
+#~ msgid "This is Stompboxes2, a real-time audio effects processor."
+#~ msgstr ""
+#~ "Isto é o Stompboxes2, um processador de efeitos áudio em tempo-real."
+
+#~ msgid "Straw"
+#~ msgstr "Straw"
+
+#~ msgid "RSS feed agregator for Gnome"
+#~ msgstr "Um agregador de RSS para Gnome"
+
+#~ msgid "StreamTuner"
+#~ msgstr "StreamTuner"
+
+#~ msgid "Audio Stream Browser"
+#~ msgstr "Browser de diffusões áudio"
+
+#~ msgid "Sulu"
+#~ msgstr "Sulu"
+
+#~ msgid "GUI for Samsung Uproar and Yepp"
+#~ msgstr "GUI para Samsung Uproar e Yepp"
+
+#~ msgid "SuperKaramba"
+#~ msgstr "SuperKaramba"
+
+#~ msgid "An engine for cool desktop eyecandy."
+#~ msgstr "Um motor para um bonito ambiente de trabalho."
+
+#~ msgid "VLC skinned GUI media player"
+#~ msgstr "Leitor de média VLC com GUI"
+
+#~ msgid "Swami"
+#~ msgstr "Swami"
+
+#~ msgid "Sound Font editor"
+#~ msgstr "Editor de Fontes de Som"
+
+#~ msgid "Sound editor"
+#~ msgstr "Editor de Som"
+
+#~ msgid "A fast GTK+ based Mail client"
+#~ msgstr "Um rápido cliente de Mail em GTK+"
+
+#~ msgid "A fast GTK+2 based Mail client"
+#~ msgstr "Um rápido cliente de Mail em GTK+2"
+
+#~ msgid "Sylpheed Claws"
+#~ msgstr "Sylpheed Claws"
+
+#~ msgid "Enhanced version of the Sylpheed e-mail client"
+#~ msgstr "Versão melhorada do cliente de e-mail Sylpheed"
+
+#~ msgid "Synaptic"
+#~ msgstr "Synaptic"
+
+#~ msgid "Graphical front end to apt. "
+#~ msgstr "Interface gráfico para apt. "
+
+#~ msgid "Proc Configuration"
+#~ msgstr "Configuração Proc"
+
+#~ msgid "A tool for tuning kernel parameters."
+#~ msgstr "Uma ferramenta para optimizar os parâmetros do kernel"
+
+#~ msgid "Quick-configure menu"
+#~ msgstr "Menu configuração-rápida"
+
+#~ msgid "Ted"
+#~ msgstr "Ted"
+
+#~ msgid "Ted, Rich Text Processor"
+#~ msgstr "Ted, Processador de Texto Formatado"
+
+#~ msgid "Ted Rich Text Editor"
+#~ msgstr "Editor de Texto Formatado"
+
+#~ msgid "Tenes Emapandas Graciela"
+#~ msgstr "Tenes Empanadas Graciela"
+
+#~ msgid "Clone of a Risk clone"
+#~ msgstr "Clone de um clone de Risk"
+
+#~ msgid "TerminatorX"
+#~ msgstr "TerminatorX"
+
+#~ msgid "Sythesizer with scratching"
+#~ msgstr "Sintetizador com scratch"
+
+#~ msgid "TeXmacs editor"
+#~ msgstr "Editor TeXmacs"
+
+#~ msgid "A WYSIWYG scientific text editor"
+#~ msgstr "Um editor WYSIWYG de textos cientificos"
+
+#~ msgid "A power latex editor"
+#~ msgstr "Um potente editor para latex"
+
+#~ msgid "TiLP"
+#~ msgstr "TiLP"
+
+#~ msgid "Transfer data between computers and TI calculators"
+#~ msgstr "Transfere dados entre computadores e calculadoras TI"
+
+#~ msgid "JACK TimeMachine"
+#~ msgstr "JACK Máquina do Tempo"
+
+#~ msgid "Records audio from ten seconds ago"
+#~ msgstr "Grava áudio de há dez segundos atras"
+
+#~ msgid "TKEca"
+#~ msgstr "TKEca"
+
+#~ msgid "Multitrack Audio Recorder"
+#~ msgstr "Gravador Áudio Multipistas"
+
+#~ msgid "A mail agent"
+#~ msgstr "Um agente de correio eletrônico"
+
+#~ msgid "tksysv"
+#~ msgstr "tksysv"
+
+#~ msgid "Edit Runlevel services"
+#~ msgstr "Edita serviços Runlevel"
+
+#~ msgid "TN5250"
+#~ msgstr "TN5250"
+
+#~ msgid "IBM 5250 Terminal Emulator"
+#~ msgstr "Emulador de Terminal IBM 5250"
+
+#~ msgid "TORCS"
+#~ msgstr "TORCS"
+
+#~ msgid "The Open Racing Car Simulator"
+#~ msgstr "O Simulador Livre de Carros de Corrida"
+
+#~ msgid "Trackpoint Settings"
+#~ msgstr "Configurações do Trackpoint"
+
+#~ msgid "Trackpoint settings"
+#~ msgstr "Configurações do Trackpoint"
+
+#~ msgid "Trackballs"
+#~ msgstr "Trackballs"
+
+#~ msgid "A Marble Madness-like game"
+#~ msgstr "Um jogo tipo o Marble Madness"
+
+#~ msgid "TradeClient"
+#~ msgstr "TradeClient"
+
+#~ msgid "Email Client with PIM features for X"
+#~ msgstr "Cliente de Email com opções PIM para o X"
+
+#~ msgid "Transcriber"
+#~ msgstr "Transcriber"
+
+#~ msgid "A sound editor based on Tcl/Tk"
+#~ msgstr "Um editor de som baseado em Tcl/Tk"
+
+#~ msgid "Terminal Server Client"
+#~ msgstr "Cliente de Servidor de Terminais"
+
+#~ msgid "Frontend for rdesktop"
+#~ msgstr "Interface para rdesktop"
+
+#~ msgid "Tsemgr"
+#~ msgstr "Tsemgr"
+
+#~ msgid "SonyEricsson T68 controller"
+#~ msgstr "Controlador do SonyEricsson T68"
+
+#~ msgid "Tulip"
+#~ msgstr "Tulip"
+
+#~ msgid "A 3D graph program"
+#~ msgstr "Um programa de gráficos em 3D"
+
+#~ msgid "Tutka"
+#~ msgstr "Tutka"
+
+#~ msgid "Tracker-style sequencer"
+#~ msgstr "Sequênciador estilo oTracker"
+
+#~ msgid "Tuxedo Quest"
+#~ msgstr "Tuxedo Quest"
+
+#~ msgid "Tuxedo T. Penguin: A Quest For Herring"
+#~ msgstr "Tuxedo T. Penguin: Uma Pergunta para o Herring"
+
+#~ msgid "Karting with tux"
+#~ msgstr "Fazer kart com o Tux"
+
+#~ msgid "Tux Paint"
+#~ msgstr "Tux Paint"
+
+#~ msgid "Tux Paint: a drawing program for children."
+#~ msgstr "Tux Paint: um programa de desenho para crianças"
+
+#~ msgid "Tuxpuck"
+#~ msgstr "Tuxpuck"
+
+#~ msgid "Clone of ShufflePuck Cafe"
+#~ msgstr "Clone do ShufflePuck Cafe"
+
+#~ msgid "TuxSaver (GL)"
+#~ msgstr "TuxSaver (GL)"
+
+#~ msgid "UFO"
+#~ msgstr "OVNI"
+
+#~ msgid "UFO: Alien Invasion"
+#~ msgstr "OVNI : a invasão dos extra-terrestres"
+
+#~ msgid "Ur-Quan Masters"
+#~ msgstr "Mestres Ur-Quan"
+
+#~ msgid "The Ur-Quan Masters"
+#~ msgstr "Os Mestres Ur-Quan"
+
+#~ msgid "Urlgfe"
+#~ msgstr "Urlgfe"
+
+#~ msgid "A download manager"
+#~ msgstr "Gestor de downloads"
+
+#~ msgid "Vega Strike"
+#~ msgstr "Vega Strike"
+
+#~ msgid "A free 3D space fight simulator"
+#~ msgstr "Um simulador livre de combate espacial"
+
+#~ msgid "Velocity"
+#~ msgstr "Velocity"
+
+#~ msgid "File manager for GNOME"
+#~ msgstr "Gestor de Ficheiros para GNOME"
+
+#~ msgid "Vertex"
+#~ msgstr "Vertex"
+
+#~ msgid "3D model assembler"
+#~ msgstr "Assembler de modelos 3D"
+
+#~ msgid "VICE"
+#~ msgstr "VICE"
+
+#~ msgid "C64 Emulator"
+#~ msgstr "Emulador do C64"
+
+#~ msgid "Commodore 64 Emulator"
+#~ msgstr "Emulador do Commodore 64"
+
+#~ msgid "C128 Emulator"
+#~ msgstr "Emulador do C128"
+
+#~ msgid "Commodore 128 Emulator"
+#~ msgstr "Emulador do Commodore C128"
+
+#~ msgid "PET Emulator"
+#~ msgstr "Emulador do PET"
+
+#~ msgid "Commodore PET Emulator"
+#~ msgstr "Emulador do Commodore PET"
+
+#~ msgid "VIC 20 Emulator"
+#~ msgstr "Emulador do VIC 20"
+
+#~ msgid "Commodore VIC 20 Emulator"
+#~ msgstr "Emulador do Commodore VIC 20"
+
+#~ msgid "CBM2 Emulator"
+#~ msgstr "Emulador do CBM2"
+
+#~ msgid "Commodore BM 2 Emulator"
+#~ msgstr "Emulador do Commodore BM 2"
+
+#~ msgid "CPLUS4 Emulator"
+#~ msgstr "Emulador do CPLUS4"
+
+#~ msgid "Commodore PLUS4 Emulator"
+#~ msgstr "Emulador do Commodore PLUS4"
+
+#~ msgid "VICE disk image tool"
+#~ msgstr "VICE ferramenta de imagem de disco"
+
+#~ msgid "C1541 stand alone disk image maintenance program"
+#~ msgstr "C1541 ferramenta autónoma de gestão de imagem de disco"
+
+#~ msgid "VSID music player"
+#~ msgstr "Leitor de música VSID"
+
+#~ msgid "VICE SID music player for Commodore tunes"
+#~ msgstr "VICE SID leitor de música para tipos Commodore"
+
+#~ msgid "GUI Interface for Chemistry Software"
+#~ msgstr "Interface GUI para Software Químico"
+
+#~ msgid "Vigor"
+#~ msgstr "Vigor"
+
+#~ msgid "The popular Unix editor vi with the addition of the Vigor Assistant"
+#~ msgstr "O porpular editor Unix vi com a adição do assistente Vigor"
+
+#~ msgid "Viking"
+#~ msgstr "Viking"
+
+#~ msgid "GPS data manager"
+#~ msgstr "Gestor de Dados GPS"
+
+#~ msgid "On-screen ALSA MIDI keyboard"
+#~ msgstr "Teclado ALSA MIDI no ecrã"
+
+#~ msgid "VLC media player"
+#~ msgstr "Leitor de média VLC"
+
+#~ msgid "VOCP (VOCP Graphical voice message retrieval)"
+#~ msgstr "VOCP (VOCP recuperador gráfico de mensagens de voz)"
+
+#~ msgid ""
+#~ "Xvocp presents a graphical user interface to the contents of voice mail "
+#~ "boxes."
+#~ msgstr ""
+#~ "Xvocp apresenta um interface gráfico para os conteúdos das caixas de "
+#~ "correio em voz."
+
+#~ msgid "Boxconf (VOCP Box Configuration interface)"
+#~ msgstr "Boxconf (Interface de configuração para as caixas VOCP)"
+
+#~ msgid ""
+#~ "Boxconf presents a graphical user interface used to administer the VOCP "
+#~ "system box configuration."
+#~ msgstr ""
+#~ "Boxconf apresenta um interface gráfico usado para administrar a "
+#~ "configuração das caixas do sistema VOCP."
+
+#~ msgid "Callcenter (VOCP Call Center)"
+#~ msgstr "Callcenter (Centro de chamadas VOCP)"
+
+#~ msgid ""
+#~ "The VOCP call center is meant to be an \"always on\" call monitor and to "
+#~ "give quick access to other VOCP GUIs and your call log."
+#~ msgstr ""
+#~ "O centro de chamadas VOCP é feito para ser um monitor de chamadas "
+#~ "\"sempre ligado\" e para dar um acesso rápido a outros GUIs VCOP e ao "
+#~ "registo das suas chamadas."
+
+#~ msgid "VOCPhax (VOCP Fax Viewer and Sender GUI)"
+#~ msgstr "VOCPhax (GUI para visualizar e enviar faxes VOCP)"
+
+#~ msgid ""
+#~ "VOCPhax presents a (hopefully) friendly and intuitive graphical interface "
+#~ "to view and send faxes."
+#~ msgstr ""
+#~ "VOCPhax apresenta um (esperamos) amigável e intuitivo interface gráfico "
+#~ "para ver e enviar faxes."
+
+#~ msgid "VOCPweb (VOCP Web Remote Message Retrieval)"
+#~ msgstr "VOCPweb (VOCP Restaurador de Mensages Web Remoto)"
+
+#~ msgid ""
+#~ "VOCPweb allows you to log on to the VOCP voice messaging system and "
+#~ "retrieve messages through a browser."
+#~ msgstr ""
+#~ "VOCPweb permite-lhe ligar ao sistema de mensagens de voz VOCP e recuperar "
+#~ "mensagens através de um browser."
+
+#~ msgid "Volume knob"
+#~ msgstr "Volume knob"
+
+#~ msgid "Main Volume control dockapp"
+#~ msgstr "Principal Controlador do volume na barra de tarefas"
+
+#~ msgid "W3m"
+#~ msgstr "W3m"
+
+#~ msgid "Pager that can also be used as textbased webbrowser"
+#~ msgstr "Pager que pode também ser usado como webbrowser em modo texto"
+
+#~ msgid "Waimea"
+#~ msgstr "Waimea"
+
+#~ msgid "Waimea window manager."
+#~ msgstr "Gestores de Janelas Waimea"
+
+#~ msgid "WaveSurfer"
+#~ msgstr "WaveSurfer"
+
+#~ msgid "Graphical sound editor"
+#~ msgstr "Editor de sons gráfico"
+
+#~ msgid "Sound visualization and manipulation"
+#~ msgstr "Visualização e manipulação de Som"
+
+#~ msgid "User-friendly IDE"
+#~ msgstr "IDE de uso simples"
+
+#~ msgid "Battle For Wesnoth"
+#~ msgstr "Batalha para Wesnoth"
+
+#~ msgid "A fantasy turn-based strategy game."
+#~ msgstr "Um jogo fantasia baseado em estratégia."
+
+#~ msgid "Battle For Wesnoth editor"
+#~ msgstr "Editor do Batalha para Wesnoth"
+
+#~ msgid "The map editor of Battle for Wesnoth"
+#~ msgstr "Editor de mapas do Batalha para Wesnoth"
+
+#~ msgid "Mp3 player"
+#~ msgstr "Leitor Mp3"
+
+#~ msgid "Widelands"
+#~ msgstr "Widelands"
+
+#~ msgid "Settlers II clone"
+#~ msgstr "Clone do Settlers II"
+
+#~ msgid "Win4Lin"
+#~ msgstr "Win4Lin"
+
+#~ msgid "Win4Lin Configuration"
+#~ msgstr "Win4Lin Configuração"
+
+#~ msgid "Win4Lin full-screen"
+#~ msgstr "Win4Lin em ecrã complecto"
+
+#~ msgid "Win4Lin in a new X server (full screen)"
+#~ msgstr "Win4Lin num novo servidor X (ecrâ complecto)"
+
+#~ msgid "WLanFE"
+#~ msgstr "WLanFE"
+
+#~ msgid "Wireless LAN Configuration"
+#~ msgstr "Configuração LAN Wireless"
+
+#~ msgid "WmApm"
+#~ msgstr "WmApm"
+
+#~ msgid "Battery/Power status monitor in a small icon"
+#~ msgstr "Monitor do estado da Bateria num pequeno ícone"
+
+#~ msgid "Wmcoincoin"
+#~ msgstr "Wmcoincoin"
+
+#~ msgid "WindowMaker dock application for linuxfr-addicted people"
+#~ msgstr "Aplicação dock WindowMaker para os amadores de linuxfr"
+
+#~ msgid "WmCPULoad"
+#~ msgstr "WmCPULoad"
+
+#~ msgid "CPU monitoring in a dockapp"
+#~ msgstr "Monitorização do processador na barra de tarefas"
+
+#~ msgid "WmCube"
+#~ msgstr "WmCube"
+
+#~ msgid "A realtime rotating 3d-object and CPU load in a small icon"
+#~ msgstr ""
+#~ "Um objecto 3D rotativo em tempo real e a carga do CPU num pequeno ícone"
+
+#~ msgid "WmDf"
+#~ msgstr "WmDf"
+
+#~ msgid "Disk I/O and space monitoring dockapp"
+#~ msgstr "Monitorização de I/O e espaço nos discos na barra de tarefas"
+
+#~ msgid "WmFire"
+#~ msgstr "WmFire"
+
+#~ msgid "A dock.app that displays CPU load as fire in a small icon"
+#~ msgstr ""
+#~ "Uma aplicação na barra de tarefas que mostra a carga do CPU como fogo num "
+#~ "pequeno ícone"
+
+#~ msgid "WmFishTime"
+#~ msgstr "WmFishTime"
+
+#~ msgid "Analog clock in a tank fish"
+#~ msgstr "Relógio analógico num aquário"
+
+#~ msgid "WmGlobe"
+#~ msgstr "WmGlobe"
+
+#~ msgid "A dock.app that displays a rotating Earth in an icon"
+#~ msgstr ""
+#~ "Uma aplicação na barra de tarefas que mostra a Terra a rodar num ícone"
+
+#~ msgid "Wmix (OSS)"
+#~ msgstr "Wmix (OSS)"
+
+#~ msgid "Dockapp OSS sound mixer"
+#~ msgstr "Uma aplicação na barra de tarefas para misturar o som OSS"
+
+#~ msgid "WMLaptop"
+#~ msgstr "WMLaptop"
+
+#~ msgid "Laptop status docklet"
+#~ msgstr "Aplicação na barra de tarefas sobre o estado do portátil"
+
+#~ msgid "WmMemMon"
+#~ msgstr "WmMemMon"
+
+#~ msgid "Mem/Swap monitoring dockapp for WindowMaker"
+#~ msgstr ""
+#~ "Aplicação na barra de tarefas que monitoriza a Mem/Swap para WindowMaker"
+
+#~ msgid "Wmnd"
+#~ msgstr "Wmnd"
+
+#~ msgid "Network monitoring dock app"
+#~ msgstr "Aplicação na barra de tarefas para monitorização da rede"
+
+#~ msgid "WmNetLoad"
+#~ msgstr "WmNetLoad"
+
+#~ msgid "Network monitoring dockapp for WindowMaker"
+#~ msgstr ""
+#~ "Aplicação na barra de tarefas de monitorização da rede para WindowMaker"
+
+#~ msgid "WMNut"
+#~ msgstr "WMNut"
+
+#~ msgid "UPS monitoring in a dockapp"
+#~ msgstr "Aplicação na barra de tarefas de monitorização UPS"
+
+#~ msgid "WmPop3lb"
+#~ msgstr "WmPop3lb"
+
+#~ msgid "Multiple mailbox monitoring via Pop3 in a dockapp"
+#~ msgstr ""
+#~ "Aplicação na barra de tarefas que monitoriza várias caixas de correio POP3"
+
+#~ msgid "WmsMixer"
+#~ msgstr "WmsMixer"
+
+#~ msgid "Dockapp sound mixer"
+#~ msgstr "Aplicação na barra de tarefas de Mistura do som"
+
+#~ msgid "Wmsmpmon"
+#~ msgstr "Wmsmpmon"
+
+#~ msgid "System information on dual CPU systems in a small icon"
+#~ msgstr "Informações de sistema num sistema com dois CPU num pequeno ícone"
+
+#~ msgid "WmStock"
+#~ msgstr "WmStock"
+
+#~ msgid "A stock quote data display in a small icon"
+#~ msgstr "Um mostrador de quotas da bolsa num pequeno ícone"
+
+#~ msgid "WmSysMon"
+#~ msgstr "WmSysMon"
+
+#~ msgid "System information (memory, swap, uptime, IO) in a small icon"
+#~ msgstr "Informações do sistema (memória, swap, IO) num pequeno ícone"
+
+#~ msgid "WMTV"
+#~ msgstr "WMTV"
+
+#~ msgid "WM DockTV"
+#~ msgstr "WM DockTV"
+
+#~ msgid "WMWeather"
+#~ msgstr "WMWeather"
+
+#~ msgid "Weather docklet"
+#~ msgstr "Docklet metereológico"
+
+#~ msgid "WmWebcam"
+#~ msgstr "WmWebcam"
+
+#~ msgid "Watch your own webcam in a small dockapp window"
+#~ msgstr "Veja a sua própria webcam numa pequena janela dockapp"
+
+#~ msgid "WMWifi"
+#~ msgstr "WMWifi"
+
+#~ msgid "Wireless network docklet"
+#~ msgstr "Docklet de rede sem fios (wireless)"
+
+#~ msgid "WmXss"
+#~ msgstr "WmXss"
+
+#~ msgid "Frontend for xscreensaver in a small icon"
+#~ msgstr "Interface para xscreensaver num pequeno ícone"
+
+#~ msgid "A file manager, similar to Directory Opus on the AMIGA"
+#~ msgstr "Um gestor de ficheiros, similar ao Directory Opus nos AMIGA"
+
+#~ msgid "Workrave"
+#~ msgstr "Workrave"
+
+#~ msgid "Assists in recovery and prevention of Repetitive Strain Injury (RSI)"
+#~ msgstr ""
+#~ "Assiste na recuperação e prevenção do Ferimento Repetitivo da Tensão (FRT)"
+
+#~ msgid "Wormux"
+#~ msgstr "Wormux"
+
+#~ msgid "Free (Libre) clone of Worms from Team17"
+#~ msgstr "Clone livre do Worms dos Team17"
+
+#~ msgid "wxChecksums"
+#~ msgstr "wxChecksums"
+
+#~ msgid "Computes and verifies SFV and MD5 checksums' files"
+#~ msgstr "Calcula e verifica os ficheiros checksums SFV e MD5"
+
+#~ msgid "wxGlade"
+#~ msgstr "wxGlade"
+
+#~ msgid "A GUI builder for wxWindows/wxPython"
+#~ msgstr "Um GUI de construção para wxWindows/wxPython"
+
+#~ msgid "VLC wxWindow media player"
+#~ msgstr "VLC Leitor multimédia wxWindow"
+
+#~ msgid "X3270"
+#~ msgstr "X3270"
+
+#~ msgid "IBM 3270 Terminal Emulator"
+#~ msgstr "Emulador de terminal IBM 3270"
+
+#~ msgid "Realtime fractal zoomer"
+#~ msgstr "Zoom de fracções em tempo real"
+
+#~ msgid "Xarchon"
+#~ msgstr "Xarchon"
+
+#~ msgid "Clone of ARCHON game"
+#~ msgstr "Clone do jogo ARCHON"
+
+#~ msgid "XBlast"
+#~ msgstr "XBlast"
+
+#~ msgid "The X11 bomberman clone"
+#~ msgstr "O clone do Bomberman X11"
+
+#~ msgid "X-CA"
+#~ msgstr "X-CA"
+
+#~ msgid "A GUI for handling X509 certificates, RSA keys and PKCS#10 Requests"
+#~ msgstr "Um GUI para gerir certificados X509, chaves RSA, e pedidos PKCS#10"
+
+#~ msgid "CHM viewer for UNIX"
+#~ msgstr "Visualizador CHM para UNIX"
+
+#~ msgid "XCombust"
+#~ msgstr "XCombust"
+
+#~ msgid "Elemental Analysis"
+#~ msgstr "Análise Elementar"
+
+#~ msgid "Xcoral text editor"
+#~ msgstr "Xcoral editor de texto"
+
+#~ msgid "DOS emulator"
+#~ msgstr "Emulador do DOS"
+
+#~ msgid "DOS emulator running under X"
+#~ msgstr "Emulador do DOS sob o X"
+
+#~ msgid "2D chemical structures drawing tool"
+#~ msgstr "Ferramenta de desenho de estruturas químicas em 2D"
+
+#~ msgid "Graphical Disk Usage"
+#~ msgstr "Gráfico do Uso do Disco"
+
+#~ msgid "Xffm is a filemanager and SMB network navigator for XFce."
+#~ msgstr "Xffm é um gestor de ficheiros e um navegador de rede SMB para XFce."
+
+#~ msgid "Xgospel"
+#~ msgstr "Xgospel"
+
+#~ msgid "A graphical client for Internet Go Server"
+#~ msgstr "Um cliente gráfico do Servidor de Internet Go"
+
+#~ msgid "Xgsm"
+#~ msgstr "Xgsm"
+
+#~ msgid "GSM phone interface"
+#~ msgstr "Interface de telefone GSM"
+
+#~ msgid "A mp3 playlist frontend"
+#~ msgstr "Um interface de listas mp3"
+
+#~ msgid "X Letters - Catch falling words by typing them."
+#~ msgstr "X Letras - Apanha palavras que caem ao escrevê-las."
+
+#~ msgid "XLogical"
+#~ msgstr "XLogical"
+
+#~ msgid "XLogical - A puzzle game"
+#~ msgstr "XLogical - Um jogo de puzzle"
+
+#~ msgid "Xlogmaster"
+#~ msgstr "Xlogmaster"
+
+#~ msgid "Logfile viewer"
+#~ msgstr "Visualizador de registos"
+
+#~ msgid "Xlogmaster Homepage"
+#~ msgstr "Homepage do Xlogmaster"
+
+#~ msgid "XMakeMol"
+#~ msgstr "XMakeMol"
+
+#~ msgid "Molecule editor and viewer"
+#~ msgstr "Visualizador e Editor de Moléculas"
+
+#~ msgid "Xmms (Modplug)"
+#~ msgstr "Xmms (Modplug)"
+
+#~ msgid "Xmms (SID plugin)"
+#~ msgstr "Xmms (plugin SID)"
+
+#~ msgid "Xmms (Sidplay plugin)"
+#~ msgstr "Xmms (plugin Sidplay)"
+
+#~ msgid "Xmorph"
+#~ msgstr "Xmorph"
+
+#~ msgid "Morphing software"
+#~ msgstr "Software de morphing"
+
+#~ msgid "XMrIs"
+#~ msgstr "XMrIs"
+
+#~ msgid "Mr. Is, a Mr. Do clone for X"
+#~ msgstr "Sr. Is, um clone do Mr. Do para X"
+
+#~ msgid "X Northern Captain - X filemanager with many functions "
+#~ msgstr "X Capitão do Norte - Gestor de ficheiros X com muitas funções"
+
+#~ msgid "XORSA"
+#~ msgstr "XORSA"
+
+#~ msgid "Orbit Reconstruction, Simulation and Analysis"
+#~ msgstr "Reconstrução, Simulação e Análise de Órbitas"
+
+#~ msgid "OS stats viewer"
+#~ msgstr "Visualizador de estados do OS"
+
+#~ msgid "XPad"
+#~ msgstr "XPad"
+
+#~ msgid "Sticky Notes"
+#~ msgstr "Notas Autocolantes"
+
+#~ msgid "Xpaint"
+#~ msgstr "Xpaint"
+
+#~ msgid "Paint program"
+#~ msgstr "Um programa de pintura"
+
+#~ msgid "Xpenguins"
+#~ msgstr "Xpenguins"
+
+#~ msgid "Display penguins running on your desktop."
+#~ msgstr "Mostra pinguins a correr no seu ecrã"
+
+#~ msgid "Xpilot server"
+#~ msgstr "Servidor Xpilot"
+
+#~ msgid "Fly/shoot arcade game"
+#~ msgstr "Jogo de arcada do tipo voar/disparar"
+
+#~ msgid "Xpilot - Requires server"
+#~ msgstr "Xpilot - Requer um servidor"
+
+#~ msgid "X-Pired"
+#~ msgstr "X-Pired"
+
+#~ msgid "Action-puzzle game"
+#~ msgstr "Jogo de acção/puzzle"
+
+#~ msgid "XQF"
+#~ msgstr "XQF"
+
+#~ msgid "A network game browser"
+#~ msgstr "Browser de jogos em rede"
+
+#~ msgid "Analyse X resources"
+#~ msgstr "Analisa os recursos do X"
+
+#~ msgid "Xrn"
+#~ msgstr "Xrn"
+
+#~ msgid "News reader"
+#~ msgstr "Leitor de forums"
+
+#~ msgid "Tool for manipulating software packages"
+#~ msgstr "Ferramenta para manipular pacotes de software"
+
+#~ msgid "X-Scavenger"
+#~ msgstr "X-Scavenger"
+
+#~ msgid "Cool arcade/thinking game very much like Lode Runner"
+#~ msgstr "Bom jogo de arcada/reflexão paracido com o Lode Runner"
+
+#~ msgid "XScorch"
+#~ msgstr "XScorch"
+
+#~ msgid "Clone of Scorched Earth"
+#~ msgstr "Clone do Scorched Earth"
+
+#~ msgid "Siag"
+#~ msgstr "Siag"
+
+#~ msgid "Siag Office spreadsheet"
+#~ msgstr "Folha de cálculo Siag Office"
+
+#~ msgid "QT version of the C64 music player"
+#~ msgstr "Versão QT de leitor de música C64"
+
+#~ msgid "Xskat"
+#~ msgstr "Xskat"
+
+#~ msgid "The Skat game"
+#~ msgstr "O jogo Skat"
+
+#~ msgid "Xsnap"
+#~ msgstr "Xsnap"
+
+#~ msgid "Program to interactively take a snapshot of a region of the screen"
+#~ msgstr ""
+#~ "Programa para interactivamente tirar fotografias de uma região do ecrân"
+
+#~ msgid "Xsoldier"
+#~ msgstr "Xsoldier"
+
+#~ msgid "Shooting game on X Window System"
+#~ msgstr "Um jogo de tiro para o sistema X Window"
+
+#~ msgid "XSox"
+#~ msgstr "XSox"
+
+#~ msgid "Simple Sound Editor"
+#~ msgstr "Simples Editor de Sons"
+
+#~ msgid "XShipWars"
+#~ msgstr "XShipWars"
+
+#~ msgid "XShipWars universe server"
+#~ msgstr "Servidor do universo XShipWars"
+
+#~ msgid "XShipWars universe monitor"
+#~ msgstr "Monitor do universo XShipWars"
+
+#~ msgid "Unvedit"
+#~ msgstr "Unvedit"
+
+#~ msgid "XShipWars universe editor"
+#~ msgstr "Editor do universo XShipWars"
+
+#~ msgid "Minitel emulation"
+#~ msgstr "Emulação Minitel"
+
+#~ msgid "Ultima 4"
+#~ msgstr "Ultima 4"
+
+#~ msgid "Ultima 4 (xu4)"
+#~ msgstr "Ultima 4 (xu4)"
+
+#~ msgid "XVidCap"
+#~ msgstr "XVidCap"
+
+#~ msgid "Screen Capture Video Recorder"
+#~ msgstr "Captura de Ecrâ de uma Gravação de Video"
+
+#~ msgid "XVKbd"
+#~ msgstr "XVKbd"
+
+#~ msgid "On-screen keyboard for X"
+#~ msgstr "Teclado no ecrã para o X"
+
+#~ msgid "XVNews"
+#~ msgstr "XVNews"
+
+#~ msgid "Open Look style News Reader"
+#~ msgstr "Leitor de Forums no estilo Open Look"
+
+#~ msgid "XVPrint"
+#~ msgstr "XVPrint"
+
+#~ msgid "Xview XVPrint"
+#~ msgstr "Xview XVPrint"
+
+#~ msgid "A MS-Explorer-like File Manager for X"
+#~ msgstr "Um gestor de ficheiros para X tipo o MS-Explorer"
+
+#~ msgid "Differences between two files"
+#~ msgstr "Diferenças entre dois ficheiros"
+
+#~ msgid "Xykron"
+#~ msgstr "Xykron"
+
+#~ msgid "CRK Computational Chemistry"
+#~ msgstr "Química computacional CRK"
+
+#~ msgid "DrawMol"
+#~ msgstr "DrawMol"
+
+#~ msgid "CRK 3D Molecule Editor"
+#~ msgstr "CRK Editor de Moléculas em 3D"
+
+#~ msgid "Image viewer"
+#~ msgstr "Visualizador de Imagens"
+
+#~ msgid "Yadex"
+#~ msgstr "Yadex"
+
+#~ msgid "A level editor for DOOM"
+#~ msgstr "Um editor de níveis para DOOM"
+
+#~ msgid "Yammi"
+#~ msgstr "Yammi"
+
+#~ msgid "Yet Another Music Manager"
+#~ msgstr "Mais um gestor de música"
+
+#~ msgid "Yank"
+#~ msgstr "Yank"
+
+#~ msgid "Yet Another NoteKeeper"
+#~ msgstr "Mais Um Bloco-Notas"
+
+#~ msgid "Kyzis"
+#~ msgstr "Kyzis"
+
+#~ msgid "Audio player"
+#~ msgstr "Leitor de áudio"
+
+#~ msgid "Super NES / Super Famicom Emulator"
+#~ msgstr "Emulador Super NES / Super Famicom"
+
+#~ msgid "Real-time MIDI software synth"
+#~ msgstr "Sintetizador MIDI em tempo-real"
+
+#~ msgid "MIDI keyboard spliter for ZynAddSubFX"
+#~ msgstr "Gestor de teclado MIDI para ZynAddSubFX"
+
+#~ msgid "MIDI controller for ZynAddSubFX"
+#~ msgstr "Controlador MIDI para ZynAddSubFX"
+
+#~ msgid "Howtos Croatian"
+#~ msgstr "Howtos Croata"
+
+#~ msgid ""
+#~ "HOWTO documents (html format) from the Linux Documentation Project in "
+#~ "Croatian"
+#~ msgstr ""
+#~ "Documentos HOWTO (formato html) do Projecto de Documentação do Linux em "
+#~ "Croata"
+
+#~ msgid "KWuFTPd"
+#~ msgstr "KWuFTPd"
+
+#~ msgid "Morph3D (GL)"
+#~ msgstr "Morph3D (GL)"
+
+#~ msgid "Pipes (GL)"
+#~ msgstr "Canos (GL)"
+
+#~ msgid "Rock"
+#~ msgstr "Rocha"
+
+#~ msgid "Slide Screen"
+#~ msgstr "Ecrã Deslizante"
+
+#~ msgid "Media Screensaver"
+#~ msgstr "Média de Protecção de ecrã"
+
+#~ msgid "Random"
+#~ msgstr "Aleatório"
+
+#~ msgid "Audio CD IO-Slave"
+#~ msgstr "IO-Slave de CDs Áudio"
+
+#~ msgid "Klipper"
+#~ msgstr "Klipper"
+
+#~ msgid "Text tools"
+#~ msgstr "Ferramentas de Texto"
+
+#~ msgid "Konqueror Web Browser"
+#~ msgstr "Web Browser Konqueror"
+
+#~ msgid "File Manager - Super User Mode"
+#~ msgstr "Gestor de Ficheiros - Modo Super Utilizador"
+
+#~ msgid "Konsole - Super User Mode"
+#~ msgstr "Konsole - Modo Super Utilizador"
+
+#~ msgid "KPager"
+#~ msgstr "KPager"
+
+#~ msgid "Desktop Settings Wizard"
+#~ msgstr "Assistente de Configuração do Ecrã"
+
+#~ msgid "Theme Manager"
+#~ msgstr "Gestor de Temas"
+
+#~ msgid "Manager for Desktop Themes"
+#~ msgstr "Gestor para os Temas do Ambiente de Trabalho"
+
+#~ msgid "Kandalf's Tips"
+#~ msgstr "Dicas do Kandalf"
+
+#~ msgid "Midi"
+#~ msgstr "MIDI"
+
+#~ msgid "Midi Configuration"
+#~ msgstr "Configuração MIDI"
+
+#~ msgid "SOCKS"
+#~ msgstr "SOCKS"
+
+#~ msgid "Configure SOCKS support"
+#~ msgstr "Configure o suporte do SOCKS"
+
+#~ msgid "Netscape Plugins"
+#~ msgstr "Plugins do Netscape"
+
+#~ msgid "Netscape Plugin Configuration"
+#~ msgstr "Configuração dos plugins do Netscape"
+
+#~ msgid "KGeo"
+#~ msgstr "KGeo"
+
+#~ msgid "Edutainment"
+#~ msgstr "Edutretenimento"
+
+#~ msgid "Midi synth"
+#~ msgstr "Sintetizador MIDI"
+
+#~ msgid "A Midi Player"
+#~ msgstr "Um Leitor de MIDI"
+
+#~ msgid "News Ticker"
+#~ msgstr "Notícias"
+
+#~ msgid ""
+#~ "Configure the News Ticker applet, manage source files and other related "
+#~ "settings."
+#~ msgstr ""
+#~ "Configure a applet News Ticker, gira os ficheiros fonte e outras "
+#~ "definições relacionadas."
+
+#~ msgid "Mandrake Linux documentation in German"
+#~ msgstr "Documentação Mandrake Linux em Alemão"
+
+#~ msgid "KDevelop.2 - Setup"
+#~ msgstr "KDevelop.2 - Configuração"
+
+#~ msgid "Mandrake Linux documentation in English"
+#~ msgstr "Documentação Mandrake Linux em Inglês"
+
+#~ msgid "Mandrake Linux documentation in Spanish"
+#~ msgstr "Documentação Mandrake Linux em Espanhol"
+
+#~ msgid "Mandrake Linux documentation in French"
+#~ msgstr "Documentação Mandrake Linux em Francês"
+
+#~ msgid "Mandrake Linux documentation in Italian"
+#~ msgstr "Documentação Mandrake Linux em Italiano"
+
+#~ msgid "Mandrake Linux documentation in Russian"
+#~ msgstr "Documentação Mandrake Linux em Russo"
+
+#~ msgid "Telnet"
+#~ msgstr "Telnet"
+
+#~ msgid "Telnet client"
+#~ msgstr "Cliente Telnet"
+
+#~ msgid "Lynx-like text WWW browser"
+#~ msgstr "Browser textual WWW tipo o Lynx"
+
+#~ msgid "epic"
+#~ msgstr "epic"
+
+#~ msgid "GPRS Easy Connect"
+#~ msgstr "GPRS Fácil Conexão"
+
+#~ msgid "GPRS Cellular Connection"
+#~ msgstr "GPRS Conexão Celular"
+
+#~ msgid "pyDDR"
+#~ msgstr "pyDDR"
+
+#~ msgid "Faces"
+#~ msgstr "Caras"
+
+#~ msgid "Incoming mail notifier"
+#~ msgstr "Notificador de chegada de correio electrónico"
+
+#~ msgid "Code editor"
+#~ msgstr "Editor de Código"
+
+#~ msgid "GnoRPM"
+#~ msgstr "GnoRPM"
+
+#~ msgid "A graphical front-end to RPM for GNOME"
+#~ msgstr "Um interface gráfico para RPM do GNOME"
+
+#~ msgid "ImageMagick display"
+#~ msgstr "Mostrador ImageMagick"
+
+#~ msgid "Displays any image on X"
+#~ msgstr "Mostra qualquer imagem no X"
+
+#~ msgid "Blank Screen"
+#~ msgstr "Ecrã em Branco"
+
+#~ msgid "KAddressBook"
+#~ msgstr "KAddressBook"
+
+#~ msgid "Legacy theme importer"
+#~ msgstr "Importador de temas Legacy"
+
+#~ msgid "Imports GTK themes to KDE2"
+#~ msgstr "Importa temas GTK para o KDE"
+
+#~ msgid "Configure desktop number and names"
+#~ msgstr "Configura os nomes e números dos ecrãs"
+
+#~ msgid "Abalone"
+#~ msgstr "Abalone"
+
+#~ msgid "Play Abalone against computer"
+#~ msgstr "Joga Abalone contra o computador"
+
+#~ msgid "Jezzball"
+#~ msgstr "Jezzball"
+
+#~ msgid "KDE Jezzball Game"
+#~ msgstr "Jogo Jezzbal do KDE"
+
+#~ msgid "Fractals Generator"
+#~ msgstr "Gerador de Fracções"
+
+#~ msgid "Generator for fractals"
+#~ msgstr "Um gerador de fracções"
+
+#~ msgid "aKtion!"
+#~ msgstr "aKtion!"
+
+#~ msgid "Kit"
+#~ msgstr "Kit"
+
+#~ msgid "AOL Instant Messenger Client"
+#~ msgstr "Cliente Instant Messenger da AOL"
+
+#~ msgid "Mail Client"
+#~ msgstr "Cliente de Mail"
+
+#~ msgid "KMail-KAB Import"
+#~ msgstr "Importação KMail-KAB"
+
+#~ msgid "Imports to KMail and KAB"
+#~ msgstr "Importa para oKMail e KAB"
+
+#~ msgid "News Reader"
+#~ msgstr "Leitor de notícias"
+
+#~ msgid "Mail monitor"
+#~ msgstr "Monitor de Mail"
+
+#~ msgid "Multi-folder new mail monitor"
+#~ msgstr "Indicador de novas mensagens"
+
+#~ msgid "LAN Browsing"
+#~ msgstr "Navegação LAN"
+
+#~ msgid "setup lisa, reslisa and the ioslaves"
+#~ msgstr "Configura o lisa, o reslisa e os ioslaves"
+
+#~ msgid "Battery Monitor"
+#~ msgstr "Monitor de Bateria"
+
+#~ msgid "Low Battery Warning"
+#~ msgstr "Aviso de Bateria Fraca"
+
+#~ msgid "Low Battery Critical"
+#~ msgstr "Bateria em Estado Crítico"
+
+#~ msgid "Address Book"
+#~ msgstr "Livro de Endereços"
+
+#~ msgid "Address book"
+#~ msgstr "Livro de Endereços"
+
+#~ msgid "Personal Time Tracker"
+#~ msgstr "Gestor Pessoal de Tempo"
+
+#~ msgid "Find Utility"
+#~ msgstr "Utilitário de Procura"
+
+#~ msgid "HP LaserJet Control Panel"
+#~ msgstr "Painel de Control da HP LaserJet"
+
+#~ msgid "KLJetTool: so you can configure your LaserJet from your desk"
+#~ msgstr ""
+#~ "KLJetTool: para que possa configurar a sua LaserJet da sua secretária"
+
+#~ msgid "Print Job Administration"
+#~ msgstr "Administração de Tarefas de Impressão"
+
+#~ msgid "Displays Print Job Queue"
+#~ msgstr "Mostra a Fila de Tarefas de impressão"
+
+#~ msgid "K Send a Fax"
+#~ msgstr "K Enviar um Fax"
+
+#~ msgid "Send a fax by printing to a 'fax' lpd device."
+#~ msgstr "Envia um fax ao imprimir para um dispositivo 'fax' lpd."
+
+#~ msgid "Popup Notes"
+#~ msgstr "Notas"
+
+#~ msgid "You can write small notes with this"
+#~ msgstr "Pode escrever pequenas notas com isto"
+
+#~ msgid "Process management"
+#~ msgstr "Gestão de Processos"
+
+#~ msgid "Process management tool"
+#~ msgstr "Ferramenta de gestão de processos"
+
+#~ msgid "Laptop Power Control"
+#~ msgstr "Controlo de Alimentação do Portátil"
+
+#~ msgid "Kontour"
+#~ msgstr "Kontour"
+
+#~ msgid "Drawings"
+#~ msgstr "Desenhos"
+
+#~ msgid "Lftp"
+#~ msgstr "Lftp"
+
+#~ msgid "Command line file transfer program"
+#~ msgstr "Programa de transferência de ficheiros para linha de comandos"
+
+#~ msgid "Lynx"
+#~ msgstr "Lynx"
+
+#~ msgid "A text browser"
+#~ msgstr "Um browser em texto"
+
+#~ msgid "Mandrakelinux documentation in Russian"
+#~ msgstr "Documentação Mandrakelinux em Russo"
+
+#~ msgid "Mutt"
+#~ msgstr "Mutt"
+
+#~ msgid "Mutt - A text mode mail user agent"
+#~ msgstr "Mutt - Um agente de utilizador de mail em modo texto"
+
+#~ msgid "NCFtp"
+#~ msgstr "NCFtp"
+
+#~ msgid "An improved FTP client."
+#~ msgstr "Um cliente FTP melhorado."
+
+#~ msgid "Sketch"
+#~ msgstr "Sketch"
+
+#~ msgid "SLAP - SEIKO SmartLabel Printers"
+#~ msgstr "SLAP - Impressoras SEIKO SmartLabel"
+
+#~ msgid "Printing text in different fonts on SEIKO SmartLabel Printers"
+#~ msgstr ""
+#~ "Impressão de texto com tipos de letra diferentes nas impressoras SEIKO "
+#~ "SmartLabel"
+
+#~ msgid "Xpcd"
+#~ msgstr "Xpcd"
+
+#~ msgid "PhotoCD tools"
+#~ msgstr "Ferramentas PhotoCD"
+
+#~ msgid "rbbr"
+#~ msgstr "rbbr"
+
+#~ msgid "Whale"
+#~ msgstr "Whale"
+
+#~ msgid "GNOME2 iPod Interface"
+#~ msgstr "Interface iPod GNOME2"
+
+#~ msgid "MOL"
+#~ msgstr "MOL"
+
+#~ msgid "MOL - Mac On Linux"
+#~ msgstr "MOL - Mac No Linux"
+
+#~ msgid "MOL - OSX"
+#~ msgstr "MOL - OSX"
+
+#~ msgid "Batmon"
+#~ msgstr "Batmon"
+
+#~ msgid "Battery life monitor for Apple Powerbooks"
+#~ msgstr "Monitor da vida da bateria para os Powerbooks Apple"
+
+#~ msgid "Config Client for pbbuttonsd"
+#~ msgstr "Cliente de Configuração para o pbbuttonsd"
+
+#~ msgid "/usr/share/fluxbox-0.1/styles"
+#~ msgstr "/usr/share/fluxbox-0.1/styles"
+
+#~ msgid "System Styles"
+#~ msgstr "Estilos do Sistema"
+
+#~ msgid "~/.fluxbox/styles"
+#~ msgstr "~/.fluxbox/styles"
+
+#~ msgid "User Styles"
+#~ msgstr "Estilos do Utilizador"
+
+#~ msgid "Font browser"
+#~ msgstr "Browser de Tipos de Letra"
+
+#~ msgid "Gnome IDE"
+#~ msgstr "IDE Gnome"
+
+#~ msgid "Guitar Tablature editor"
+#~ msgstr "Editor de Tabelas para Guitarra"
+
+#~ msgid "A GTK+ Scour Exchange"
+#~ msgstr "Uma troca Scour GTK+"
+
+#~ msgid "A music collection manager "
+#~ msgstr "Um gestor de colecção de música"
+
+#~ msgid "KDE Splash Screen"
+#~ msgstr "Ecrã de Arranque do KDE"
+
+#~ msgid "KDE startup screen configuration"
+#~ msgstr "Configuração do ecrã de arranque do KDE"
+
+#~ msgid "PixiePlus Image Manager"
+#~ msgstr "PixiePlus Gestor de Imagens"
+
+#~ msgid "PixiePlus Image Manager and Editor"
+#~ msgstr "PixiePlus Gestor de Imagens e Editor"
+
+#~ msgid "RipperX"
+#~ msgstr "RipperX"
+
+#~ msgid "Source Navigator"
+#~ msgstr "Source Navigator"
+
+#~ msgid "Source Navigator developer environment"
+#~ msgstr "Ambiente de programação Source Navigator"
+
+#~ msgid "Urlget"
+#~ msgstr "Urlget"
+
+#~ msgid "Xarchie"
+#~ msgstr "Xarchie"
+
+#~ msgid "Create a Text Document"
+#~ msgstr "Criar um Documento de Texto"
+
+#~ msgid "Use Office Tools"
+#~ msgstr "Use Ferramentas de Escritório"
+
+#~ msgid "Create a Spreadsheet"
+#~ msgstr "Crie uma Folha de Cálculo"
+
+#~ msgid "Create a Presentation"
+#~ msgstr "Crie uma Apresentação"
+
+#~ msgid "Create a Drawing"
+#~ msgstr "Crie um Desenho"
+
+#~ msgid "Create Flowcharts and Diagrams"
+#~ msgstr "Crie Fluxogramas e Diagramas"
+
+#~ msgid "Design a Layout"
+#~ msgstr "Projete um Layout"
+
+#~ msgid "Consult an Address Book"
+#~ msgstr "Consulte um Livro de Endereços"
+
+#~ msgid "Send a Fax"
+#~ msgstr "Envie um Fax"
+
+#~ msgid "View a Fax"
+#~ msgstr "Veja um Fax"
+
+#~ msgid "Synchronize Your PDA"
+#~ msgstr "Sincronize o seu PDA"
+
+#~ msgid "Use a Calculator"
+#~ msgstr "Use uma Calculadora"
+
+#~ msgid "Search Dictionaries and Encyclopedias"
+#~ msgstr "Procure em Dicionários e Enciclopédias"
+
+#~ msgid "Write Notes"
+#~ msgstr "Escreva Notas"
+
+#~ msgid "Organize"
+#~ msgstr "Organize"
+
+#~ msgid "Manage Tasks"
+#~ msgstr "Gira Tarefas"
+
+#~ msgid "Organize Your Time"
+#~ msgstr "Organize o Seu Tempo"
+
+#~ msgid "Track Time Spent on Tasks"
+#~ msgstr "Contabilize o Tempo Gasto nas Tarefas"
+
+#~ msgid "Manage Projects"
+#~ msgstr "Gira Projectos"
+
+#~ msgid "Manage Your Finances"
+#~ msgstr "Gira as Suas Finanças"
+
+#~ msgid "Dial up"
+#~ msgstr "Telefone"
+
+#~ msgid "Surf the Internet"
+#~ msgstr "Navegue na Internet"
+
+#~ msgid "Browse the Web"
+#~ msgstr "Navegue na Web"
+
+#~ msgid "Read and Send E-mail"
+#~ msgstr "Leia e Envie Correio Electrónico"
+
+#~ msgid "Read and Send Newsgroup Messages"
+#~ msgstr "Leia e Envie Mensagens Newsgroup"
+
+#~ msgid "Make a Phone Call"
+#~ msgstr "Efectue uma Chamada Telefónica"
+
+#~ msgid "A SIP phone"
+#~ msgstr "Um telefone SIP"
+
+#~ msgid "Organize a Video Conference"
+#~ msgstr "Organize uma Video Conferência"
+
+#~ msgid "Create Your Own Web Site"
+#~ msgstr "Crie o Seu Próprio Web Site"
+
+#~ msgid "Transfer files with FTP"
+#~ msgstr "Transfira Ficheiros com FTP"
+
+#~ msgid "Transfer Files With FTP"
+#~ msgstr "Transfira Ficheiros com FTP"
+
+#~ msgid "Adjust Volume"
+#~ msgstr "Ajuste o Volume"
+
+#~ msgid "Enjoy Music and Video"
+#~ msgstr "Aprecie Música e Vídeo"
+
+#~ msgid "Listen to Audio CDs"
+#~ msgstr "Ouça CDs Áudio"
+
+#~ msgid "Listen to Music Files"
+#~ msgstr "Ouça Ficheiros de Música"
+
+#~ msgid "Rip Audio CDs"
+#~ msgstr "Extraia/Ripe CDs Áudio"
+
+#~ msgid "Record Sounds"
+#~ msgstr "Grave Sons"
+
+#~ msgid "Mix Music"
+#~ msgstr "Misture Música"
+
+#~ msgid "Digital Audio Waveforms Editor"
+#~ msgstr "Editor Áudio Digital de Ondas Sonoras"
+
+#~ msgid "Compose Music"
+#~ msgstr "Componha Música"
+
+#~ msgid "Watch Videos"
+#~ msgstr "Veja Vídeos"
+
+#~ msgid "Edit Videos"
+#~ msgstr "Edite Vídeos"
+
+#~ msgid "Watch Television"
+#~ msgstr "Veja Televisão"
+
+#~ msgid "View Images and Photos"
+#~ msgstr "Veja Imagens e Fotos"
+
+#~ msgid "View, Modify and Create Graphics"
+#~ msgstr "Veja, Modifique e Crie Gráficos"
+
+#~ msgid "Edit Images and Photos"
+#~ msgstr "Edite Imagens e Fotos"
+
+#~ msgid "Scan and Use Optical Character Recognition (OCR)"
+#~ msgstr "Digitalize e Use Reconhecimento Óptico de Caracteres (OCR)"
+
+#~ msgid "Import and sort your photos"
+#~ msgstr "Importe e gerêncie as suas fotos"
+
+#~ msgid "Import and Sort Your Photos"
+#~ msgstr "Importe e Ordene as Suas Fotos"
+
+#~ msgid "Create a Screenshot"
+#~ msgstr "Crie uma Foto do Ecrâ (Screenshot)"
+
+#~ msgid "Play Games"
+#~ msgstr "Jogue Jogos"
+
+#~ msgid "Configure Your Desktop"
+#~ msgstr "Configure o Seu Desktop"
+
+#~ msgid "Administer Your System"
+#~ msgstr "Administre o Seu Sistema"
+
+#~ msgid "Configure Your Computer"
+#~ msgstr "Configure o Seu Computador"
+
+#~ msgid "Configure Your Computer (Expert)"
+#~ msgstr "Configure o Seu Computador (Perito)"
+
+#~ msgid "Change Your Password"
+#~ msgstr "Altere a sua Password"
+
+#~ msgid "Burn CDs-DVDs"
+#~ msgstr "Grave CDs-DVDs"
+
+#~ msgid "CD Writing Program"
+#~ msgstr "Programa de Gravação de CDs"
+
+#~ msgid "Design a CD Cover"
+#~ msgstr "Desenhe a Capa de um CD"
+
+#~ msgid "Backup Your Data"
+#~ msgstr "Faça Backup dos seus Dados"
+
+#~ msgid "Compress and Decompress Files"
+#~ msgstr "Comprima e Descompriima Ficheiros"
+
+#~ msgid "Format Floppies"
+#~ msgstr "Formate Disquetes"
+
+#~ msgid "Use a Terminal Emulator"
+#~ msgstr "Use um Emulador de Terminal"
+
+#~ msgid "Use More Office Tools"
+#~ msgstr "Use Mais Ferramentas de Escritório"
+
+#~ msgid "Use More Productivity Tools"
+#~ msgstr "Use Mais Ferramentas de Produção"
+
+#~ msgid "Use More Connectivity Utilities"
+#~ msgstr "Use Mais Ferramentas de Conexão"
+
+#~ msgid "Discover More Entertainment Options"
+#~ msgstr "Descubra Mais Opções de Entretenimento"
+
+#~ msgid "Use More Image Editing Tools"
+#~ msgstr "Use Mais Ferramentas de Edição de Imagem"
+
+#~ msgid "Play More Games"
+#~ msgstr "Jogue Mais Jogos"
+
+#~ msgid "Use More Administration Tools"
+#~ msgstr "Use Mais Ferramentas de Administração"
+
+#~ msgid "Read Documentation"
+#~ msgstr "Leia a Documentação"
+
+#~ msgid "Read More Documentation"
+#~ msgstr "Leia Mais Documentação"
+
+#~ msgid "Develop"
+#~ msgstr "Programe"
+
+#~ msgid "Use Education Software"
+#~ msgstr "Use Software Educacional"
+
+#~ msgid "Use More Education Software"
+#~ msgstr "Use Mais Software Educacional"
+
+#~ msgid "Use Scientific Software"
+#~ msgstr "Use Software Científico"
+
+#~ msgid "Use More Sciences Software"
+#~ msgstr "Use Mais Software Científico"
+
+#~ msgid "Use Emulators"
+#~ msgstr "Use Emuladores"
+
+#~ msgid "Use More Applications"
+#~ msgstr "Use Mais Aplicações"
+
+#~ msgid "Use More Development Software"
+#~ msgstr "Use Mais Software de Programação"
+
+#~ msgid "Sound Server"
+#~ msgstr "Servidor de Som"
+
+#~ msgid "Sound Server Configuration"
+#~ msgstr "Configuração do Servidor de Som"
+
+#~ msgid "Background settings"
+#~ msgstr "Configurações do fundo do ecrâ"
+
+#~ msgid "Configure the cache settings here"
+#~ msgstr "Configure aqui as definições de cache"
+
+#~ msgid "You can configure your Cookie configuration here"
+#~ msgstr "Pode configurar aqui a sua configuração Cooker"
+
+#~ msgid "Desktop"
+#~ msgstr "Ambiente de Trabalho"
+
+#~ msgid "You can customize the desktop here"
+#~ msgstr "Pode personalizar aqui o seu ambiente de trabalho"
+
+#~ msgid "Enhanced Browsing"
+#~ msgstr "Navegação Avançada"
+
+#~ msgid "You can configure Enhanced Browsing here"
+#~ msgstr "Pode configurar aqui a Navegação Avançada"
+
+#~ msgid "Energy"
+#~ msgstr "Energia"
+
+#~ msgid "General energy settings"
+#~ msgstr "Configurações gerais de energia"
+
+#~ msgid "File Associations Configuration"
+#~ msgstr "Configuração das Associações de Ficheiros"
+
+#~ msgid "Improved accessibility for disabled persons"
+#~ msgstr "Acessibilidade melhorada para pessoas com deficiências"
+
+#~ msgid "Configure the stylesheets used to render HTML"
+#~ msgstr "Configure as folhas de estilo usadas para mostrar HTML"
+
+#~ msgid "You can configure the look and feel of the Konqueror here"
+#~ msgstr "Pode configurar aqui a aparência e o modo do Konqueror"
+
+#~ msgid "You can configure the panel taskbar here"
+#~ msgstr "Pode configurar aqui o painel da barra de tarefas"
+
+#~ msgid "All KDM settings"
+#~ msgstr "Todas as definições KDM"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Atalhos"
+
+#~ msgid "Configure the look and feel of the Internet Browser called Konqueror"
+#~ msgstr ""
+#~ "Configure a aparência e o modo do Browser da Internet chamado Konqueror"
+
+#~ msgid "Window Decoration"
+#~ msgstr "Decoração de Janelas"
+
+#~ msgid "Window border theme"
+#~ msgstr "Tema do contorno da janela"
+
+#~ msgid "Country & Language"
+#~ msgstr "País & Língua"
+
+#~ msgid "Network interfaces"
+#~ msgstr "Interfaces de rede"
+
+#~ msgid "You can configure the appearance of the panel here"
+#~ msgstr "Pode configurar aqui a aparência do painel"
+
+#~ msgid "Password settings"
+#~ msgstr "Configuração das senhas"
+
+#~ msgid "Configure Proxy Servers"
+#~ msgstr "Configure os Servidores Proxy"
+
+#~ msgid "Screensaver settings"
+#~ msgstr "Configurações das protecções de ecrã"
+
+#~ msgid "Spell Checking"
+#~ msgstr "Verificação Ortográfica"
+
+#~ msgid "Spell Checking Configuration"
+#~ msgstr "Configuração da Verificação Ortográfica"
+
+#~ msgid "User Agent"
+#~ msgstr "Agente Utilizador"
+
+#~ msgid ""
+#~ "You can control what your Browser's \"User Agent\" is reported as here"
+#~ msgstr ""
+#~ "Pode controlar aqui como o \"Agente Utilizador\" dos seus Browsers se "
+#~ "identifica"
+
+#~ msgid "Administer your system"
+#~ msgstr "Administre o Seu Sistema"
+
+#~ msgid "Use office tools"
+#~ msgstr "Use Ferramentas de Escritório"
+
+#~ msgid "Play games"
+#~ msgstr "Jogue jogos"
+
+#~ msgid "View, modify and create graphics"
+#~ msgstr "Veja, modifique e crie gráficos"
+
+#~ msgid "Enjoy music and video"
+#~ msgstr "Aprecie música e vídeo"
+
+#~ msgid "The Kalzium guide"
+#~ msgstr "O Guia do Kalzium"
+
+#~ msgid "The Kile guide"
+#~ msgstr "O Guia do Kile"
+
+#~ msgid "The Maxima guide"
+#~ msgstr "O Guia do Maxima"
+
+#~ msgid "You can configure the session manager here"
+#~ msgstr "Pode configurar aqui o gestor de sessões"
+
+#~ msgid "Video conference"
+#~ msgstr "Vídeo Conferência"
+
+#~ msgid "Address books"
+#~ msgstr "Livros de Endereços"
+
+#~ msgid "Geki2-KXL"
+#~ msgstr "Geki2-KXL"
+
+#~ msgid "Grande-KXL"
+#~ msgstr "Grande-KXL"
+
+#~ msgid "Organisation"
+#~ msgstr "Organização"
+
+#~ msgid "Header files for kmyfirewall"
+#~ msgstr "Ficheiros header para o kmyfirewall"
+
+#~ msgid "Kompose"
+#~ msgstr "Kompose"
+
+#~ msgid "KSensors"
+#~ msgstr "KSensors"
+
+#~ msgid "Frontend for lm_sensors"
+#~ msgstr "Interface para lm_sensors"
+
+#~ msgid "Marlin devel file."
+#~ msgstr "Ficheiro de programação (devel) do Marlin."
+
+#~ msgid "XWine"
+#~ msgstr "XWine"
+
+#~ msgid "Configure wine"
+#~ msgstr "Configure o wine"
+
+#~ msgid "A hex-based tactical game"
+#~ msgstr "Um jogo de táctica baseado em hexágonos"
+
+#~ msgid "Fuse"
+#~ msgstr "Fuse"
+
+#~ msgid "The Free Unix Spectrum Emulator"
+#~ msgstr "O Emulador Spectrum Livre de Unix "
+
+#~ msgid "The GIMP (development version)"
+#~ msgstr "O GIMP (versão de programação)"
+
+#~ msgid "GTK2 Theme Switch"
+#~ msgstr "GTK2 Theme Switch"
+
+#~ msgid "Change GTK2 Theme"
+#~ msgstr "Mude o Tema GTK2"
+
+#~ msgid "KGamma"
+#~ msgstr "KGamma"
+
+#~ msgid "KGamma - a monitor calibration tool"
+#~ msgstr "KGamma - uma ferramenta de calibração do monitor"
+
+#~ msgid "Mozilla Firebird"
+#~ msgstr "Mozilla Firefox"
+
+#~ msgid "The Mozilla Firebird project is a redesign of Mozilla's browser"
+#~ msgstr "O projecto Mozilla Firefox é uma evolução do browser Mozilla"
+
+#~ msgid "Neverputt golf game"
+#~ msgstr "Jogo de golf Neverputt"
+
+#~ msgid "OpenUniverse"
+#~ msgstr "OpenUniverse"
+
+#~ msgid "OpenGL Space Simulator"
+#~ msgstr "Simulador do Espaço OpenGL"
+
+#~ msgid "RythmAid"
+#~ msgstr "RythmAid"
+
+#~ msgid "Accompaniment Section"
+#~ msgstr "Secção de Acompanhamento"
+
+#~ msgid "DICT client"
+#~ msgstr "Cliente DICT"
+
+#~ msgid "Client software implementing the Dictionary Server Protocol"
+#~ msgstr ""
+#~ "Ciente de software de implementação do Protocolo do Servidor do Dicionário"
+
+#~ msgid "Kleopatra"
+#~ msgstr "Kleopatra"
+
+#~ msgid "Tool for syncing address book data with mobile phones"
+#~ msgstr ""
+#~ "Ferramenta para sincronizar dados dos livros de endereços com telemóveis"
 
+#~ msgid "Chinese"
+#~ msgstr "Chinês"
diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po
index 211e60b05..a834e8f3d 100644
--- a/perl-install/share/po/uz.po
+++ b/perl-install/share/po/uz.po
@@ -6,67 +6,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uz\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-27 23:43+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-10 00:41+0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\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.9\n"
 
-#: ../move/move.pm:402
-#, c-format
-msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
-"We need one to continue (beside, it's more standard so that you\n"
-"will be able to move and access your files from machines\n"
-"running Windows). Please plug in an USB key containing a\n"
-"Windows partition instead.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
-msgstr ""
+#: ../move/move.pm:292
+#, fuzzy, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Банднинг қайси турини қўшмоқчисиз?"
 
-#: ../move/move.pm:412
+#: ../move/move.pm:296
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
-"to transparently save the data in your home directory and\n"
-"system wide configuration, for next boot on this computer\n"
-"or another one. Note: if you plug in a key now, wait several\n"
-"seconds before detecting again.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
+"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:423
+#: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Need a key to save your data"
+msgid "Key isn't writable"
 msgstr ""
 
-#: ../move/move.pm:425
+#: ../move/move.pm:450
 #, c-format
-msgid "Detect USB key again"
+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:426 ../move/move.pm:456
+#: ../move/move.pm:452
 #, c-format
-msgid "Continue without USB key"
-msgstr ""
+msgid "Retry"
+msgstr "Бошқадан уриниш"
 
-#: ../move/move.pm:437 ../move/move.pm:451
+#: ../move/move.pm:453 ../move/move.pm:497
 #, c-format
-msgid "Key isn't writable"
+msgid "Continue without USB key"
 msgstr ""
 
-#: ../move/move.pm:439
+#: ../move/move.pm:462
 #, c-format
 msgid ""
 "The USB key seems to have write protection enabled, but we can't safely\n"
@@ -77,118 +63,147 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
 #, c-format
 msgid "Reboot"
 msgstr "Ўчириб-ёқиш"
 
-#: ../move/move.pm:453
+#: ../move/move.pm:473
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
+"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"We need one to continue (beside, it's more standard so that you\n"
+"will be able to move and access your files from machines\n"
+"running Windows). Please plug in an USB key containing a\n"
+"Windows partition instead.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
 msgstr ""
 
-#: ../move/move.pm:455
+#: ../move/move.pm:483
 #, c-format
-msgid "Retry"
-msgstr "Бошқадан уриниш"
+msgid ""
+"We didn't detect any USB key on your system. If you\n"
+"plug in an USB key now, Mandrake Move will have the ability\n"
+"to transparently save the data in your home directory and\n"
+"system wide configuration, for next boot on this computer\n"
+"or another one. Note: if you plug in a key now, wait several\n"
+"seconds before detecting again.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:494
 #, c-format
-msgid "Setting up USB key"
+msgid "Need a key to save your data"
 msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:496
 #, c-format
-msgid "Please wait, setting up system configuration files on USB key..."
+msgid "Detect USB key again"
 msgstr ""
 
-#: ../move/move.pm:488
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Setting up USB key"
+msgstr "ISA PNP ускуналари ўрнатилмоқда: "
+
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Please wait, setting up system configuration files on USB key..."
+msgstr "Илтимос кутиб туринг, асбоб-ускуналар аниқланмоқда ва мосланмоқда..."
+
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Авто-мослаш"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Илтимос кутиб туринг, асбоб-ускуналар аниқланмоқда ва мосланмоқда..."
 
-#: ../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 "Хато"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 
-#: ../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 "Хато рўй берди"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -208,32 +223,39 @@ msgid ""
 "guess what's happening."
 msgstr ""
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Тизимнинг мослама файлларини ўчириш"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr ""
 
-#: ../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 ""
 
-#: ../move/tree/mdk_totem:81
-#, c-format
+#: ../move/tree/mdk_totem:71
+#, fuzzy, c-format
 msgid "Kill those programs"
-msgstr ""
+msgstr "Х дастурларидан фойдаланишга рухсат этиш"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr ""
 
-#: ../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 "Диққат билан ўқинг!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -290,100 +312,100 @@ msgstr "32 Мб"
 msgid "64 MB or more"
 msgstr "64 Мб ёки кўпроқ"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X сервери"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
-msgstr "X серверини танланг"
+msgstr "График картани танлаш"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Қуйидаги XFree пакетини ўрнатиб бўлмади: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Қуйидаги Xorg пакетини ўрнатиб бўлмади: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "График картангизни хотирасининг ҳажмини танланг"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree'ни мослаш"
+msgid "Xorg configuration"
+msgstr "Xorg мосламаси"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "XFree'нинг қандай мосламасини истайсиз?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Xorg'нинг қандай мосламасини истайсиз?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama кенгайтмасидан фойдаланиш"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Фақат \"%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 ""
 
-#: 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 ""
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Бошқа"
 
-#: 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 "Чиқиш"
@@ -393,12 +415,12 @@ msgstr "Чиқиш"
 msgid "Graphic Card"
 msgstr "График карта"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Монитор"
 
-#: 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 "Ўлчам"
@@ -408,14 +430,19 @@ msgstr "Ўлчам"
 msgid "Test"
 msgstr "Синаш"
 
-#: 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 "Параметрлар"
 
-#: 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"
@@ -428,40 +455,40 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Мониторни танлаш"
 
-#: 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 "Андоза"
 
-#: 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 "Ишлаб чиқарувчи"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 "Plug'n Play аниқлаш муваффақиятсиз тугади. Илтимос тўғри келадиган мониторни "
 "танланг"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -476,12 +503,12 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
@@ -506,58 +533,60 @@ msgstr "65 мингта ранг (16 бит)"
 msgid "16 million colors (24 bits)"
 msgstr "16 миллионта ранг (24 бит)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Ўлчамлар"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "График карта: %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 "Ок"
 
-#: 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 "Бекор қилиш"
 
-#: 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 "Ёрдам"
@@ -652,8 +681,8 @@ msgstr "Ўлчамлар: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86 драйвери: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg драйвери: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -664,12 +693,12 @@ msgstr "Тизим юкланаётганда график интерфейс"
 #, 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 ""
-"Мен компьютерингизни шундай ўрнатишим мумкинки, система юкланаётганда график "
-"интерфейс (XFree) ишга туширилади.\n"
-"Ўчириб-ёқгандан кейин XFree ишга туширилишини истайсизми?"
+"Мен компьютерингизни шундай ўрнатишим мумкинки, тизим юкланаётганда график "
+"интерфейс (Xorg) ишга туширилади.\n"
+"Ўчириб-ёқгандан кейин Xorg ишга туширилишини истайсизми?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -689,20 +718,49 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: 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 "Илтимос кутиб туринг"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "Операцион система юклагичини ўрнатиш давом этмоқда"
+msgstr "Операцион тизим юклагичини ўрнатиш давом этмоқда"
+
+#: 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 ""
+"Операцион тизим юклагичини ўрнатиш муваффақиятсиз тугади. Қуйидаги хато рўй "
+"берди:"
+
+#: 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 ""
 
-#: any.pm:142
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -712,274 +770,259 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Дискнинг биринчи сектори (MRB)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Туб қисмининг биринчи сектори"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Дискетга"
 
-#: 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 "Ўтказиб юбориш"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILO дастурини ўрнатиш"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub дастурини ўрнатиш"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
-msgstr "Операцион система юклагичини қаерга ўрнатмоқчисиз?"
-
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Дискнинг юклаш қисмининг биринчи сектори"
+msgstr "Операцион тизим юклагичини қаерга ўрнатмоқчисиз?"
 
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Тизимни юкаш услубини мослаш"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
-msgstr "Операцион система юклагичининг асосий параметрлари"
+msgstr "Операцион тизим юклагичининг асосий параметрлари"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAM'нинг ҳажмини киритинг (Мб)"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: 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 "Махфий сўзлар мос келмайди"
 
-#: 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 "Илтимос яна уриниб кўринг"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
-msgstr "ОС юклагичи"
-
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "OС юклагичини ўрнатиш"
+msgstr "ОТ юклагичи"
 
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Тизимни юклаш ускунаси"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Андоза тасвирни юклашдан олдин кутиш вақти"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI'ни ёқиш"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "APIC'ни тақиқлаш"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: 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 "Махфий сўз"
 
-#: 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 "Махфий сўз (яна)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "чегаралаш"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Тизимни юклашда /tmp директориясини бўшатиш"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Керак бўлса, RAM'нинг аниқ ҳажми (%d Мб топилди)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr ""
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr ""
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
-msgstr "Андоза ОС?"
+msgstr "Андоза ОТ?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
-msgstr "Тасвир"
+msgstr "Расм"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Дискнинг туб қисми"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr ""
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Видео усули"
 
-#: 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 "Тармоқнинг профили"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Белги"
 
-#: 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 "Андоза"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd'нинг ҳажми"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Видеосиз"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Бўш белгини ишлатиш мумкин эмас"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Кернелнинг тасвирини кўрсатишингиз керак."
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Дискнинг туб қисмини киритишингиз шарт"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Белги аллақачон ишлатилган"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Банднинг қайси турини қўшмоқчисиз?"
 
-#: 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 "Бошқа ОС (SunOS...)"
+msgstr "Бошқа ОТ (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
-msgstr "Бошқа ОС (MacOS...)"
+msgstr "Бошқа ОТ (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Бошқа ОТ (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -989,52 +1032,52 @@ msgstr ""
 "Қўшимча бандлар яратишингиз ёки мавжуд бўлган бандларни ўзгартиришингиз "
 "мумкин."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "Х дастурларидан фойдаланишга рухсат этиш"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM воситаларидан фойдаланишга рухсат этиш"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" буйруғидан фойдаланишга рухсат этиш"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "бошқарув файлларига рухсат"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "тармоқ воситалардан фойдаланишни рухсат этиш"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s аллақачон қўшилган)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Бу махфий сўз жуда оддий"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Илтимос фойдаланувчининг исмини киритинг"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1042,22 +1085,22 @@ msgstr ""
 "Фойдаланувчининг исми фақат кичкина ҳарф, сон, \"-\" ва \"_\" белгиларидан "
 "иборат бўлиши шарт"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Фойдаланувчининг исми жуда узун"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Фойдаланувчининг исми аллақачон қўшилган"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Фойдаланувчини қўшиш"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1066,75 +1109,78 @@ msgstr ""
 "Фойдаланувчини киритинг\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 "Тайёр"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Қабул қилиш"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Фойдаланувчининг ҳақиқий исми-шарифи"
 
-#: 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"
+msgid "Login name"
 msgstr "Фойдаланувчи"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Консол"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Нишонча"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Тизимга автоматик равишда кириш"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
-"Мен компьютерингизни системага битта фойдаланувчи автоматик равишда киришга "
-"мослашим мумкин."
+"Компьютерни битта фойдаланувчи автоматик равишда киришга мослаш мумкин."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Бу қулайликдан фойдаланишни истайсизми?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Андоза фойдаланувчини танланг:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Ойналар бошқарувчисини танланг:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Илтимос фойдаланиш учун тилни танланг."
 
-#: 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"
@@ -1142,48 +1188,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Андоза сифатида Юникоддан фойдаланиш"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Ҳамма тиллар"
 
-#: 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 "Давлат / Регион"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Давлатингизни танланг."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Мавжуд бўлган давлатларнинг тўлиқ рўйхати"
 
-#: 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 "Кўпроқ"
+msgid "Other Countries"
+msgstr "Бошқа давлатлар"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Киритиш усули:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Йўқ"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Ҳамма фойдаланувчиларга рухсат"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1193,21 +1248,21 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
 
-#: 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 ""
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
@@ -1215,104 +1270,213 @@ msgstr ""
 "Сиз NFS ёки Samba ёрдамида экспорт қилишингиз мумкин. Илтимос биттасини "
 "танланг."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "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 "Ёпиш"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Локал файллар"
+msgid "Local file"
+msgstr "Локал файл"
 
-#: 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 ""
 
-#: 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 "Локал файл:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windows домени:"
+
+#: 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:38
+#: 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:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Тасдиқловчи LDAP"
 
-#: authentication.pm:39
-#, c-format
+#: authentication.pm:61
+#, fuzzy, c-format
 msgid "LDAP Base dn"
-msgstr ""
+msgstr "LDAP махфий сўз:"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP сервери"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "осон"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr ""
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr ""
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 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 "Домен"
 
-#: 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 "Сервер"
 
-#: authentication.pm:53
-#, c-format
+#: authentication.pm:89
+#, fuzzy, c-format
 msgid "LDAP users database"
+msgstr "Маълумот базаси"
+
+#: 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
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Фойдаланувчи учун махфий сўз"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Кодлаш"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Тасдиқловчи NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS домени"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "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 "
@@ -1329,28 +1493,38 @@ msgid ""
 "good."
 msgstr ""
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr ""
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr ""
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: 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 "Андоза Idmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
 #. -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"
@@ -1359,65 +1533,60 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Operasion sistemani tanlash dasturiga marhamat!\n"
+"Operatsion tizimni tanlash dasturiga marhamat!\n"
 "\n"
-"Yuqoridagi ro'yxatdan operasion sistemani tanlang\n"
+"Yuqoridagi ro'yxatdan operasion tizimni tanlang\n"
 "yoki andoza uchun kutib turing.\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 (график меню)"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO (матн меню)"
 
-#: 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 "/boot директориясида етарли жой йўқ"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Операцион система юклагичини дискнинг %s қисмига ўрнатолмайсиз\n"
+msgstr "Операцион тизим юклагичини дискнинг %s қисмига ўрнатиб бўлмайди\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
-msgstr "ОС юклагичини қайтадан ўрнатиш"
+msgstr "ОТ юклагичини қайтадан ўрнатиш"
 
 #: common.pm:125
 #, c-format
@@ -1474,76 +1643,79 @@ msgstr "kdesu дастури етишмаяпти"
 msgid "consolehelper missing"
 msgstr "consolehelper дастури етишмаяпти"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "Франция"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: 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 "Белгия"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Чех Республикаси"
 
-#: 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 "Олмония"
 
-#: 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 "Греция"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Норвегия"
 
-#: 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 "Швеция"
 
-#: 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 "Нидерландлар"
 
-#: 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 "Италия"
 
-#: 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 "Австрия"
 
-#: 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 "Қўшма Штатлар"
 
-#: 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"
@@ -1552,66 +1724,60 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Янги"
 
-#: 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 "Узиш"
 
-#: 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 "Улаш"
 
-#: 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 "Улаш нуқтаси"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Илтимос WebDAV серверининг URL'ини киритинг"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL http:// ёки https:// билан бошланиши шарт"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Сервер: "
 
-#: 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 "Улаш нуқтаси: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Параметрлар: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Диққат билан ўқинг!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Илтимос аввало маълумотларингиздан заҳира нусха олинг"
 
-#: 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 "
@@ -1622,17 +1788,17 @@ msgstr ""
 "сектор етади)\n"
 "қолдириш эсингиздан чиқмасин"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Ёрдамчи"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Амални танланг"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1643,241 +1809,247 @@ msgstr ""
 "Аввало, унинг ҳажмини ўзгартиришни таклиф қиламан\n"
 "(уни босинг кейин \"Ҳажмини ўгартириш\" тугмасини босинг)."
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Илтимос дискнинг қисмини босинг"
 
-#: 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 "Тафсилотлар"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Қаттиқ дисклар топилмади"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ехт2"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
 msgstr "Журналли ФС"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Своп"
 
-#: 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 "Бошқа"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Бўш"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
-msgstr "Файл системанинг турлари:"
+msgstr "Файл тизимнинг турлари:"
 
-#: 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 "Бунинг ўрнига \"%s\"ни ишлатинг"
 
-#: 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 "Тури"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Яратиш"
 
 #. -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 "Ўчириш"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Аввало \"Unmount\"ни ишлатинг"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Дискнинг бошқа қисмини танлаш"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Дискнинг қисмини танлаш"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Чиқиш"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
-msgstr "Амални бекор қилиш"
+msgstr "Бекор қилиш"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Одий усулига ўтиш"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Эксперт усулига ўтиш"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
-msgstr "Бунга қарамасдан давом этайми?"
+msgstr "Бунга қарамасдан давом этишни истайсизми?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Сақламасдан чиқиш"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Дискнинг қисмлар жадвалини сақламасдан чиқайми?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/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 ""
 "Дискнинг қисмлар жадвалига киритилган ўзгаришлар кучга кириши учун "
 "компьютерни ўчириб-ёқишингиз керак."
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Ҳаммасини тозалаш"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Авто-тақсимлаш"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Кўпроқ"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Қаттиқ диск ҳақида маълумот"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Дискнинг ҳамма асосий қисмлари ишлатилмоқда"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Бошқа қисм қўшиб бўлмайди"
 
-#: 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 "
 "partition"
 msgstr "Дискда кенгайтирилган қисм яратиш учун илтимос битта қисмни ўчиринг"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Дискнинг қисмлар жадвалини сақлаш"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Дискнинг қисмлар жадвалини қайтадан тиклаш"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Дискнинг қисмлар жадвалини қайтадан юклаш"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr ""
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Файлни танлаш"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: 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 "Диққат"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1886,92 +2058,92 @@ msgstr ""
 "Дискетни ускунага қўйинг.\n"
 "Ундаги ҳамма маълумот йўқолади."
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Батафсил маълумот"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Ҳажмини ўзгартириш"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Кўчириш"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Формат қилиш"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "RAID'га қўшиш"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "LVM'га қўшиш"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "RAID'дан олиб ташлаш"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "LVM'дан олиб ташлаш"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'ни ўзгартириш"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Loopback учун ишлатиш"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Дискда янги қисм яратиш"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Бошланғич сектор: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Ҳажми (Мб): "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
-msgstr "Файл системанинг тури: "
+msgstr "Файл тизимнинг тури: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Афзал кўриш: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr ""
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -1983,12 +2155,12 @@ msgstr ""
 "Аввало дискнинг асосий қисмини олиб таншланг кейин дискнинг кенгайтирилган "
 "қисмини яратинг."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "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"
@@ -1996,230 +2168,225 @@ msgstr ""
 "Дискнинг %s қисмининг турини ўзгартиришдан кейин ундаги ҳамма маълумот "
 "йўқолади"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Дискнинг қисмининг турини ўзгартириш"
 
-#: 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 "Сизга қанақа файл тизими керак?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Ext2 файл тизимидан ext3 файл тизимига ўтилмоқда"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "%s loopback файлини қаерга уламоқчисиз?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "%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"
 "Remove the loopback first"
 msgstr ""
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Дискнинг %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 "Ҳажм ўзгартирилмоқда"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "FAT файл тизимининг боғлари ҳисобланмоқда"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Дискнинг бу қисмининг ҳажмини ўзгартириб бўлмайди"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Дискнинг %s қисмининг ҳажмини ўзгартиргандан кейин у ердаги ҳамма маълумот "
 "йўқолади"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Янги ҳажмни танланг"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Янги ҳажм (Мб): "
 
-#: 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"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Буни қайси дискга кўчирмоқчисиз?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Сектор"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Буни қайси секторга кўчирмоқчисиз?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Кўчирилмоқда"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Дискнинг қисми кўчирилмоқда..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Қўшиш учун мавжуд бўлган RAID'ни танланг"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "янги"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Қўшиш учун мавжуд бўлган LVM'ни танланг"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVM номи?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Дискнинг бу қисмини loopback учун ишлатиб бўлмайди"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback файлининг номи:"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Файлнинг номини киритинг"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Фйлни бошқа loopback ишлатаяпти, бошқасини танланг"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Файл аллақачон мавжуд. Ишлатайми?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Улаш параметрлари"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Ҳар хил"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "ускуна"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "даража"
 
-#: diskdrake/interactive.pm:985
-#, c-format
-msgid "chunk size"
-msgstr ""
+#: diskdrake/interactive.pm:989
+#, fuzzy, c-format
+msgid "chunk size in KiB"
+msgstr "Янги ҳажм (Мб): "
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Эҳтиёт бўлинг: бу операция хавфли."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Дискни қисмларга бўлишнинг қайси тури?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "%s пакети керак. Уни ўрнатайми?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Ўзгаришлар амалда қўлланилиши учун компьютерни ўчириб-ёқиш керак"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "%s дискининг қисмлар жадвали дискга сақланиш арафасида!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Дискнинг %s қисми формат қилгандан кейин у ердаги ҳамма маълумот йўқолади"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Файлларни дискнинг янги қисмига кўчириш"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Файлларни яшириш"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2228,53 +2395,53 @@ msgstr ""
 "Директорияда (%s) аллақачон маълумот бор\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Файллар дискнинг янги қисмига кўчирилмоқда"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "%s'дан нусха кўчирилмоқда"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "%s олиб ташланмоқда"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "дискнинг %s қисми энди %s сифатида маълум"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Ускуна: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "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 "DOS дискининг ҳарфи: %s (таваккалига)\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 "Тури: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Номи: "
@@ -2321,8 +2488,8 @@ msgstr "Уланган\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
@@ -2347,7 +2514,7 @@ msgstr "%s даража\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
+msgid "Chunk size %d KiB\n"
 msgstr ""
 
 #: diskdrake/interactive.pm:1191
@@ -2417,38 +2584,38 @@ msgstr "Диск қисмлар жадвалининг тури: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
-msgstr "Файл системанинг кодлаш калити"
+msgstr "Файл тизимнинг кодлаш калити"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
-msgstr "Файл системангизнинг кодлаш калитини танланг"
+msgstr "Файл тизимнгизнинг кодлаш калитини танланг"
 
-#: 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 "Кодлаш калити жуда содда (у энг ками %d белгидан иборат бўлиши шарт)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Кодлаш калитлари мос келмайди"
 
-#: 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 "Кодлаш калити"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Кодлаш калити (яна)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Турини ўзгартириш"
@@ -2479,7 +2646,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Фойдаланувчи"
@@ -2494,46 +2661,91 @@ msgstr "Серверларни қидириш"
 msgid "Search new servers"
 msgstr "Янги серверларни қидириш"
 
-#: 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 "Пакет (%s) ўрнатилиши керак. Уни ўрнатишни истайсизми?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Шарт бўлган пакет (%s) етишмаяпти"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Пакетлар ўрнатилмоқда..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Пакетлар ўчирилмоқда..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Диск қисми (%s) уланмоқда"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "Диск қисмини (%s) директорияга (%s) улаш муваффақиятсиз тугади"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "%s текширилмоқда"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "%s'ни ажратишда хато: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Дискнинг своп қисми (%s) ёқилмоқда"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Дискнинг қисми (%s) формат қилинмоқда"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "%s файли яратилмоқда ва формат қилинмоқда"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "%s'ни %s турида қандай формат қилишни билмайман"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s турида %s'ни формат қилиш муваффақиятсиз тугади"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2541,7 +2753,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2549,17 +2761,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Файл тизимларни фақат ўқишга деб улаш."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2570,65 +2782,28 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Оддий фойдаланувчиларга ёзиш рухсатини бериш"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Оддий фойдаланувчиларга фақат ўқишга рухсатини бериш"
 
-#: 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 турида %s'ни формат қилиш муваффақиятсиз тугади"
-
-#: fs.pm:655
+#: fs/type.pm:364
 #, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "%s'ни %s турида қандай формат қилишни билмайман"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Дискнинг қисми (%s) формат қилинмоқда"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "%s файли яратилмоқда ва формат қилинмоқда"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Диск қисми (%s) уланмоқда"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "Диск қисмини (%s) директорияга (%s) улаш муваффақиятсиз тугади"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "%s текширилмоқда"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "%s'ни ажратишда хато: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Дискнинг своп қисми (%s) ёқилмоқда"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr ""
+"Ҳажми 16 Мб'дан кичик бўлган қисмлар учун JFS файл тизимини ишлатиб бўлмайди"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "осон"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+"Ҳажми 32 Мб'дан кичик бўлган қисмлар учун ReiserFS файл тизимини ишлатиб "
+"бўлмайди"
 
 #: fsedit.pm:25
 #, c-format
@@ -2640,7 +2815,7 @@ msgstr "/usr билан"
 msgid "server"
 msgstr "сервер"
 
-#: 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"
@@ -2651,35 +2826,22 @@ msgid ""
 "Do you agree to lose all the partitions?\n"
 msgstr ""
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr ""
-"Ҳажми 16 Мб'дан кичик бўлган қисмлар учун JFS файл тизимини ишлатиб бўлмайди"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
-"Ҳажми 32 Мб'дан кичик бўлган қисмлар учун ReiserFS файл тизимини ишлатиб "
-"бўлмайди"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Улаш нуқталари \"/\" белгиси билан бошланиши шарт"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Улаш нуқталари фақат сон ёки ҳарфлардан иборат бўлиши мумкин"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "%s улаш нуқтали дискнинг қисми аллақачон мавжуд\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2687,12 +2849,12 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2700,19 +2862,19 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: 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 "Бу директория туб файл тизимида бўлиши керак"
 
-#: 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 "
@@ -2721,133 +2883,127 @@ msgstr ""
 "Бу улаш нуқтаси учун ҳақиқий файл тизими (ext2/ext3, reiserfs, xfs, ёки jfs) "
 "керак\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "%s улаш нуқтаси учун кодланган файл тизимини ишлатиб бўлмайди"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Авто-тақсимлаш учун етарлича жой йўқ"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Бажариш учун ҳеч нарса йўқ"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Ёзиш учун %s'ни очишда хато: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Дискет"
 
-#: 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 "Диск"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "Компакт-диск"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Ёзадиган компакт-диск/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 "Магнит тасма"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Видео карта"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "ТВ карта"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Бошқа мултимедиа ускуналар"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Товуш картаси"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Веб-камера"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Процессорлар"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN адаптерлар"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet карта"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Модем"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL адаптерлар"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP контроллерлар"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
-msgstr "Кўприклар ва системанинг контроллерлари"
+msgstr "Кўприклар ва тизимнинг контроллерлари"
 
-#: 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 "Принтер"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Сичқонча"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2870,50 +3026,72 @@ msgstr "Файервол контроллерлар"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA контроллерлар"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI контроллерлар"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB контроллерлар"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "USB портлар"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus контроллерлар"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Тугматаг"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Сичқонча"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Сканнер"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Номаълум/Бошқалар"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "процессор # "
 
-#: 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 "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Бошқа драйвер йўқ"
 
-#: 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 "
@@ -2922,12 +3100,12 @@ msgstr ""
 "Сизнинг %s товуш картангизга, жорий ҳолда %s драйвери ишлатилмоқда, маълум "
 "бўлган бошқа OSS/ALSA драйвери мавжуд эмас."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Товушни мослаш"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2936,7 +3114,7 @@ msgstr ""
 "Бу ерда %s товуш картангиз учун бошқа драйверни (OSS ёки ALSA) танлашингиз "
 "мумкин."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -2949,7 +3127,7 @@ msgstr ""
 "Сизнинг картангиз %s\"%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 "
@@ -2969,64 +3147,65 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: 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 "Драйвер:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Носозликларни топиш ва бартараф қилиш"
 
-#: 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 ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: 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 "
 "driver at \"%s\"."
 msgstr ""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Маълум бўлган драйвер йўқ"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Сизнинг \"%s\" товуш картангиз учун маълум бўлган драйвер мавжуд эмас."
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Номаълум драйвер"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Хато: Товуш картангиз учун \"%s\" драйвери рўйхатда йўқ"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Товуш носозликларини топиш ва бартараф қилиш"
 
-#: 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"
@@ -3050,17 +3229,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Бошқа драйверни танлаш"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Ихтиёрий драйвер танланмоқда"
 
-#: 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 "
@@ -3142,17 +3322,17 @@ msgstr ""
 #, 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 ""
 "Давом этишдан олдин лицензиянинг шартларини эътибор билан ўқиб\n"
 "чиқинг. Лицензия бутун Mandrakelinux'га тегишли. Агар унинг барча\n"
 "шартларига рози бўлсангиз, \"%s\"ни танланг. Агар рози бўлмасангиз,\n"
-"компьютерингизни ўчириб-ёқиш учун \"%s\" тугмасини босинг."
+"компьютерни ўчириб-ёқиш учун \"%s\" тугмасини босинг."
 
-#: 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 "Қабул қилиш"
@@ -3160,61 +3340,65 @@ msgstr "Қабул қилиш"
 #: 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 ""
 
-#: 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 "Фойдаланувчи"
+
+#: 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 "Кейингиси"
+msgstr "Кейинги"
 
-#: 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 "Қўшимча"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3248,36 +3432,45 @@ msgid ""
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар\n"
-"танланган пакет бошқа компакт-дискда жойлашган бўлса, DrakX\n"
-"жорий компакт-дискни чиқаради ва тегишлисини қўйишни сўрайди."
+"Mandrakelinux бир нечта компакт-дискларда тарқатилади. Агар танланган пакет\n"
+"бошқа компакт-дискда жойлашган бўлса, DrakX жорий компакт-дискни\n"
+"чиқаради ва тегишлисини қўйишни сўрайди. Агар сўралган компакт-диск сизда\n"
+"бўлмаса, \"%s\" тугмасини босинг. Бу ҳолда, тегишли пакетлар ўрнатилмайди."
 
-#: 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"
@@ -3287,9 +3480,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"
@@ -3299,187 +3502,147 @@ 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 ""
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Иш станцияси"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Тузиш"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Пакетларни биттама-битта танлаш"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Янгилаш"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "X билан"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Асосий қўлланмалар билан"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Ҳақиқий минимал ўрнатиш"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Пакетларни биттама-битта танлаш"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Янгилаш"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 
-#: 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 "Йўқ"
 
-#: 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 "Ҳа"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr ""
 
-#: 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 ""
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Авто-аниқлашдан фойдаланиш"
-
-#: 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 ""
 
-#: 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 "Мослаш"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3487,72 +3650,79 @@ 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 ""
 
-#: 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 ""
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr ""
 
-#: help.pm:238
-#, c-format
+#: help.pm:220
+#, fuzzy, 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 ""
+"Монитор\n"
+"\n"
+"   Одатда, ўрнатувчи компьютерингизга уланган мониторни\n"
+"автоматик равишда аниқлайди ва мослайди. Агар бу нотўғри\n"
+"бўлса, аслида уланган мониторни рўйхатдан танлашингиз мумкин."
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3561,31 +3731,31 @@ 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 ""
 
-#: 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 ""
 "Монитор\n"
 "\n"
@@ -3593,92 +3763,93 @@ msgstr ""
 "автоматик равишда аниқлайди ва мослайди. Агар бу нотўғри\n"
 "бўлса, аслида уланган мониторни рўйхатдан танлашингиз мумкин."
 
-#: 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 ""
 
-#: 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 ""
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -3686,52 +3857,53 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Бўш жойдан фойдаланиш"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Дискда бор қисмлардан фойдаланиш"
 
-#: 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 "Дискнинг Windows қисмидаги бўш жойдан фойдаланиш"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Бутун дискни ўчириш"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Windows'ни ўчириш"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Дискни бошқача бўлиш"
 
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -3739,119 +3911,119 @@ 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 ""
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Авто-ўрнатиш дискетни яратиш"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Қайтариш"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Автоматик"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Пакетлар танловини сақлаш"
 
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"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"
-"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"
+"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 ""
 
-#: 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 "Олдингиси"
+msgstr "Олдинги"
 
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: 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 "Ўрнатиш"
 
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Хавфсизлик бошқарувчиси"
 
-#: 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"
@@ -3926,17 +4098,17 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Одий/эксперт усулига ўтиш"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -3970,80 +4142,81 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4052,66 +4225,74 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr ""
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr ""
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Истаган PS/2 ва USB сичқонча"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4120,16 +4301,16 @@ msgstr ""
 "Илтимос тўғри портни танланг. Масалан, Windows'даги \"COM1\"\n"
 "портининг номи GNU/Linux'да \"ttyS0\"."
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4138,201 +4319,104 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "тасдиқлаш"
 
 #. -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 "Махфий сўзсиз"
 
-#: 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 ""
-
-#: 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 "Андоза ОСни юклашдан олдин кутиб туриш вақти"
-
-#: help.pm:771
+#: help.pm:725
 #, c-format
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-
-#: 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 "Қўшиш"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Ўзгартириш"
-
-#: 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 "Олиб ташлаш"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr ""
 
-#: 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 "Эксперт"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4353,157 +4437,74 @@ msgid ""
 "configure the driver."
 msgstr ""
 
-#: help.pm:847
-#, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-
-#: help.pm:894
+#: help.pm:786
 #, 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."
+"\"%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 ""
-
-#: help.pm:926
-#, c-format
-msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
-msgstr ""
-"\"%s\": агар системангизда товуш картаси аниқланса у шу ерда кўрсатилади.\n"
-"Агар кўрсатилган товуш картаси системангиздаги товуш картаси\n"
+"\"%s\": агар компьютерда товуш картаси аниқланса у шу ерда кўрсатилади.\n"
+"Агар кўрсатилган товуш картаси компьютердаги товуш картаси\n"
 "билан мос келмаса, тугмани босиб бошқа драйверни танлашингиз мумкин."
 
-#: 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 "Товуш карта"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -4513,66 +4514,67 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Тугматаг"
-
-#: 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 "Вақт зонаси"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "График интерфейс"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "ТВ карта"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "График интерфейс"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Тармоқ"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Проксилар"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Хавфсизлик даражаси"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
-msgstr "ОС юклагичи"
+msgstr "ОТ юклагичи"
 
-#: 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 "Хизматлар"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -4580,7 +4582,7 @@ msgid ""
 "and will not be recoverable!"
 msgstr ""
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -4599,7 +4601,17 @@ msgstr ""
 "Маълумотни ва дискнинг барча қисмларини йўқотмасдан бу\n"
 "операцияни тўхтатиш учун \"%s\"ни босинг."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Кейинги ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Олдинги"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -4607,12 +4619,82 @@ msgid ""
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Сиз %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 ""
+"Ўрнатиш учун ишлатиладиган қуйидаги манба топилди: %s\n"
+"\n"
+"\n"
+"Сизда қўшимчи манба борми?"
+
+#: 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 "Компакт-диск"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Тармоқ (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Тармоқ (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Ҳеч қандай ускуна топилмади"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr ""
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr ""
+
+#: 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 "%s'ни %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"
@@ -4626,7 +4708,8 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: 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"
@@ -4639,41 +4722,46 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Илтимос %s ускунасига формати FAT бўлган дискетни қўйинг"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Бу дискетнинг формати FAT эмас"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: 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 файлини ўқишда хато рўй берди"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (аввал %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Тизимни ўрнатиш"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Тизимни мослаш"
@@ -4707,7 +4795,7 @@ msgstr ""
 "\n"
 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: 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 "Сизда /boot/efi нуқтасига уланган дискнинг FAT қисми бўлиши шарт"
@@ -4767,7 +4855,7 @@ msgstr "Дискнинг қайси қисмининг ҳажмини ўзгар
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 
 #: install_interactive.pm:156
@@ -4783,7 +4871,8 @@ msgid ""
 "installation."
 msgstr ""
 
-#: 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"
@@ -4798,55 +4887,55 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr ""
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "дискнинг %s қисми"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Дискнинг Windows қисмининг ҳажмини ўзгартириш"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Дискнинг 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 ""
 "Ҳажмини ўзгартириш учу дискда FAT қисм мавжуд эмас (ёки етарли жой мавжуд "
 "эмас)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "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 ""
 "Сизда биттадан кўп қаттиқ диск мавжуд. Уларни қайсига 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 "%s дискнинг барча қисмлари ва улардаги барча маълумот ўчирилади"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Fdisk дастуридан фойдаланиш"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4855,32 +4944,33 @@ msgstr ""
 "Энди сиз %s дискни бўлишингиз мумкин.\n"
 "Тугатгач \"w\" билан сақлаш эсингиздан чиқмасин."
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Ўрнатиш учун жой топилмади"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX дискни бўлиш ёрдамчиси қуйидаги ечимларни топди:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Дискни бўлиш муваффақиятсиз тугади: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Тармоқ ишга туширилмоқда"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Тармоқ ўчирилмоқда"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -4898,7 +4988,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 "
@@ -4920,7 +5010,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"
@@ -4928,14 +5018,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"
@@ -4965,10 +5055,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"
@@ -4979,11 +5069,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"
@@ -4999,14 +5089,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 ""
 "Кириш\n"
 "\n"
-"Mandrakelinux дистрибутивида мавжуд бўлган операцион система ва унинг турли "
+"Mandrakelinux дистрибутивида мавжуд бўлган операцион тизим ва унинг турли "
 "қисмлари \n"
 "бундан буён \"Дастурий Маҳсулотлар\" деб юритилади. Дастурий маҳсулотлар \n"
-"Mandrakelinux дистрибутивнинг қисмлари ва операцион система билан боғлиқ "
+"Mandrakelinux дистрибутивнинг қисмлари ва операцион тизим билан боғлиқ "
 "бўлган\n"
 "дастурлар тўплами, усуллар, қоидалар ва қўлланмаларни ўз ичига олади, аммо "
 "бу билан чекланмайди.\n"
@@ -5015,7 +5105,7 @@ msgstr ""
 "1. Лицензия келишуви\n"
 "\n"
 "Илтимос, ушбу ҳужжатни диққат билан ўқиб чиқинг. Бу ҳужжат Сиз билан "
-"MandrakeSoft S.A. \n"
+"Mandrakesoft S.A. \n"
 "ўртасида Дастурий Маҳсулотлари бўйича имзоланадиган лицензия келишувидир.\n"
 "Дастурий Маҳсулотларни ҳар қандай мақсад билан ўрнатиб, кўпайтириб ёки \n"
 "улардан фойдаланиб Сиз мазкур Лицензиянинг шартлари ва қоидаларини тўлиқ "
@@ -5037,7 +5127,7 @@ msgstr ""
 "\n"
 "Дастурий Маҳсулотлар ва уларга илова қилинган қўлланмалар \"ўз ҳолича\", "
 "қонунда йўл қўйилган\n"
-"даражада ҳеч қандай кафолатларсиз тақдим қилинади. MandrakeSoft S.A. қонунда "
+"даражада ҳеч қандай кафолатларсиз тақдим қилинади. Mandrakesoft S.A. қонунда "
 "йўл қўйилган\n"
 "даражада ҳеч қандай ҳолатда Дастурий Маҳсулотлардан фойдаланиш ёки "
 "фойдаланмаслик оқибатида\n"
@@ -5046,19 +5136,19 @@ msgstr ""
 "касод бўлиши, тижорат фаолиятидаги узилишлар, молиявий зарарлар, суд "
 "маҳкамалари натижасидаги\n"
 "суд харажатлари ёки жарималар ёки бошқа ҳар қандай билвосита йўқотишлар) "
-"учун, ҳатто MandrakeSoft S.A.'га\n"
+"учун, ҳатто Mandrakesoft S.A.'га\n"
 "шундай зарар кўриш имконияти ёки ҳолатлари маълум бўлган тақдирда ҳам,\n"
 "жавобгар бўлмайди.\n"
 "\n"
 "БАЪЗИ МАМЛАКАТЛАРДА МАН ҚИЛИНГАН ДАСТУРИЙ МАҲСУЛОТЛАРГА ЭГАЛИК ҚИЛИШ\n"
 "ЁКИ УЛАРДАН ФОЙДАЛАНИШ БИЛАН БОҒЛИҚ ЧЕКЛАНГАН МАСЪУЛИЯТ\n"
 "\n"
-"MandrakeSoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
+"Mandrakesoft S.A. ёки унинг тарқатувчилари қонунда йўл қўйилган даражада ҳеч "
 "қандай ҳолатда\n"
 "баъзи мамлакатларнинг маҳаллий қонунлари билан чекланган ёки ман қилинган "
 "дастурий\n"
-"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки Mandrake "
-"Linux\n"
+"маҳсулотларнинг қисмларига эгалик қилиш ва улардан фойдаланиш, ёки "
+"Mandrakelinux\n"
 "сайтларининг биридан дастурий маҳсулотнинг қисмларини кўчириб олиш оқибатида "
 "тасодифий,\n"
 "тўғридан-тўғри, бевосита ёки билвосита етказилган зарарлар (шу жумладан "
@@ -5086,11 +5176,11 @@ msgstr ""
 "ҳар бири\n"
 "учун лицензия келишувининг шартлари ва қоидаларини диққат билан ўқиб чиқинг. "
 "Қисмнинг\n"
-"лицензиясига оид ҳар қандай саволлар MandrakeSoft'га эмас, балки қисмнинг "
+"лицензиясига оид ҳар қандай саволлар Mandrakesoft'га эмас, балки қисмнинг "
 "муаллифига юборилиши\n"
-"лозим. MandrakeSoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
+"лозим. Mandrakesoft S.A. томонидан ишлаб чиқилган дастурлар GPL лицензияси "
 "таъсири\n"
-"остидадир. MandrakeSoft S.A. томонидан ёзилган қўлланмалар эса махсус "
+"остидадир. Mandrakesoft S.A. томонидан ёзилган қўлланмалар эса махсус "
 "лицензия таъсири\n"
 "остидадир. Илтимос, қўшимча маълумот учун қўлланмаларга мурожаат қилинг.\n"
 "\n"
@@ -5101,12 +5191,12 @@ msgstr ""
 "муаллифларига\n"
 "тегишли бўлиб, интеллектуал мулк ва дастурий маҳсулотларга оид муаллифлик "
 "ҳуқуқи\n"
-"тўғрисидаги қонунлар билан ҳимояланади. MandrakeSoft S.A. Дастурий "
+"тўғрисидаги қонунлар билан ҳимояланади. Mandrakesoft S.A. Дастурий "
 "Маҳсулотларни тўлиқ\n"
 "ёки қисман, ҳар қандай йўл билан ва исталган мақсадларда ўзгартириш ёки "
 "мослаштириш ҳуқуқини\n"
 "ўзида сақлаб қолади. \"Mandrake\", \"Mandrakelinux\" ва тегишли белгилар "
-"MandrakeSoft S.A.'га\n"
+"Mandrakesoft S.A.'га\n"
 "тегишли савдо белгиларидир.\n"
 "\n"
 "\n"
@@ -5124,10 +5214,10 @@ msgstr ""
 "судда муҳокама қилинади.\n"
 "Сўнгги навбатда масаланинг кўрилиши тегишли Париж (Франция) Қонунчилик "
 "судига ҳавола қилинади.\n"
-"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича MandrakeSoft S.A. "
+"Илтимос, мазкур ҳужжатга оид ҳар қандай саволлар бўйича 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"
@@ -5139,7 +5229,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: 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"
@@ -5172,7 +5263,7 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5205,30 +5296,31 @@ msgstr ""
 "Тизимни мослаш ҳақида маълумот Mandrakelinux\n"
 "фойдаланувчилари учун расмий қўлланмасида мавжуд."
 
-#: 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 "Бир ҳил улаш нуқталари %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 ""
 "Баъзи бир муҳим пакетлар тўғри ўрнатилмади.\n"
 "Сизнинг компакт-диск ускунангизда ёки компакт-дискингизда хато бор.\n"
-"Компакт-дискни ўрнатилган компьютерда \"rpm -qpl Mandrake/RPMS/*.rpm\" "
-"буйруғи билан текшириб кўринг.\n"
+"Компакт-дискни ўрнатилган компьютерда \"rpm -qpl media/main/*.rpm\" буйруғи "
+"билан текшириб кўринг.\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Ҳеч қандай дискет ускунаси мавжуд эмас"
@@ -5238,7 +5330,7 @@ msgstr "Ҳеч қандай дискет ускунаси мавжуд эмас"
 msgid "Entering step `%s'\n"
 msgstr "%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"
@@ -5247,94 +5339,94 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: 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 "Пакетларни гуруҳ бўйича танлаш"
 
-#: 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 "Жами: %d / %d Мб"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Ёмон пакет"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Версияси: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Ҳажми: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Кб\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Муҳимлиги: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Бу пакетни танлолмайсиз/танлашни бекор қилолмайсиз"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "%s етишмагани учун"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: 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 ""
+msgstr "%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"
 msgstr ""
 "Бу пакетни танлолмайсиз, чунки уни ўрнатиш учун етарли жой мавжуд эмас."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Қуйидаги пакетлар ўрнатилади"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Қуйидаги пакетлар олиб ташланилади."
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Бу ўрнатилиши шарт бўлган пакет, уни танлашни бекор қилиб бўлмайди."
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Бу пакетни танлашни бекор қилолмайсиз. У аллақачон ўрнатилган."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5343,237 +5435,241 @@ msgstr ""
 "Бу пакет янгиланиши шарт.\n"
 "Уни танлашни бекор қилишга ишончингиз комилми?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Бу пакетни танлашни бекор қилолмайсиз. У янгиланиши шарт."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Автоматик равишда танланган пакетларни кўрсатиш"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Дискетдан/га юклаш/сақлаш"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Пакетлар танлови янгиланмоқда"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Минимал ўрнатиш"
 
-#: 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 "Сиз ўрнатмоқчи бўлган пакетларни танланг"
 
-#: 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 "Ўрнатилмоқда"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Тафсилотларсиз"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Чамаланмоқда"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Қолган вақт "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Илтимос кутиб туринг, ўрнатишга тайёрланмоқда..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Тафсилотларсиз"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d пакет"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "%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 "Рад этиш"
 
-#: 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 ""
 "Компакт-дискни алмаштиринг!\n"
 "\n"
-"Илтимос \"%s\" белгили компакт-дискни қўйинг ва \"Ок\" тугмасини босинг.\n"
+"Илтимос '%s' белгили компакт-дискни қўйинг ва \"Ок\" тугмасини босинг.\n"
 "Агар у сизда бўлмаса, бу компакт-дискдан ўрнатишни бекор қилиш учун \"Бекор "
 "қилиш\" тугмасини босинг."
 
-#: 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 "Қуйидаги пакетларни саралашда хато рўй берди:"
 
-#: 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 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: 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 "Қуйидаги пакетларни ўрнатишда хато рўй берди:"
 
-#: 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 "мосланмаган"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr ""
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Лицензия келишуви"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Янги нарсалар"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Илтимос тугмалар тартибини танланг."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Мавжуд бўлган тугматагларнинг тўлиқ рўйхати"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ўрнатиш/Янгилаш"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бу ўрнатишми ёки янгилашми?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s'ни янгилаш"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s учун кодлаш калити"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Илтимос сичқончанинг турини танланг."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Сичқончанинг порти"
 
-#: 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 "Илтимос сичқонча уланган кетма-кет портини танланг."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: 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 "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 "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 "Дискнинг қисми йўқ."
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Улаш нуқталарини топиш учун дискнинг қисмлари текширилмоқда"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Улаш нуқталарини танланг"
 
-#: 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 "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Формат қилиш учун дискнинг қисмларини танланг"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr " Хато блокларни текширайми?"
 
-#: 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, "
@@ -5582,83 +5678,94 @@ msgstr ""
 "%s файл тизимини текшириш муваффақиятсиз тугади. Хатоларни тузатишни "
 "истайсизми? (эсингизда турсин, сиз маълумотни йўқотишингиз мумкин)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "Мавжуд бўлган пакетларни қидириш ва 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 "Мавжуд бўлган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Аллақачон ўрнатилган пакетлар қидирилмоқда..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Янгилаш учун пакетлар қидирилмоқда..."
 
-#: 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 ""
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Пакетларни олиш учун ойнани танланг"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "Тизимда ўрнатиш ёки янгилаш учун етарли жой қолмади (%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"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Дискетдан юклаш"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Дискетга сақлаш"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Пакетларни танлаш"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Дискетдан юкланмоқда"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Пакетлар танлови мавжуд бўлган дискетни қўйинг"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Ўрнатишнинг тури"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -5667,22 +5774,22 @@ msgstr ""
 "Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
 "Илтимос сиз истаган минимал ўрнатишни танланг:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Асосий қўлланмалар билан (тавсия қилинади!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ҳақиқий минимал ўрнатиш (хусусан urpmi'сиз)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Ҳаммаси"
 
-#: 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"
@@ -5695,17 +5802,17 @@ msgstr ""
 "Агар улардан баъзи бири бўлмаса, уларни танлашни бекор қилинг ва \"Ок\" "
 "тугмасини босинг."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "\"%s\" белгили компакт-диск"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Ўрнатишга тайёрланмоқда"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5714,17 +5821,17 @@ msgstr ""
 "%s пакети ўрнатилмоқда\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ўрнатишдан кейин мослаш"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: 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"
@@ -5734,88 +5841,77 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
-msgstr ""
-
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Пакетларни олиш учун ойнани танланг"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Мавжуд бўлган пакетларнинг рўйхатини олиш учун ойна билан алоқа "
 "ўрнатилмоқда..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Ойна (%s)билан алоқа ўрнатиб бўлмади."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Бошқадан уриниб кўришни истайсизми?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Вақт зонангизни танланг?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP сервери"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Ҳисобот"
 
-#: 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 "Тизим"
 
-#: 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 "Асбоб-ускуналар"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Масофадаги CUPS сервери"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Принтер йўқ"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизда ISA товуш картаси борми?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -5824,97 +5920,92 @@ msgstr ""
 "Ўрнатишдан кейин, товуш картангизни мослаш учун, \"sndconfig\" ёки \"alsaconf"
 "\" дастурини ишга туширинг"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Товуш картаси топилмади. Ўрнатишдан кейин \"harddrake\" дастурини синаб "
 "кўринг."
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "График интерфейс"
 
-#: 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 "Тармоқ ва Интернет"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Проксилар"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "мосланган"
 
-#: 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 "Хавфсизлик"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "ишлаяпти"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "ўчирилган"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Тизимни юкланиши"
 
 #. -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 %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 "Хизматлар: %d ишламоқда %d қайд қилинган"
 
-#: 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 "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "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 "Бу махфий сўз жуда қисқа (у энг ками %d белгидан иборат бўлиши шарт)"
 
-#: 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 "Тасдиқлаш"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
-msgstr "ОС юклагичи тайёрланмоқда..."
+msgstr "ОТ юклагичи тайёрланмоқда..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5923,64 +6014,41 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "aboot дастуридан фойдаланишни истайсизми?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "ОС юклагичи ўрнатилмоқда"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"Операцион система юклагичини ўрнатиш муваффақиятсиз тугади. Қуйидаги хато "
-"рўй берди:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: 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 "Бўш дискетни %s ускунасига қўйинг"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Илтимос драйверлар учун бошқа дискетни қўйинг"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Авто-ўрнатиш дискети яратилмоқда..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5991,12 +6059,12 @@ msgstr ""
 "\n"
 "Ростдан чиқишни истайсизми?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Авто-ўрнатиш дискетни яратиш"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6011,7 +6079,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "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 "
@@ -6023,17 +6092,37 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Файлни танланг"
 
+#: 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 "Қўшиш"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "Ўзгартириш"
+
+#: 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 "Олиб ташлаш"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Асосий"
 
-#: 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 "Тайёр"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Бажариш"
@@ -6109,572 +6198,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Бошқадан жўнатиш"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Чехча (qwertz)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Олмонча"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Дворак"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "Испанча"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Финча"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Французча"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Норвегча"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Полякча"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Русча"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Шведча"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Буюк Британия"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "АҚШ"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Албанча"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Арманча (эски)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Арманча (ёзиш мошинаси)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Арманча (фонетик)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Арабча"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Озарбайжонча (лотин)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Белгиача"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Бенгалча"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Болгарча (фонетик)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Болгарча (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Бразилча (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Боснияча"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Белорусча"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Швейцария (Олмонча)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Швейцария (Французча)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Чехча (qwerty)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Олмонча (ўлик тугмаларсиз)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "Деванагари"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "Дания"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Дворак (АҚШ)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Дворак (Эсперанто)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Дворак (Норвегча)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Дворак (Шведча)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Эстонча"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Грузинча (рус)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Грузинча (лотин)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Грекча"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Грекча (политоник)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "Гужарати"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "Гурмухи"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Венгрча"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Хорватча"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Ирландча"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Исроилча"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Исроилча (фонетик)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Эронча"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Исландча"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Италянча"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Инуктитут"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Японча 106 тугма"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "Каннада"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Корейсча"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Қирғизча"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Лотин Америкача"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Лаосча"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Литвача AZERTY (эски)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Литвача AZERTY (янги)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Литвача \"рақамли қатор\" (qwerty)"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Литвача \"фонетик\" (qwerty)"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Латвиача"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Малайалам"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Македонча"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Мянмар (Бирма)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Муғулча (кирил)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Малта (Буюк Британия)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Малта (АҚШ)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Голландча"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "Ория"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Полякча (qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Полякча (qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Португалча"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Канадча (Квебек)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Руминча (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Руминча (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Русча (фонетик)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Саами (Норвегча)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Саами (Шведча/Финча)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Словенча"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Словакча (qwertz)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Словакча (qwerty)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Сербча (кирилча)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Сурияча"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Эски Сурияча (фонетик)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Телегу"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Тамилча (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Тамилча (ёзиш мошинаси)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Тайча"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Тожикча"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Туркча (анъанавий \"F\" модели)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Туркча (замонавий \"Q\" модели)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Украинча"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "АҚШ (халқаро)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Ўзбекча (кирил)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Ветнамча \"рақамли қатор\" (qwerty)"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Югославча (лотин)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Ўнг Alt тугмаси"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Бир вақтда иккала Shift тугмалари"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Shift тугмалари"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock тугмаси"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Бир вақтда Shift ва CapsLock тугмалари"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Alt тугмалари"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Бир вақтда Alt ва Shift тугмалари"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Меню\" тугмаси"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Чап \"Windows\" тугмаси"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Ўнг \"Windows\" тугмаси"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Бир вақтда иккала Ctrl тугмалари"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Бир вақтда иккала Alt тугмалари"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Чап Shift тугмаси"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Ўнг Shift тугмаси"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Чап Alt тугмаси"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Чап Ctrl тугмаси"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Ўнг Ctrl тугмаси"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6685,7 +6967,7 @@ msgstr ""
 "яратувчи тугма ёки тугмалар бирикмасини танлашингиз\n"
 "мумкин. (м-н: лотин ва лотин эмас)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6696,1164 +6978,1188 @@ msgstr ""
 "Ўрнатиш вақтида турли тугмалар тартибини танлаш учун\n"
 "ўнг \"Ctrl\" турмасини ишлатинг."
 
-#: 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 "Афғонистон"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Андорра"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Бирлашган Араб Амирликлари"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Афғонистон"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Антигуа ва Барбуда"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Ангвилла"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Албания"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Арманистон"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Нидерландлар Антил Ороллари"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Ангола"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Америка Самоаси"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Австралия"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Аруба"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Озарбайжон"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Босния ва Герцоговина"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Буркина-Фассо"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Болгария"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Баҳрайн"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Бенин"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Бермуда Ороллари"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Бруней Доруссалом"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Боливия"
 
-#: 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 "Бразилия"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Багама Ороллари"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Буве Ороли"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Боцвана"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Белорус"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Белиз"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокос (Килинг) Ороллари"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Конго (Киншаса)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Марказий Африка Республикаси"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Конго (Браззавиль)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Кот д'Ивуар"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Кук Ороллари"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Чили"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: 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 "Хитой"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Колумбия"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Сербия ва Монтенегро"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Куба"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Кейп Верде"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Крисмас Ороли"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Кипр"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Жибути"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Дания"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Доминика"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Доминикана Республикаси"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Жазоир"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Эквадор"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Эстония"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Миср"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Ғарбий Сахара"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Эритрия"
 
-#: 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 "Испания"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Эфиопия"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Финляндия"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Фижи"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Фолкленд (Малвин) Ороллари"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Микронезия"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Фарер Ороллари"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Габон"
 
-#: 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 "Буюк Британия"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Гренада"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
-msgstr "Грузия"
+msgstr "Гуржистон"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Француз Гвинея"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Гана"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Гренландия"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Гамбия"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Гваделупа"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Экваториал Гвинея"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Жанубий Жоржия ва Жанубий Сендвич Ороллари"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Гуам"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Гвинея-Биссау"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Гвиана"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Хитой (Гонконг)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Херд ва МакДоналд Ороллари"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Гондурас"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Хорватия"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Гаити"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Венгрия"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Исроил"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "Ҳиндистон"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Ҳинд Океаннинг Британия Ерлари"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Ироқ"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Эрон"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Исландия"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Ямайка"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Иордан"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Япония"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Кения"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Қирғизистон"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Коморос"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Сент-Кристофер ва Невис"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Шимолий Корея"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Кувайт"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Кайман Ороллари"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Қозоғистон"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Лаос"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Лебанон"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Сент-Люсия"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Лихтенштейн"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Либерия"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Литва"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Латвия"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Либия"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Марокаш"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Монако"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Молдова"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Маршалл Ороллари"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Македония"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Мали"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Мянмар"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Муғилистон"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Шимолий Мариана Ороллари"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Мартиника"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Мавритания"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Монцеррат"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Малта"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Маврикий"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Малдив Ороллари"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Малави"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Мексика"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Намибия"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Янги Каледония"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Нигер"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Норфолк Ороли"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Нигерия"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "Непал"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Науру"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Ниуе"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "Янги Зеландия"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Уммон"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Панама"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Перу"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Француз Полинезия"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Папуа Янги Гвинея"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Филиппин"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Покистон"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Польша"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Сент-Пер ва Микелон"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Питкерн"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Пуэрто-Рико"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Фаластин"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Португалия"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Парагвай"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Палау"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Қатар"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Реюнион"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Руминия"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Россия"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Рванда"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Саудия Арабистони"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Соломон Ороллари"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Сейшел Ороллари"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Судан"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Авлиё Елена Ороли"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Словения"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Свалбард ва Ян Майен Ороллари"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Серра-Леоне"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "Сан-Марино"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Сомали"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Суринам"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Сан-Томе ва Принсипи"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "Салвадор"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Сурия"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Туркс ва Каикос Ороллари"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Чад"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Франциянинг Жанубий Ерлари"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "Того"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Тожикистон"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Токелау"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Шарқий Тимур"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Туркманистон"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Тонга"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Туркия"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Тринидад ва Тобаго"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Танзания"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Украина"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Уганда"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Кичик Узоқлашган Ороллар Қўшма Штатлари"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Ўзбекистон"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Ватикан"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Сент-Винсент ва Гренадина"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Венесуэла"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Виргиния Ороллари (Англия)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Виргиния Ороллари (АҚШ)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Ветнам"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Уоллис ва Футуна Ороллари"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Самоа"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Яман"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Маёт"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Сербия ва Монтенегро"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Жанубий Африка"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Замбия"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Қуйидаги пакетларни ўрнатиш керак: %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 "%s'га марҳамат"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Параметрлар"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "ЙЎҚ"
@@ -7870,8 +8176,8 @@ msgstr "Модулнинг ҳамма параметрларини шу ерда
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s интерфейслар топилди"
+msgid "Found %s interfaces"
+msgstr "%s интерфейслар топилди"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -7924,12 +8230,12 @@ msgid "Module options:"
 msgstr "Модулнинг параметрлари:"
 
 #. -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 "Қайси %s драйверни синаб кўрай?"
 
-#: 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"
@@ -7941,17 +8247,17 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Авто-аниқлаш"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Параметрларни аниқлаш"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8010,11 +8316,11 @@ msgstr "Ғилдиракли андоза PS2 сичқонча"
 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 "Автоматик"
@@ -8159,50 +8465,55 @@ msgstr "Универсал"
 msgid "Any PS/2 & USB mice"
 msgstr "Истаган PS/2 ва 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 "йўқ"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Сичқонча йўқ"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Илтимос сичқончани синаб кўринг"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Сичқончани ишга тушириш учун,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
-msgstr "ҒИЛДИРАКНИ АЙЛАНTИРИНГ!"
+msgstr "ҒИЛДИРАКНИ АЙЛАНТИРИНГ!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "pppoe'дан фойдаланиш"
+msgid "use PPPoE"
+msgstr "PPPoE'дан фойдаланиш"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "pptp'дан фойдаланиш"
+msgid "use PPTP"
+msgstr "PPTP'дан фойдаланиш"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "dhcp'дан фойдаланиш"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -8211,33 +8522,33 @@ msgstr " - топилди"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (pppoa'ни ишлатиб) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (PPPoA'ни ишлатиб) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (dhcp'ни ишлатиб) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (DHCP'ни ишлатиб) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Интернетга уланиш"
 
-#: 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 ""
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "ADSL уланишнинг тури:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Веб сервери"
@@ -8290,7 +8601,7 @@ msgstr ""
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -8361,269 +8672,275 @@ msgstr "Ҳаммаси (файервол йўқ)"
 msgid "Other ports"
 msgstr "Бошқа портлар"
 
-#: 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 "Мен билмайман"
 
-#: 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 ""
+msgstr "Қўлбола"
 
-#: 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 ""
+msgstr "Қўлбола танлаш"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Ички ISDN карта"
 
-#: 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 "Managed"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Репитер"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Иккиламчи"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: 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 ""
+msgstr "Қўлбола мослаш"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Автоматик IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Автоматик IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Ойропа протоколи (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"
 "No D-Channel (leased lines)"
 msgstr ""
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB модеми"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB модеми"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan модеми"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus модеми"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
-msgstr ""
+msgstr "TCP/IP мосламарини қўлбола мослаш"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: 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 "Скриптда асосланган"
 
-#: 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 "Терминалда асосланган"
 
-#: 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 "Тармоқ ва Интернетни мослаш"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(%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 "(%s топилди)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(топилди)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Вин-модем орқали уланиш"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN орқали уланиш"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL орқали уланиш"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Кабел орқали уланиш"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "LAN орқали уланиш"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Симсиз уланиш"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Сиз мосламоқчи бўлган уланишни танланг"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8636,131 +8953,130 @@ msgstr ""
 "\n"
 "Давом этиш учун \"%s\" тугмасини босинг."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Алоқани мослаш"
 
-#: 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 ""
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Картанинг IRQ'си"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Картанинг хотираси (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Картанинг IO'си"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Картанинг IO_0'си"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Картанинг IO_1'си"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Шахсий телефон рақамингиз"
 
-#: 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 "Провайдернинг номи (м-н provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Провайдернинг телефон рақами"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Провайдернинг DNS 1 (танласа бўлади)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Провайдернинг DNS 2 (танласа бўлади)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: 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 "Алоқанинг тезлиги"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Алоқа таймаути (сонияда)"
 
-#: 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 "Фойдаланувчи"
 
-#: 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 "Махфий сўз"
 
-#: 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 "Мослаш учун тармоқ интерфейсини танланг:"
 
-#: 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 "Тармоқ ускунаси"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Ташқи ISDN модем"
 
-#. -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 "Ускунани танланг!"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN'ни мослаш"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Сизда қандай карта бор?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -8776,34 +9092,48 @@ msgstr ""
 "Агар сизда PCMCIA картаси бўлса, картангизнинг \"irq\" ва \"io\" "
 "қийматларини билишингиз керак.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Давом этиш"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Тўхтатиш"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Қуйидагиларнинг қайи бири сизнинг ISDN картангиз?"
 
-#: 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 "Драйвер"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Қайси протоколдан фойдаланмоқчисиз?"
 
-#: 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 "Протокол"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -8812,137 +9142,132 @@ msgstr ""
 "Провайдерингизни танланг.\n"
 "Агар рўйхатда йўқ бўлса, \"Рўйхатда йўқ\"ни танланг."
 
-#: 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 "Провайдер:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
-"Модемингизни бу системада ишлатиб бўлмайди.\n"
+"Модемингизни бу тизимда ишлатиб бўлмайди.\n"
 "http://www.linmodem.org веб-сайтига қаранг."
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Мослаш учун модемни танланг:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr ""
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Илтимос, модем уланган кетма-кет портини танланг."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Провайдерингизни танланг:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr ""
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Уланишнинг номи"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Телефон рақами"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Фойдаланувчи"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "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 "IP рақами"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr ""
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: 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 ""
+msgstr "Доменнинг номи"
 
-#: 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 "Биринчи DNS сервери (танлаб бўлади)"
 
-#: 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 "Иккинчи DNS сервери (танлаб бўлади)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr ""
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Гейтвэй"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Гейтвэйнинг IP рақами"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL мосламаси"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Илтимос ADSL провайдерингизни танланг"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8950,32 +9275,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Дискетдан фойдаланиш"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Дискнинг Windows қисмини ишлатиш"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Кейинроқ бажариш"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8989,22 +9314,22 @@ msgstr ""
 "дан ёзиб олинг ва mgmt.o файлини /usr/share/speedtouch директориясига "
 "кўчиринг."
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9013,21 +9338,23 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Драйверни қўлбола юклаш"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
+"ДИҚҚАТ: Бу ускуна Интернетга уланиш учун аллақачон мосланган.\n"
+"Уни бошқадан мослашни истайсизми?"
 
-#: 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"
@@ -9036,24 +9363,24 @@ msgstr ""
 "Табриклаймиз, тармоқни ва Интернетни мослаш тугади.\n"
 "\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 (%s драйвери) мосланмоқда"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9064,89 +9391,95 @@ msgstr ""
 "Ёзувнинг ҳар қайси нуқта билан ажратилган ўнлик сон шаклида\n"
 "IP рақам бўлиши керак (м-н 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP хостнинг номи"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "Тармоқ маскаси"
 
-#: 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 ""
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Тизим юкланаётганда ишга тушириш"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "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 "IP рақами қуйидаги форматда бўлиши шарт: 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 ""
 
-#: 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'дан аллақачон фойдаланилмоқда\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
@@ -9155,19 +9488,19 @@ msgstr ""
 "Частота \"M\" ёки \"G\" билан тугаши керак (масалан, 2.46 GHz учун\n"
 "\"2.46G\"), ёки етарлича \"0\" (нол) қўшинг."
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: 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 "
@@ -9181,33 +9514,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
@@ -9219,12 +9552,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 ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9242,29 +9575,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 ""
-"Сизнинг системангизда ethernet тармоқ адаптери топилмади.\n"
-"Мен алоқанинг бундай турини ўрнатолмайман."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Тармоқ интерфейсини танлаш"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Илтимос, Интернетга уланиш учун қайси тармоқ адаптеридан фойдаланишни "
-"танланг."
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9273,84 +9584,86 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Хостнинг номи (танлаб бўлади)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Компьютернинг номи"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS сервери 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS сервери 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS сервери 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr ""
 
-#: 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 "Гейтвэй (м-н %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Гейтвэй ускунаси"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS сервернинг манзили қуйидаги форматда бўлиши шарт: 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 ""
 
-#: 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 "Zeroconf компьютернинг номи"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf компьютернинг номида \".\" белгиси бўлмаши керак"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9361,36 +9674,56 @@ msgstr ""
 "Фойдаланиш учун биттасини танланг.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Интернетга уланиш"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Мослаш бажарилди, мосламаларни қўллашни истайсизми?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Тизим юкланаётганда уланишни истайсизми?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Тизим юкланаётганда ишга тушириш"
+
+#: 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
+#, fuzzy, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Тизим юкланаётганда уланишни истайсизми?"
+
+#: network/netconnect.pm:1284
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "Тармоқни бошқадан ишга тушириш керак. Уни бошқадан ишга туширишни истайсизми?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Тармоқни мослаш"
 
-#: 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 ""
@@ -9398,27 +9731,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 "Интернетга уланишга уриниб кўришни истайсизми?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Алоқа синаб кўрилмоқда..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Тизим Интернетга уланган."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9427,7 +9760,7 @@ msgstr ""
 "Тизим Интернетга уланмаганга ўхшайди.\n"
 "Алоқани бошқадан мослашга уриниб кўринг."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -9436,15 +9769,15 @@ msgstr ""
 "Бу тугаганидан сўнг, компьютернинг номи билан боғлиқ бўлган муаммоларни "
 "олдини олиш учун X муҳитингизни бошқадан ишга туширишни биз тавсия қиламиз."
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9456,7 +9789,7 @@ msgstr ""
 "Тармоқни мосламаларини сақлаб қолиш учун \"Ок\" тугмасини босинг, Интернетга "
 "ва тармоқга уланишни бошқадан мослаш учун \"Бекор қилиш\" тугмасини босинг.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -9465,27 +9798,27 @@ msgstr ""
 "Кутилмаган хато рўй берди:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Проксиларни мослаш"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP прокси"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP прокси"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Прокси \"http://...\" бўлиши керак"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL \"'ftp:\" ёки \"http:\" билан бошланиши шарт"
@@ -9502,7 +9835,7 @@ msgid ""
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9519,34 +9852,34 @@ msgstr ""
 "\t\teth0 ёки eth1 кабел орқали уланиш учун,\n"
 "\t\tippp+ ISDN орқали уланиш учун.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Дискетни қўйинг"
 
-#: 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 "
 "press %s"
 msgstr ""
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "улаш муваффақиятсиз тугади: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: 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"
@@ -9554,22 +9887,22 @@ msgid ""
 "to the extended partitions."
 msgstr ""
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Файлдан (%s) қайта тиклаш муваффақиятсиз тугади: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr ""
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Файлга (%s) ёзишда хато"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9578,27 +9911,27 @@ msgid ""
 "data."
 msgstr ""
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "бўлиши шарт"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "муҳим"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "жуда яхши"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "яхши"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "балки"
@@ -9613,7 +9946,7 @@ msgstr "(%s'да)"
 msgid "(on this machine)"
 msgstr "(шу компьютерда)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Бошқа компьютерларда мосланган"
@@ -9623,307 +9956,317 @@ msgstr "Бошқа компьютерларда мосланган"
 msgid "On CUPS server \"%s\""
 msgstr "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 " (Андоза)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Навбатга қўймасдан босиб чиқариш"
 
-#: 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 ""
 
-#: 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'нинг янги авлоди"
 
-#: 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 - Умумий Юникс Босиб чиқариш Тизими"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Умумий Юникс Босиб чиқариш Тизими (масофадаги сервер)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Масофадаги CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Номаълум модел"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Локал принтер"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Масофадаги принтер"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Масофадаги CUPS серверидаги принтер"
 
-#: 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 "Масофадаги LPD серверидаги принтер"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Тармоқдаги принтер (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT серверидаги принтер"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "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 "Босиб чиқариш ускунасининг URI'ни киритинг"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Вазифанинг натижасини буйруғга улаш (pipe)"
 
-#: 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 "Номаълум модел"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Шу компьютерда мосланган"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " #%s параллел портида"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB принтер \\#%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB принтер"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", \\#%s параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", USB портидаги кўп амалли ускуна"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirect'даги кўп амалли ускуна"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", кўп амалли ускуна"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", %s ёрдамида босиб чиқарилмоқда"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " LPD серверида \"%s\", принтер \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP хост \"%s\", порт %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " Novell серверида \"%s\", принтер \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", %s буйруғи ёрдамида"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Параллел порти #%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB принтер \\#%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB принтер"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Параллел портидаги (#%s) кўп амалли ускуна"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Параллел портидаги кўп амалли ускуна"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USB портидаги кўп амалли ускуна"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "HP JetDirect'даги кўп амалли ускуна"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Кўп амалли ускуна"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "%s ёрдамида босиб чиқарилмоқда"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD сервер \"%s\", принтер \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP хост \"%s\", порт %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows сервери \"%s\", принтер \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell сервери \"%s\", принтер \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "%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 ""
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Локал тармоқ(лар)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Интерфейс \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Тармоқ %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Хостнинг номи %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (Порт %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"
 msgstr ""
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "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 "
@@ -9932,51 +10275,46 @@ msgstr ""
 "Бу ерда, бу компьютерга уланган принтердан бошқа компьютер ва қайси "
 "компьютер фойдаланса бўладими-йўқми танлашингиз мумкин."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Бошқа компьютерлар шу компьютердаги принтерлардан фойдаланиши мумкин"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 "Масофадаги компьютерда мавжуд бўлган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr ""
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Бошқача мослаш"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
 msgstr "Масофадаги компьютер йўқ"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Қўшимча CUPS серверлар: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Йўқ"
-
-#: 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 "
@@ -9989,29 +10327,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Япон матнларини босиб чиқариш усули"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "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 "
@@ -10028,12 +10366,38 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, fuzzy, 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 ""
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -10042,61 +10406,61 @@ msgstr ""
 "Қуйидаги компьютерлар ва тармоқлар шу компьютерга уланган принтер(лар)дан "
 "фойдаланиши мумкин:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Хостни/тармоқни қўшиш"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Танланган хостни/тармоқни тузатиш"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Танланган хостни/тармоқни олиб ташлаш"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr "Хостнинг/тармоқнинг IP рақами:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Хостнинг/тармоқнинг IP рақами аниқланмаган."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Кўрсатилган хост/тармоқ нўтўғри.\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 "Тўғри IP рақамларнинг мисоли:\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 "Бу хост/тармоқ аллақачон рўйхатда, уни яна қўшиб бўлмайди.\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 ""
 
-#: 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 "
@@ -10104,104 +10468,120 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Серверни қўшиш"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Танланган серверни тузатиш"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Танланган серверни олиб ташлаш"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 "Принтерларидан фойдаланмоқчи бўлган компьютернинг IP рақамини ва портини "
 "киритинг."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr "Агар ҳеч қандай порт кўрсатилмаса, андоза сифатида 631 қабул қилинади."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Сервернинг IP рақами аниқланмаган!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Киритилган IP нотўғри.\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 "Портнинг рақами бутун сон бўлиши шарт!"
 
-#: 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 "Сервер аллақачон рўйхатда, уни яна қўшиб бўлмайди.\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 "Порт"
 
-#: 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
+#, fuzzy, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "Масофадаги LPD серверидаги принтер"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPS сервернинг номи ёки IP рақами кўрсатилмаган."
+
+#: 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 "Принтер ҳақида маълумот ўқилмоқда..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "CUPS бошқадан ишга туширилмоқда..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Принтерга уланишни танланг"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Принтер қадай уланган?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -10212,7 +10592,7 @@ msgstr ""
 "Масофадаги CUPS серверидаги принтерларни мослашингиз шарт эмас, улар "
 "автоматик равишда аниқланади."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10220,28 +10600,28 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Тизим текширилмоқда..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "ва битта номаълум принтер"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "ва %d номаълум принтер"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -10252,9 +10632,9 @@ msgstr ""
 "Қуйидаги принтерлар\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10262,12 +10642,12 @@ msgid ""
 "%s%s\n"
 "are directly connected to your system"
 msgstr ""
-"Қуйидаги принтерлар\n"
+"Қуйидаги принтер\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10278,9 +10658,9 @@ msgstr ""
 "Қуйидаги принтер\n"
 "\n"
 "%s%s\n"
-"системангизга тўғридан-тўғри уланган."
+"компьютерга тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -10289,7 +10669,7 @@ msgstr ""
 "\n"
 "Тизимга битта номаълум принтер тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -10298,42 +10678,42 @@ msgstr ""
 "\n"
 "Тизимга %d номаълум принтер тўғридан-тўғри уланган"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Сизнинг компьютерингизга тўғридан-тўғри уланган принтер топилмади"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " (Ҳамма принтерлар уланганлигига ва ёқилганлигига ишонч ҳосил қилинг).\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 "
 "printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 "Бу компьютерга босиб чиқариш имкониятини ўрнатишга ишончингиз комилми?\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 "
@@ -10342,48 +10722,42 @@ msgstr ""
 "ИЗОҲ: Принтернинг моделига ва босиб чиқариш тизимига боғлиқ равишда ҳажми то "
 "%d Мб бўлган қўшимча дастурлар ўрнатилади."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Янги принтерлар қидирилмоқда..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "Принтер мосланмоқда..."
+msgid "Found printer on %s..."
+msgstr "Принтер \"%s\"да топилди..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Принтер (\"%s\") мосланмоқда..."
-
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr " да "
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr "Принтернинг моделини танлаш"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Сизнинг принтерингизнинг модели?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10396,7 +10770,7 @@ msgstr ""
 "Printerdrake %s принтерингизнинг моделини аниқлолмади. Илтимос, қуйидаги "
 "рўйхатдан тўғри келадиган моделни танланг."
 
-#: 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 "
@@ -10405,21 +10779,24 @@ msgstr ""
 "Агар сизниг принтерингиз рўйхатда бўлмаса, унга мос келадиган (принтернинг "
 "кўлланмасига қаранг) ёки унга ўхшаш принтерни танланг."
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
+#, fuzzy, c-format
+msgid "Configuring printer on %s..."
+msgstr "Принтер (\"%s\") мосланмоқда..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Дастурлар мосланмоқда..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Принтер (\"%s\") мосланмоқда..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
 msgstr "Янги принтерни қўшиш"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10433,7 +10810,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10471,10 +10848,10 @@ msgstr ""
 "Windows компьютерига уланган принтерларни автоматик равишда аниқлашни "
 "ўчиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10498,10 +10875,10 @@ msgstr ""
 "Шу компьютерга уланган принтер(лар)ингизни автоматик равишда аниқлаш учун "
 "уни/уларни ёқилган ҳолатга келтиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10536,10 +10913,10 @@ msgstr ""
 "учун, агар бу сизга керак бўлмаса, тармоққа уланган принтерларни автоматик "
 "равишда аниқлашни ўчиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10563,27 +10940,27 @@ msgstr ""
 "Агар шу компьютерга уланган принтер(лар)ингиз бўлса, уни/уларни автоматик "
 "равишда аниқлаш учун уни/уларни ёқилган ҳолатга келтиринг.\n"
 "\n"
-" Тайёр бўлганингиздан сўнг \"Кейингиси\"ни ёки принтер(лар)ингизни ўрнатишни "
+" Тайёр бўлганингиздан сўнг \"Кейинги\"ни ёки принтер(лар)ингизни ўрнатишни "
 "истамасангиз \"Бекор қилиш\"ни босинг."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Бу компьютерга уланган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Локал тармоққа уланган принтерларни автоматик равишда аниқлаш"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Microsoft Windows бошқараётган компьютерларга уланган авто-аниқланган "
 "принтерлар"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -10597,70 +10974,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "%s пакетларини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Принтерни авто-аниқлаш"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Ускуналар аниқланилмоқда..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", тармоқдаги принтер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", \"%s\" принтер \"%s\" SMB/Windows серверида"
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "%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 "\\#%s параллел портидаги принтер"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Тармоқдаги принтер \"%s\", порт %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "\"%s\" принтер \"%s\" SMB/Windows серверида"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Локал принтер"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10669,32 +11046,32 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Ускунанинг ёки файлнинг номини киритишингиз шарт!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Ҳеч қандай принтер топилмади!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Локал принтерлар"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Мавжуд бўлган принтерлар"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "Қуйидаги принтер автоматик равишда аниқланди. "
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -10703,18 +11080,18 @@ msgstr ""
 "Агар бу сиз мосламоқчи бўлган принтер бўлмаса, ускунанинг/файлнинг номини "
 "киритинг."
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Истасангиз, ускунанинг/файлнинг номини кўрсатишингиз мумкин."
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Авто-аниқланган принтерларнинг рўйхати. "
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -10722,7 +11099,7 @@ msgid ""
 msgstr ""
 "Сиз ўрнатмоқчи бўлган принтернинг ёки ускунанинг/файлнинг номини киритинг."
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -10731,7 +11108,7 @@ msgstr ""
 "Илтимос босиб чиқариш вазифалари жўнатиладиган принтерни танланг ёки "
 "ускунанинг/файлнинг номини киритинг."
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10739,12 +11116,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10753,12 +11130,12 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Илтимос босиб чиқариш вазифалари жўнатиладиган принтерни танланг."
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -10767,12 +11144,12 @@ msgstr ""
 "Илтимос принтерингиз уланган портни танланг ёки ускунаниг/файлнинг номини "
 "киритинг."
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Илтимос принтерингиз уланган портни танланг."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -10781,26 +11158,26 @@ msgstr ""
 " (Параллел портлар: /dev/lp0, /dev/lp1, ..., LPT1:, LPT2:, ... га тенг, 1-чи "
 "USB принтер: /dev/usb/lp0, 2-чи USB принтер: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Принтер ёки ускунани танлашингиз ёки киритишингиз шарт!"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, c-format
 msgid "Aborting"
 msgstr "Тўхтатилмоқда"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Масофадаги LPD принтернинг параметрлари"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -10809,63 +11186,63 @@ msgstr ""
 "Масофадаги LPD принтеридан фойдаланиш учун принтер ўрнатилган компьютернинг "
 "номини ва принтернинг номини кўрсатишингиз керак."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Масофадаги хостнинг номи"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Масофадаги принтернинг номи"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Масофадаги хостнинг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Масофадаги принтернинг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, c-format
 msgid "Information"
 msgstr "Маълумот"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Аниқланган модел: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Тармоқ қидирилмоқда..."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", \"%s\" принтер \"%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 "\"%s\" принтер \"%s\" серверда"
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "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 "
@@ -10874,7 +11251,7 @@ msgid ""
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -10884,47 +11261,47 @@ msgstr ""
 "танланг ва фойдаланувчини, махфий сўзни ва керак бўлса ишчи гуруҳни "
 "кўрсатинг."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "SMB сервернинг хости"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB сервернинг IP рақами"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Ишчи гуруҳ"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Авто-аниқланди"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Сервернинг номи ёки сервернинг IP рақами киритилиши шарт!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "ХАВФСИЗЛИК ОГОҲНОМАСИ!"
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -10948,7 +11325,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -10957,7 +11334,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -10966,12 +11343,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "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 "
@@ -10980,42 +11357,42 @@ msgid ""
 "name and password."
 msgstr ""
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Босиб чиқариш сервери"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Босиб чиқариш навбатининг номи"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP серверининг номи аниқланмаган!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "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 ", хост \"%s\", порт %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 "Хост \"%s\", порт %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "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 "
@@ -11025,7 +11402,7 @@ msgstr ""
 "принтернинг хост номини ёки IP рақамини ва истасангиз порт рақамини (андоза "
 "- 9100) киритинг."
 
-#: 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 "
@@ -11038,27 +11415,27 @@ msgstr ""
 "киритишингиз керак. HP JetDirect серверларда одатда портнинг рақами 9100, "
 "бошқа серверларда бошқача бўлиши мумкин. Асбобингизнинг қўлланмасига қаранг."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Компьютернинг номи ёки IP рақами аниқланмаган!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Компьютернинг номи ёки IP рақами"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr ""
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Принтер ускунасининг URI'и"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -11066,17 +11443,17 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Ҳақиқий URI киритилиши керак!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Буйруғга улаш"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -11085,17 +11462,17 @@ msgstr ""
 "Вазифани принтерга тўғридан-тўғри жўнатишни ўрнига уни истаган буйруғга улаш "
 "(pipe) мумкин. Бу ерда ўша буйруғни киритишингиз мумкин."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Буйруқ"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Буйруқ киритиши керак!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -11106,75 +11483,75 @@ msgstr ""
 "1100/1200/1220/3200/3300 сканнер билан, DeskJet 450, Sony IJP-V100), HP "
 "PhotoSmart ёки HP LaserJet 2200 кўп амалли ускунами?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "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 "Ускуна текширилмоқда ва HPOJ мосланмоқда..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "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 "mtools пакетлари ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Принтернинг порти CUPS билан ишлайдиган қилинмоқда..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Принтер маълумот базаси ўқилмоқда..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Принтернинг номини ва изоҳни киритинг"
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 "Принтернинг номи фақат ҳарф, сон ва тагидан чизиш белгисидан иборат бўлиши "
 "керак"
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -11183,7 +11560,7 @@ msgstr ""
 "Принтер \"%s\" аллақачон мавжуд.\n"
 "Унинг мосламаларини алмаштиришни ростдан истайсизми?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -11193,35 +11570,35 @@ msgstr ""
 "\"Манзили\" майдонларни тўлдириш шарт эмас. Улар фойдаланувчилар учун изоҳ "
 "сифатида ишлатилади."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Принтернинг номи"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "Таърифи"
 
-#: 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 "Манзили"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Принтер маълумот базаси тайёрланмоқда..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Сизнинг принтерингизнинг модели"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11236,18 +11613,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Тўғри модел"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr "Моделни ўзингиз танланг"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11257,38 +11634,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11296,65 +11673,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr ""
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "Компакт-диск"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, c-format
 msgid "Floppy Disk"
 msgstr "Дискет"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "Бошқа жой"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "PPD-файлини танлаш"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPD-файли ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI вин-принтерни мослаш"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11365,12 +11735,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark inkjet принтерини мослаш"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11379,7 +11749,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11392,12 +11762,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125 принтерини мослаш"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11406,12 +11776,31 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G мосламаси"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660 мосламаси"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11422,27 +11811,27 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Принтернинг андоза мосламалари"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Параметр %s бутун сон бўлиши керак!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Параметр %s сон бўлиши керак!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Параметр %s чегарадан ташқарида!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -11451,12 +11840,12 @@ msgstr ""
 "Бу принтерни (\"%s\") андоза деб\n"
 "белгилашни истайсизми?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Синов бетлари"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11469,57 +11858,57 @@ msgstr ""
 "жуда кичик ҳотирали лазер принтерларда умуман чиқмаши мумкин. Кўп ҳолларда, "
 "андоза синов бетини босиб чиқариш кифоя."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Синов бети йўқ"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Босиб чиқариш"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Андоза синов бети"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Бошқа синов бети (Хат)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Бошқа синов бети (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Сурат синов бети"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Синов бетини босиб чиқармаш"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Синов бет(лар) босиб чиқарилмоқда..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "%s пакетини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11534,7 +11923,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11543,17 +11932,17 @@ msgstr ""
 "Синов бет(лар) принтерга жўнатилди.\n"
 "Принтер ишини бошлагунча бироз вақт ўтиши мумкин.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "Тўғри ишладими?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr ""
 
-#: 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 "
@@ -11562,7 +11951,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11570,8 +11959,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -11580,7 +11969,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -11591,7 +11980,7 @@ msgstr ""
 "ўқинг ёки \"Параметрлар рўйхатини кўрсатиш\" тугмасини босинг. %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"
@@ -11600,15 +11989,15 @@ msgstr ""
 "Жорий принтер учун мавжуд бўлган параметрларнинг рўйхати:\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 "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11616,7 +12005,7 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -11625,14 +12014,14 @@ msgstr ""
 "Жорий принтер учун мавжуд бўлган параметрларни билиш учун \"Параметрлар "
 "рўйхатини кўрсатиш\" тугмасини босинг."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11643,7 +12032,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -11652,42 +12041,32 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "\"%s\" ёрдамида босиб чиқарилмоқда/скан қилинмоқда"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Принтер (%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 "Ёпиш"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Параметрлар рўйхатини кўрсатиш"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11698,10 +12077,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11715,18 +12096,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Принтер ҳақида маълумот ўқилмоқда..."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Принтернинг мосламаларини узатиш"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11736,14 +12112,14 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -11752,19 +12128,19 @@ msgstr ""
 "PDQ билан фақат локал принтерларни, масофадаги LPD принтерларни ва 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 ва LPRng билан IPP принтерларни ишлатиб бўлмайди.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -11775,7 +12151,7 @@ msgstr ""
 "Ишлаб чиқарувчининг PPD-файллари ёки CUPS'нинг асл драйверлари билан "
 "мосланган принтерларни ҳам узатиб бўлмайди."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -11786,17 +12162,17 @@ msgstr ""
 "Сиз узатмоқчи бўлган принтерни белгиланг ва\n"
 "\"Узатиш\" тугмасини босинг."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Принтерларни узатмаш"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Узатиш"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11808,17 +12184,17 @@ msgstr ""
 "Принтернинг бошқа номини киритишингиз ёки уни ўтказиб жўнатишингиз ҳам "
 "мумкин."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Янги принтернинг номи"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s узатилмоқда..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -11827,28 +12203,28 @@ msgstr ""
 "Сиз олдинги андоза принтерни (\"%s\") узатдингиз. У янги босиб чиқариш "
 "тизими (\"%s\") учун ҳам андоза принтер бўлсинми?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Принтер маълумоти янгиланмоқда..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Тармоқ ишга туширилмоқда..."
 
-#: 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 "Тармоқни мослаш"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Тармоқ мосланмаган"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -11857,12 +12233,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Тармоқни мосламай давом этиш"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -11872,7 +12248,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -11880,27 +12256,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Босиб чиқариш сисемаси бошқадан ишга туширилмоқда..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "юқори"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "параноид"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -11915,12 +12291,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr ""
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -11934,67 +12310,150 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Ўрнатилган дастурлар текширилмоқда..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
-msgstr "\"%s\" олиб ташланмоқда..."
+msgid "Removing %s..."
+msgstr "%s олиб ташланмоқда..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "%s босиб чиқариш тизимини олиб ташлаб бўлмади!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
-msgstr "\"%s\" ўрнатилмоқда..."
+msgid "Installing %s..."
+msgstr "%s ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "%s босиб чиқариш тизимини ўрнатиб бўлмади!"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Масофадаги сервернинг номи ёки IP рақами:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Андоза принтер ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Локал CUPS босиб чиқариш тизими ёки масофадаги CUPS сервери?"
+
+#: 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 "Локал CUPS босиб чиқариш тизими"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Принтер спулерини танлаш"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Қайси босиб чиқариш тизимини (спулер) ишлатмоқчисиз?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Принтерни (\"%s\") мослаш муваффақиятсиз тугади!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomatic дастури ўрнатилмоқда..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Керак бўлган пакетни ўрнатиб бўлмади. %s'ни ишга тушириб бўлмайди!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -12005,197 +12464,161 @@ msgstr ""
 "андоза деб белгилаш, ёки у ҳақида маълумотни кўриш учун уни икки марта "
 "босинг."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Мавжуд бўлган масофадаги ҳамма CUPS принтерларни кўрсатиш"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Принтерлар рўйхатини янгилаш (масофадаги ҳамма CUPS принтерларни кўрсатиш "
 "учун)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS'ни мослаш"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Босиб чиқариш тизимини ўзгартириш"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Оддий усул"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Эксперт усули"
 
-#: 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 "Принтернинг параметрлари"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Принтернинг мосламаларини ўзгартириш"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"Принтер %s\n"
+"Принтер %s%s\n"
 "Бу принтернинг нимасини ўзгартиришни истайсиз?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Принтер ўчирилган"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Бажариш!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Принтерга уланишнинг тури"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Принтернинг номи, таърифи, манзили"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Принтернинг ишлаб чиқарувчиси, модели, драйвери"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Принтернинг ишлаб чиқарувчиси, модели"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Бу принтерни андоза деб белгилаш"
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
 #, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Бу принтерни Star Office/OpenOffice.org/GIMP дастурларига қўшиш"
+msgid "Enable Printer"
+msgstr "Принтерни ёқиш"
 
-#: 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 "Бу принтерни Star Office/OpenOffice.org/GIMP дастурларидан олиб ташлаш"
+msgid "Disable Printer"
+msgstr "Принтерни ўчириш"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Синов бетини босиб чиқариш"
 
-#: 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 "Принтердан фойдаланишни ўрганиш"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Принтерни олиб ташлаш"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Эски принтер (\"%s\") олиб ташланмоқда"
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP дастурларига принтер қўшилмоқда"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларига \"%s\" принтерни қўшиш "
-"муваффақиятли тугади."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларига \"%s\" принтерни қўшиш "
-"муваффақиятсиз тугади."
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP дастурларидан принтер олиб ташланмоқда"
+msgid "Printer \"%s\" is now enabled."
+msgstr "Принтер \"%s\" ёқилди."
 
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларидан \"%s\" принтерни олиб ташлаш "
-"муваффақиятли тугади."
-
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP дастурларидан \"%s\" принтерни олиб ташлаш "
-"муваффақиятсиз тугади."
+msgid "Printer \"%s\" is now disabled."
+msgstr "Принтер \"%s\" ўчирилди."
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ростдан принтерни (\"%s\") олиб ташлашни истайсизми?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Принтер (\"%s\") олиб ташланмоқда"
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Андоза принтер"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Принтер (\"%s\") андоза деб белгиланди."
 
-#: raid.pm:37
+#: raid.pm:36
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr ""
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr ""
-"mkraid буйруғи муваффақиятсиз тугади (балки raidtools дастури етишмаяпти?)."
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid буйруғи муваффақиятсиз тугади."
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAID'ни %d чи даражаси учун дискнинг етарли қисмлари мавжуд эмас\n"
@@ -12220,16 +12643,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, c-format
 msgid "Scannerdrake"
 msgstr "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 ""
@@ -12259,7 +12682,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr "Авто-киришга рухсат этиш/этмаш."
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -12269,22 +12693,22 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Консол орқали компьютерни ўчириб-ёқишга рухсат этиш/этмаш."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Root масофадан киришига рухсат этиш/этмаш."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "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 "
@@ -12293,7 +12717,16 @@ msgstr ""
 "Тизимнинг фойдаланувчилар рўйхатини дисплей бошқарувчилар (KDM ва 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"
@@ -12305,14 +12738,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12328,7 +12762,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12341,7 +12775,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12350,80 +12784,85 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Хавфсизлик хабарномаси:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Фойдаланувчиларни тасдиқлаш учун махфий сўздан фойдаланиш."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Кундалик хавфсизлик текширувини ёқиш/ўчириш."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -12432,20 +12871,20 @@ msgstr ""
 "Махфий сўзнинг энг қисқа узунлигини, ундаги сонларнинг ва бош ҳарфларнинг "
 "энг кичик сонини аниқлаш."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr ""
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "агар \"ҳа\" бўлса, очиқ портларни текшириш"
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -12454,104 +12893,104 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "агар \"ҳа\" бўлса, кундалик хавфсизлик текширишларини бажариш"
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "агар \"ҳа\" бўлса, /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 ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "агар \"ҳа\" бўлса, 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."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "агар \"ҳа\" бўлса, текширув натижасини хат орқали жўнатиш"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 "Консолдан киритилган буйруқлар тарихининг ҳажмини аниқлаш. -1 чексизга тенг."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr ""
@@ -12599,211 +13038,216 @@ msgstr ""
 
 #: 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 "X Windows уланишларга рухсат этиш"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr ""
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr ""
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
-#: 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 ""
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr ""
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Фойдаланувчиларни тасдиқлаш учун махфий сўздан фойдаланиш"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Кундалик хавфсизлик текшируви"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr ""
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr ""
 
-#: 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 "Махфий сўз тарихининг узунлиги"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 "Махфий сўзнинг энг қисқа узунлиги, ундаги сонларнинг ва бош ҳарфларнинг сони"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr ""
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Консолда бажарилган буйруқлар тарихининг ҳажми"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Консол учун таймаут"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr ""
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Очиқ портларни текшириш"
 
-#: 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 ""
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Кундалик хавфсизлик текширишларини бажариш"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Бўш махфий сўзни /etc/shadow файлида текшириш"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "suid/sgid файлларнинг checksum'ини текшириш"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "chkrootkit текширувларини бажариш"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Текширув натижасини электрон хат орқали жўнатиш"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -12876,11 +13320,11 @@ msgid ""
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
 msgstr ""
-"Хавфсизликнинг бу даражасида системани сервер сифатида ишлатиш мумкин.\n"
+"Хавфсизликнинг бу даражасида тизимни сервер сифатида ишлатиш мумкин.\n"
 "Тизимни бир қанча клиентлар билан алоқа ўрната оладиган сервер сифатида "
-"ишлатиш учун хавфсизлик даражаси етарлича ёқори.\n"
+"ишлатиш учун хавфсизлик даражаси етарлича юқори.\n"
 "Изоҳ: агар компьютерингизни Интернет тармоғида клиент сифатида ишлатсангиз, "
-"пастроғ даражани танланг."
+"пастроқ даражани танланг."
 
 #: security/level.pm:50
 #, c-format
@@ -12888,7 +13332,7 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Бу даража олдинги даражага ўхшайди, аммо система умуман ёпиқ ва хавфсизлик\n"
+"Бу даража олдинги даражага ўхшайди, аммо тизим умуман ёпиқ ва хавфсизлик\n"
 "параметрлари энг юқори қийматларга эга."
 
 #: security/level.pm:55
@@ -13084,7 +13528,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 
 #: services.pm:66
@@ -13157,7 +13601,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 
 #: services.pm:87
@@ -13179,8 +13623,8 @@ msgstr "USB ускуналарингиз учун драйверларни юк�
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "X шрифт серверини (XFree'ни ишга тушириш учун керак) ишга туширади."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "X шрифт серверини (Xorg'ни ишга тушириш учун керак) ишга туширади."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -13224,8 +13668,8 @@ msgstr "тўхтатилган"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
-msgstr "Хизматлар ва демонлар"
+msgid "Services and daemons"
+msgstr "Хизмат ва демонлар"
 
 #: services.pm:221
 #, c-format
@@ -13236,7 +13680,7 @@ msgstr ""
 "Узр, бу хизмат ҳақида\n"
 "қўшимча маълумот йўқ."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Маълумот"
@@ -13251,752 +13695,1207 @@ msgstr "Талаб қилинганда ишга тушириш"
 msgid "On boot"
 msgstr "Тизим юкланаётганда"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Ишга тушириш"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Тўхтатиш"
 
-#: 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>Mandrakelinux тизимини танлаганингиз билан табриклаймиз!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>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 "Open Source оламига марҳамат!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "<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 ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
+
+#: share/advertising/01.pl:19
+#, 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 ""
+
+#: 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 "<b>Open Source</b> оламига марҳамат!"
+
+#: share/advertising/02.pl:17
+#, fuzzy, c-format
+msgid ""
+"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 ""
+"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари Mandrakesoft "
 "тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
 "натижасидир."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/02.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
 "Ушбу маҳсулотни ишлаб чиқаришда ўз ҳиссасини қўшган барчага биз ўз "
-"миннатдорчилигимизни билдирамиз."
+"<b>миннатдорчилигимизни</b> билдирамиз."
 
-#: 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>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 ""
 
-#: 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."
+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 ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:19
 #, c-format
-msgid "<b>The KDE Choice</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 ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Бирлашмага қўшилинг</b>"
+
+#: 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 ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/04.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Download</b> версия"
+
+#: 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 ""
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Интернетда сайр қилинг</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 ""
+
+#: share/advertising/06.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+
+#: share/advertising/07.pl:13
+#, c-format
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "You can also:"
-msgstr "Ҳамда:"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:17
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Интернетда сайр қилишингиз мумкин"
+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:17
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- chat"
-msgstr "\t- Интернет орқали суҳбат қилишингиз мумкин"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- видео конференция ташкил қилишингиз мумкин"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "\t- create your own Web site"
-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-06.pl:20
+#: share/advertising/09.pl:13
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ва ҳоказо"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft маҳсулотлари</b>"
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:17
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Аудио компакт-дискларни <b>KsCD</b> билан тингланг."
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:18
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "<b>Totem</b> билан мусиқа тингланг ва видео томоша қилинг."
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:19
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
 msgstr ""
-"Расм ва суратларни <b>GIMP</b> ва <b>GQview</b> билан томоша қилинг ва "
-"таҳрирланг!"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:20
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrake бошқарув маркази</b>"
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/10.pl:13
 #, c-format
-msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
 msgstr ""
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:17
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:13
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "<b>MandrakeClub</b> аъзоси бўлинг!"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Mandrakelinux тизимига қайси дастурларни қўшиш учун овоз бериш"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid "<b>The KDE Choice</b>"
 msgstr ""
 
-#: 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"
+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 "Кўпроқ маълумот учун <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 "Сизга ёрдам керакми?"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> - техник ёрдам учун асосий манба."
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Сизга мос келган график иш столини танланг</b>"
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:15
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Агар Linux'га доир саволларингиз бўлса, <b>www.mandrakeexpert.com</b> сайти "
-"орқали MandrakeExpert'га ёзилинг."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Mandrakelinux бирлашмасига қўшилинг!</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgstr ""
+
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr ""
-"Агар сиз ҳам ўз ҳиссангизни қўшмоқчи бўлсангиз, илтимос электрон мактуб "
-"орқали \"Cooker\" муҳокамаларга <b>mandrake-linux.com/cooker</b> сайти "
-"орқали қўшилинг"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Бизнинг бирлашма ҳақида кўпроқ маълумот учун <b>www.mandrake-linux.com</b> "
-"сайтига қаранг!"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/14.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux нима?</b>"
+msgid ""
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
+msgstr ""
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:13
+#, c-format
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
+
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr ""
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Интернетда сайр қилинг</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr ""
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* <b>Konqueror</b> ёрдамида Интернетда сайр қилинг"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr ""
+"\t* <b>Kopete</b> ёрдамида ўртоқларингиз билан Интернет орқали гаплашинг"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>KBear</b> ёрдамида Интернетдан файлларни ёзиб олинг"
+
+#: 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 ""
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/17.pl:16
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/17.pl:17
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Listen to your <b>music files</b> with amaroK."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Расм ва суратларни <b>GIMP</b> билан таҳрирланг"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+"Mandrakelinux менюсидан <b>барча вазифалар</b> учун <b>қулай дастурларни</b> "
+"топса бўлади:"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
+"\t* Ҳужжатларингизни <b>OpenOffice.org</b> ёрдамида яратинг ва таҳрирланг"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
+
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
+"\t* <b>Аудио компакт-диск</b> ва <b>аудио файлларни</b> тингланг, "
+"<b>видеони</b> томоша қилинг"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:21
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* <b>GIMP</b> ёрдамида расм яратинг ва таҳрирланг"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Тузиш воситалари</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 ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Тузиш учун таҳрирчилар</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr ""
+
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
+"\t* <b>Vim</b>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
+"кенгайтирилган матн таҳрирчи"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Дастурлаш тиллари</b>"
+
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
+msgstr ""
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr ""
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/21.pl:18
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>MandrakeClub аъзоси бўлинг!</b>"
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:19
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Сизга ёрдам керакми?</b>"
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:20
+#, fuzzy, 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 "<b>Note</b>"
-msgstr "<b>Изоҳ</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Бу Mandrakelinux <b>Download</b> версияси."
+msgid "\t* And many more."
+msgstr "\t* Ва бошқалар"
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Тузиш воситалари</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, fuzzy, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Серверлар</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
+msgstr ""
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Электрон мактубларни жўнатиш ва қабул қилиш"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr ""
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
-"тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
-"натижасидир."
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/24.pl:13
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "<b>Servers</b>"
+msgstr "<b>Серверлар</b>"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
+"\t* <b>Samba</b>: Microsoft® Windows® клиентлари учун файл ва босиб чиқариш "
+"хизматлари"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>График иш столингизни танланг!</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: Энг кенг ишлатиладиган веб-сервер"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
+"\t* <b>MySQL</b> ва <b>PostgreSQL</b>: Дунёдаги энг оммабоп Open Source "
+"маълумот базаси"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"Mandrakelinux менюсида барча вазифалар учун қулай дастурларни топса бўлади:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"\t- Ҳужжатларингизни <b>OpenOffice.org</b> ёрдамида яратинг ва таҳрирланг"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux бошқарув маркази</b>"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
+msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- Аудио компакт-диск ва аудио файлларни <b>KsCD</b> ва <b>Totem</b> билан "
-"тингланг"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Расм ва суратларни <b>GIMP</b> билан таҳрирланг"
+msgid "<b>The Open Source Model</b>"
+msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Интернет дўкон</b>"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- <b>Vim</b>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
-"кенгайтирилган матн таҳрирчи"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
-#, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Электрон мактубларни жўнатиш ва қабул қилиш"
+#: share/advertising/28.pl:20
+#, fuzzy, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Онлайн сухбатда <b>Kopete</b> ёрдамида қатнашинг"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Манзиллар дафтари (сервер ва клиент)"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>Samba</b>: MS-Windows клиентлари учун файл ва босиб чиқариш хизматлари"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: Энг кенг ишлатиладиган веб-сервери"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:19
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: Дунёдаги енг оммабоп Open Source маълумот базаси"
+msgid ""
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:20
 #, c-format
-msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:13
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Ва бошқалар"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"Mandrakelinux операцион тизими ва унинг кўплаб дастурлари MandrakeSoft "
-"тузувчилари ва бутун олам бўйлаб ҳисса қўшувчилар ҳамкорликда бажарган иш "
-"натижасидир."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Охирги версияни ишлаб чиқишда қатнашган барчага ўз миннатдорчилигимизни "
-"билдирамиз"
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:19
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid ""
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "Идора станцияси"
+
+#: share/compssUsers.pl:27
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"Идора учун дастурлар: матн процессорлари (OpenOffice.org Writer, Kword), "
+"электрон жадваллар (OpenOffice.org Calc, Kspread), PDF кўрувчилар ва ҳоказо"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"Mandrakelinux менюсида барча вазифалар учун қулай дастурларни топса бўлади:"
+"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
+"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "Ўйин станцияси"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Мултимедиа станцияси"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станцияси"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
+"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
+"қилиш учун воситалар тўплами"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Тармоқдаги компьютер (клиент)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:54
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> ва <b>Konqueror</b> ёрдамида интернетда сайр қилинг"
+msgid "Configuration"
+msgstr "Мослаш"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Консол воситалари"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
-"\t- Аудио компакт-диск ва аудио файлларни <b>KsCD</b> ва <b>Totem</b> билан "
-"тингланг"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Тузиш воситалари</b>"
+msgid "Documentation"
+msgstr "Қўлланмалар"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
-msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Гуруҳ"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolab сервери"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Файервол/Рутер"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Интернет гейтвэйи"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Хат-хабар/Янгиликлар"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix хат-хабар сервери, Inn янгиликлар сервери"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Директория сервери"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTP сервери"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "DNS сервери"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Босиб чиқариш сервери"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFS сервери, Samba сервери"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "And of course the editors!"
-msgstr "Ва албатта таҳрирчилар!"
+msgid "Database"
+msgstr "Маълумот базаси"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL ва 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, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Хат-хабар"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix хат-хабар сервери"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL ёки MySQL маълумот базаси"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Тармоқдаги компьютер (сервер)"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE станцияси"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME станцияси"
+
+#: 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>: Андоза Vi таҳрирчига қараганда кўпроқ имкониятларга эга "
-"кенгайтирилган матн таҳрирчи"
+"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
+"муҳит"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Бошқа график иш столлари"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Воситалар"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH сервери"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Терминал серверини мослаш"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Тармоқ воситалари/Назорат қилиш"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft ёрдамчилари"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Серверни мослаш учун ёрдамчилар"
 
 #: standalone.pm:21
 #, c-format
@@ -14049,8 +14948,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14073,7 +14972,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"
@@ -14086,7 +14985,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14156,7 +15055,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -14167,106 +15066,100 @@ msgstr ""
 "Фойдаланиш: %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 "Илтимос бу ердан чиқинг ва Ctrl-Alt-BackSpace тугмаларни босинг"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Ўзгаришлар тўлиқ қўлланилиши учун системага бошқадан киришингиз керак"
+msgstr "Ўзгаришлар тўлиқ қўлланилиши учун тизимга бошқадан киришингиз керак"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Терминал серверисиз фойдасиз"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s фойдаланувчини талаб қилади...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s компьютернинг номини талаб қилади...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "Ок"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Терминал серверини мослаш"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Серверни ёқиш"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Серверни ўчириш"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Серверни ишга тушириш"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Серверни тўхтатиш"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Фойдаланувчиларни қўшиш/ўчириш"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Клиентларни қўшиш/ўчириш"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Дастлабки кириш ёрдамчиси"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -14283,22 +15176,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 "Ёрдамчини бекор қилиш"
 
-#: 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 ""
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14307,45 +15200,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Бу бир неча минут давом этади."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Тайёр!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr ""
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14361,7 +15254,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14381,7 +15274,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14392,14 +15285,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"
@@ -14420,7 +15313,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14438,7 +15331,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14449,7 +15342,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14460,7 +15353,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14480,7 +15373,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14490,7 +15383,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"
@@ -14510,13 +15403,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -14528,62 +15421,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Тизимни юклаш дискети"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
-msgstr "PXE тасвир"
+msgstr "PXE расм"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Андоза кернелнинг версияси"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Ҳеч қандай кернел танланмаган!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Ҳеч қандай NIC танлангани йўқ!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Ўчириш"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Ҳамма NBI'ларни ўчириш"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14591,94 +15484,94 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Фойдаланувчини қўшиш -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Фойдаланувчини ўчириш"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "тури: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr ""
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr ""
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Клиентни қўшиш -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "тури: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr ""
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr ""
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr ""
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Клиентни тузатиш"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Клиентни ўчириш"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd'ни мослаш"
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -14688,77 +15581,77 @@ msgstr ""
 "керак.\n"
 "(service dm restart - консолда)"
 
-#: 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 ""
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Тармоқ маскаси:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Рутерлар:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr ""
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Ном серверлари:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP чегарасининг боши:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "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 "Мосламани ёзиш"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd серверини мослаш"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14766,105 +15659,99 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Илтимос дискетни қўйинг:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Дискетни энди олишингиз мумкин"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Дискет ускунаси мавжуд эмас!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
-msgstr "PXE тасвири: %s/%s"
+msgstr "PXE расми: %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "%s/%s ёзишда хато"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO тасвири: %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Аввало /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 фойдаланувчи эмас\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s аллақачон терминал сервер фойдаланувчиси\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s терминал серверига қўшилди\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s ўчирилди\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s топилмади...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%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 ва /etc/hosts.deny файллари аллақачон мосланган - "
 "ўзгартирилмади"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Мослама ўзгарди. clusternfs/dhcpd хизмати бошқадан ишга туширилсинми?"
@@ -14951,8 +15838,8 @@ msgstr ""
 "\n"
 "Автоматик равишда ўрнатишнинг параметрлари чап тарафдаги бўлимларда мавжуд"
 
-#: 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 "Табриклаймиз!"
@@ -14991,66 +15878,61 @@ msgstr "қаттиқ диск"
 msgid "tape"
 msgstr "магнит тасма"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Ҳеч қандай ускуна топилмади"
-
-#: 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 "Бу система учун махфий сўзни DrakBackup мосламасида сақлаш."
+msgstr "Бу тизим учун махфий сўзни 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 "
 "original 'base' backup."
 msgstr ""
 
-#: 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 "
@@ -15058,7 +15940,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 "
@@ -15066,56 +15948,56 @@ 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 ""
 
-#: 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\" на ҳақиқий электрон почта на мавжуд локал фойдаланувчи!"
 
-#: 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 ""
 
-#: 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 "Фойдаланувчиларнинг эски рўйхати:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Фойдаланувчиларнинг эски рўйхати\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -15124,14 +16006,14 @@ msgstr ""
 "\n"
 "                      DrakBackup ҳисоботи \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -15144,13 +16026,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 ""
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15159,42 +16041,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Калитларни яратиш бир оз вақтни олиши мумкин."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr ""
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr ""
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s'ни %s'да топиб бўлмади."
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s жавоб бермаяпти"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15205,84 +16087,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Ускунада CDR/DVDR йўқ!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Ёзиш мумкин бўлган маълумот ташувчига ўхшамайди!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Ўчириб бўлмайдиган маълумот ташувчи!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "%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 ""
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr ""
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr ""
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15290,7 +16172,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15298,7 +16180,7 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -15306,12 +16188,12 @@ msgstr ""
 "Файлни FTP орқали жўнатишда хато рўй берди. Илтимос FTP мосламаларингизни "
 "тўғриланг."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTP орқали жўнатилган файлларнинг рўйхати: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15319,7 +16201,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15327,22 +16209,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Хатни жўнатишда хато рўй берди. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Каталогни яратиб бўлмади!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -15351,41 +16233,41 @@ msgstr ""
 "\n"
 "Сизга керак бўлган параметрларни текширинг.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -15394,177 +16276,177 @@ msgstr ""
 "Бу параметр орқали /etc директориянгизнинг истаган версиясини\n"
 "тиклашингиз мумкин."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Баузернинг кэшини киритмаш"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Файлларни ёки директорияларни танланг ва \"Ок\" тугмасини босинг"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Танланганни олиб ташлаш"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Фойдаланувчилар"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr ""
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Тармоқ усули:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Узатиш"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Компьютернинг номи  ёки IP рақами"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Фойдаланувчи"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Бу махфий сўзни эслаб қолиш"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Компьютернинг номи, фойдаланувчи ва махфий сўз керак!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Компакт-диск/DVD ускунасини танланг (Мб)"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Компакт-диск/DVD'нинг ҳажмини танланг"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Кўп сеансли компакт-диск"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Дарҳол ўчириш "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr ""
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM ускуна"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Компакт-диск ускунаси аниқланмаган!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr ""
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr ""
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr ""
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Сақлаш учун директорияни киритинг:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Сақлаш учун директория"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -15573,314 +16455,314 @@ msgstr ""
 "Drakbackup учун ажратилган\n"
 " юқори чегарани киритинг (Мб)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "Компакт-диск / DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Қатиқ диск / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "ҳар соат"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "ҳар кун"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "ҳар ҳафта"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "ҳар ой"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "бошқа"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Январь"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Февраль"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Март"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Апрель"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Май"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Июнь"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Июль"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Август"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Сентябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Октябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Ноябрь"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Декабрь"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Якшанба"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Душанба"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Сешанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Чоршанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Пайшанба"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Жума"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Шанба"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Демондан фойдаланиш"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 
-#: 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 "Минут"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Соат"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Кун"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Ой"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Ҳавта куни"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr ""
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr ""
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Хат-хабар учун SMTP сервери:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Нима"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Қаерда"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Қачон"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Қўшимча параметрлар"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr ""
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup мосламаси"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr ""
 
-#: 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 "Тармоқ орқали"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "Компакт-дискга"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "Магнит тасма ускунасига"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (андоза: ҳамма фойдаланувчилар)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr ""
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr ""
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -15889,7 +16771,7 @@ msgstr ""
 "\n"
 "- Тизимнинг файллари:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -15898,7 +16780,7 @@ msgstr ""
 "\n"
 "- Фойдаланувчининг файллари:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -15907,36 +16789,26 @@ msgstr ""
 "\n"
 "- Бошқа файллар:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "Йўқ"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "ҲА"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -15945,22 +16817,22 @@ msgstr ""
 "\n"
 "- Компакт-дискга ёзиш"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " Ускунага: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (кўп сеансли)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -15969,12 +16841,17 @@ msgstr ""
 "\n"
 "- %s ускунадаги магнит тасмага сақлаш"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tЎчириш=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -15983,7 +16860,7 @@ msgstr ""
 "\n"
 "- %s орқали %s хостида сақлаш\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -15992,7 +16869,7 @@ msgstr ""
 "\t\t фойдаланувчи: %s\n"
 "\t\t директория: %s\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -16001,89 +16878,89 @@ msgstr ""
 "\n"
 "- Параметрлар:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tТизимнинг файлларини киритмаш\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr ""
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr ""
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\t%s'га хат жўнатиш\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\t %s SMTP сервери ёрдамида\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Қаттиқ диск.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-Компакт-диск.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Магнит тасма \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Тармоқ FTP орқали.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Тармоқ SSH орқали.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Тармоқ rsync орқали.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Тармоқ webdav орқали.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -16092,27 +16969,27 @@ msgstr ""
 "Тиклаш учун маълумотлар рўйхати:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Тизимнинг файлларини тиклаш:\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Фойдаланувчининг файлларини тиклаш:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Бошқа файлларни тиклаш:\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -16121,141 +16998,141 @@ msgstr ""
 "Бузуқ маълумотнинг рўйхати:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          %s да муваффақиятли тикланди          "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Мосламани тиклаш         "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Ок - бошқа файлларни тиклаш учун"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Илтимос тиклаш учун санани танланг:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Қаттиқ дискдан тиклаш."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Тиклаш учун бошқа маълумот ташувчини танланг"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Бошқа маълумот ташувчиси"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Тизимни тиклаш"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Фойдаланувчиларни тиклаш"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Бошқани тиклаш"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Тиклаш учун йўлни танланг (/ ўрнига)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr ""
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Тиклашдан олдин фойдаланувчиларнинг директорияларини ўчириш."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr ""
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Танланганни тиклаш"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -16264,320 +17141,325 @@ msgstr ""
 "Танланган файлларни\n"
 "тиклаш"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Компакт-дискдан тиклаш"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Магнит тасмасидан тиклаш"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Тармоқ орқали тиклаш"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Қуйидаги тармоқ протоколи орқали тиклаш: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Компьютернинг номи"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Хостга йўл ёки модул"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Махфий сўз керак"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Фойдаланувчининг номи керак"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Хостнинг ҳоми керак"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Йўл ёки модул керак"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Файллар тикланди"
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Тиклаш муваффақиятсиз тугади"
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr ""
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Тиклаш учун файлларни қидириш"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Каталогдан тиклаш"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr ""
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "%s тўғри йўллигини текширинг"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "Компакт-дискни жойига қўйинг - давом этинг."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr ""
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr ""
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Сақлаш"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr ""
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Тиклаш"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Қуйидаги пакетларни ўрнатиш керак:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Илтимос тиклаш учун маълумотни танланг..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr ""
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr ""
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr ""
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Файллар FTP орқали жўнатилмоқда"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Файллар жўнатилмоқда..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr ""
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr ""
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Мослаш ёрдамчиси"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Мосламани кўриш"
 
-#: 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 ""
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: 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 ""
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Тизимнинг усули"
 
-#: 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 "/_Файл"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Файл/Чи_қиш"
 
-#: 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>Ч"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Мавзуларни ўрнатиш"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Янги мавзуни яратиш"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Уни мослашни истайсизми?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Мавзу"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -16586,147 +17468,131 @@ msgstr ""
 "Мавзуларни\n"
 "консолда кўрсатиш"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Тизим юкланаётганда график муҳитини ишга тушириш"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
-msgstr "Йўқ, автоматик равишда системага киришни истамайман"
+msgstr "Йўқ, тизимга автоматик равишда киришни истамайман"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Ҳа, автоматик равишда системага киришни истайман"
+msgstr "Ҳа, тизимга автоматик равишда киришни истайман"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Андоза фойдаланувчи"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Андоза иш столи"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s'ни ўрнатиш муваффақиятсиз тугади. Қуйидаги хато рўй берди:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake учун хато ҳақида хабар қилувчи восита"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinux учун хато ҳақида хабар қилувчи восита"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake бошқарув маркази"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux бошқарув маркази"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Тенглаштириш асбоби"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "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 "Масофадан бошқариш"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Дастурлар бошқарувчиси"
 
-#: 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 ""
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Мослаш ёрдамчилари"
 
-#: 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 "Дастур:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Пакет: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Кернел:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr ""
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -16735,163 +17601,182 @@ msgstr ""
 "Дастурнинг номи\n"
 "ёки тўлиқ йўл:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Пакетни қидириш"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Ҳисобот: "
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
+msgid "Bug Description/System Information"
 msgstr ""
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
+msgid "YOUR TEXT HERE"
 msgstr ""
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr ""
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr ""
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Хабар бериш"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Ўрнатилмаган"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Пакет ўрнатилмаган"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "ТОПИЛМАДИ"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "%s билан алоқа ўрнатилмоқда..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Ҳеч қандай браузер мавжуд эмас! Илтимос бирортасини ўрнатинг"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Илтимос пакетнинг номини киритинг."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Илтимос ҳисоботни киритинг."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "аниқланмаган"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Вақт зонасини ўзгартириш"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Вақт зонаси - 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 ""
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Сервер:"
 
-#: 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 "Тиклаш"
 
-#: 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 ""
+"Тармоқ Вақт Протоколини ёқиш\n"
+"учун ntp пакетини ўрнатиш керак\n"
+"\n"
+"Уни ўрнатишни истайсизми?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Тармоқнинг мосламаси (%d адаптер)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Гейтвэй:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Илтимос кутиб туринг"
@@ -16901,12 +17786,8 @@ msgstr "Илтимос кутиб туринг"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Драйвер"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Ҳолати"
@@ -16921,7 +17802,7 @@ msgstr "Компьютернинг номи: "
 msgid "Configure hostname..."
 msgstr "Компьютернинг номини мослаш"
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Локал тармоқни мослаш"
@@ -16931,8 +17812,8 @@ msgstr "Локал тармоқни мослаш"
 msgid "Configure Local Area Network..."
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Қўллаш"
@@ -16942,107 +17823,113 @@ msgstr "Қўллаш"
 msgid "Manage connections"
 msgstr "Алоқаларни бошқариш"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Ускуна танланган"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "IP мосламаси"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DNS серверлари"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr ""
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "статик"
 
-#: 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 ""
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr ""
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Модем учун таймаут"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr ""
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr ""
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Модем товуши"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Ёқиш"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Ўчириш"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Маълумот ташувчининг синфи"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Модулнинг номи"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Mac рақами"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: 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 "
@@ -17051,20 +17938,20 @@ msgstr ""
 "Тизимда тармоқ адаптери аниқланмади. Илтимос асбоб-ускунани мословчи "
 "воситани ишга туширинг."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Тармоқ интерфейсини олиб ташлаш"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Олиб ташлаш учун тармоқ интерфейсини танланг:"
 
-#: 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 ""
@@ -17072,70 +17959,70 @@ 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 "Табриклаймиз. \"%s\" тармоқ интерфейси муваффақиятли олиб ташланди."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Йўқ"
+msgid "No IP"
+msgstr "IP рақами кўрсатилмаган"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Маскасиз"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "ишлаяпти"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "ишламаяпти"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Уланган"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Уланмаган"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Узиш..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Уланиш..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Ўчириш"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Ёқиш"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -17144,79 +18031,102 @@ msgstr ""
 "Сизда мосланган интерфейс йўқ.\n"
 "Аввало, уларни \"Мослаш\"ни босиб мосланг."
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Локал тармоқни мослаш"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптер %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Тизим юкланганда ишга туширилган"
 
-#: 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 ""
 "Бу интерфейс ҳали мослангани йўқ.\n"
-"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 ""
+"Интернет билан алоқа мосланмаган.\n"
+"Mandrakelinux бошқарув марказидан \"Янги алоқа\" ёрдамчини ишга туширинг"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Учинчи DNS сервери (танлаб бўлади)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Интернетга уланишни мослаш"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Интернетга уланиш"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Уланишнинг тури: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Ҳолати:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X Display Manager)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Дисплей бошқарувчисини танлаш"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -17224,114 +18134,122 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr "Ўзгаришлар қўлланди, 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 "Тизимни юклаш дискини яратиш"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Умумий"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Ускуна"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Кернелнинг версияси"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Мослаш"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Ҳажми"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Mkinitrd учун бошқа аргументлар"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "мажбурий"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "RAID модулларсиз"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "агар керак бўлса"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "SCSI модулларсиз"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Модулни қўшиш"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Модулни олиб ташлаш"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "%s ускунасида маълумот ташувчи борлигига ишонч ҳосил қилинг"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr ""
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Дискетни яратиш бажарилди"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Тизимни юкаш дискети муваффақиятли бажарилди.\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"
@@ -17347,7 +18265,7 @@ msgstr "Ўрнатилган шрифтларни қидириш"
 #: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
-msgstr "Ўрнатилган шрифтларни белгилашни бекор қилиш"
+msgstr "Ўрнатилган шрифтларни танлашни бекор қилиш"
 
 #: standalone/drakfont:208
 #, c-format
@@ -17466,7 +18384,7 @@ msgstr "Шрифтларнинг рўйхати"
 msgid "About"
 msgstr "Ҳақида"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Ўчириш"
@@ -17476,10 +18394,11 @@ msgstr "Ўчириш"
 msgid "Import"
 msgstr "Импорт қилиш"
 
-#: 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"
@@ -17489,7 +18408,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17509,7 +18428,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17527,12 +18446,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr ""
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17542,123 +18461,128 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "Андоза принтерлар"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Шрифт файлини ёки директорияни танланг ва \"Қўшиш\" тугмасини босинг"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
-msgstr "Файл танлаш"
+msgstr "Файлни танлаш"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Сиз ҳеч қандай шрифтни танламадингиз"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Шрифтларни импорт қилиш"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Шрифтларни ўрнатиш"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "агар ишончингиз комил бўлса, бу ерни босинг."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "бу ерга, агар \"йўқ\" бўлса."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Ҳеч қайсини танламаш"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Ҳаммасини танлаш"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Рўйхатни олиб ташлаш"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Шрифтлар импорт қилинмоқда"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Бошланғич синовлар"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Тизимга шрифтлардан нусха кўчириш"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Шрифтларни ўрнатиш ва айлантириш"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Ўрнатишдан кейин амаллар"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Тизимдан шрифтларни олиб ташлаш"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
+msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
 #: standalone/drakgw:125
 #, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: standalone/drakgw:126
+#, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -17666,39 +18590,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "ёқиш"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "Бошқадан мослаш"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "воз кечиш"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Серверлар ёқилмоқда..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17707,22 +18631,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "ўчириш"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Серверлар ўчирилмоқда..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17736,27 +18660,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфейс %s (%s модули ишлатилмоқда)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфейс %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Тизимда тармоқ адаптери мавжуд эмас!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Тармоқнинг интерфейси"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17771,19 +18695,24 @@ msgstr ""
 "\n"
 "Мен шу адаптер билан локал тармоғингизни ўрнатаман."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Тармоқ интерфейсини танлаш"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Илтимос локал тармоғингизга уланадиган тармоқ адаптерини танланг."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Тармоқ интерфейси аллақачон мосланган"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17793,27 +18722,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Автоматик равишда бошқадан мослаш"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Йўқ (фақат экспертлар учун)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Жорий интерфейснинг мосламасини кўрсатиш"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Жорий интерфейсни мослаш"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17824,7 +18753,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17840,12 +18769,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Локал тармоқнинг манзили"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17858,73 +18787,73 @@ msgstr ""
 "Бу ерда DHCP серверини мослаш учун турли параметрларни танлашингиз мумкин.\n"
 "Агар бирор параметрнинг маъносини билмасангиз, уни шундай қолдиринг."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Бу) DHCP сервернинг IP рақами"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS серверининг IP рақами"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP'нинг пастги чегараси"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP'нинг юқори чегараси"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Интерфейсни ва DHCP серверини бошқадан мослаш"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Мосланмоқда..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 "Скриптлар мосланмоқда, дастурлар ўрнатилмоқда, серверлар ишга туширилмоқда..."
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Пакетни (%s) ўрнатишда муаммолар пайдо бўлди"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -17937,14 +18866,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"
 "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
 "\n"
 "Фойдаланиш:\n"
@@ -17967,14 +18896,19 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "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 "
@@ -17983,42 +18917,42 @@ msgstr ""
 "Тизимда ҳеч қандай браузер ўрнатилмаган. Агар ёрдам тизимини кўрмоқчи "
 "бўлсангиз, илтимос бирортасини ўрнатинг"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Тизим мосламалари"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Қўшимча мосламалар"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
-msgstr "Қўшимча ва система мосламалари"
+msgstr "Қўшимча ва тизим мосламалари"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Таҳрирлаб бўлади"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Йўл"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Фойдаланувчи"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Гуруҳ"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Ҳуқуқлар"
@@ -18076,9 +19010,9 @@ msgid "Delete selected rule"
 msgstr "Белгиланган қоидани ўчириш"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "Таҳрирлаш"
@@ -18088,47 +19022,65 @@ msgstr "Таҳрирлаш"
 msgid "Edit current rule"
 msgstr "Жорий қоидани тузатиш"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "ўтиш"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "фойдаланувчи"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "гуруҳ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "бошқа"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Ўқиш"
 
-#: 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 "Файлни ўқиш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Ёзиш"
 
-#: 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 "Файлга ёзиш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Бажариш"
 
-#: 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 "Файлни бажариш учун \"%s\"ни ёқинг"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Ёпишқоқ бит"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -18137,52 +19089,52 @@ msgstr ""
 "Директориялар учун ишлатилади:\n"
 " уни фақат директориянинг эгаси ёки шу директориядаги файл ўчириши мумкин"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "UID'ни ўрнатиш"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "GID'ни ўрнатиш"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr ""
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
-msgstr "Фойдаланувчи :"
+msgid "User:"
+msgstr "Фойдаланувчи:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
-msgstr "Гуруҳ :"
+msgid "Group:"
+msgstr "Гуруҳ:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Жорий фойдаланувчи"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Белгиланса, эгаси ва гурҳ ўзгартирилмайди"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Йўлни танлаш"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Эгалик"
@@ -18262,7 +19214,7 @@ msgstr ""
 #: standalone/drakpxe:196
 #, c-format
 msgid "No image found"
-msgstr "Тасвир топилмади"
+msgstr "Расм топилмади"
 
 #: standalone/drakpxe:197
 #, c-format
@@ -18289,54 +19241,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg файли жойлашган жой"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "ҲАММАСИ"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "ЛОКАЛ"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "андоза"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "ignore"
-msgstr "эътибор бермаш"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "йўқ"
+msgid "Ignore"
+msgstr "Эътибор бермаш"
 
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "ҳа"
-
-#. -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 "
@@ -18371,59 +19311,56 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Майдонларнинг таърифи:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(андоза қиймати: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Хавфсизлик даражаси:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Хавфсизлик хабарномаси:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Хавфсизлик бошқарувчиси:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Асосий параметрлар"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Тармоқнинг параметрлари"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Тизимнинг параметрлари"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Даврий текширувлар"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Илтимос кутиб туринг, хавфсизлик даражаси ўрнатилмоқда"
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Илтимос кутиб туринг, хавфсизлик даражаси ўрнатилмоқда..."
@@ -18433,7 +19370,8 @@ msgstr "Илтимос кутиб туринг, хавфсизлик дараж�
 msgid "No Sound Card detected!"
 msgstr "Товуш картаси топилмади!"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -18446,7 +19384,7 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -18485,7 +19423,7 @@ msgstr ""
 #: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
-msgstr "тасвир файлини танлаш"
+msgstr "расм файлини танлаш"
 
 #: standalone/draksplash:73
 #, c-format
@@ -18500,7 +19438,7 @@ msgstr "Танлаш"
 #: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
-msgstr "Bootsplash тасвирини мослаш"
+msgstr "Bootsplash расмини мослаш"
 
 #: standalone/draksplash:96
 #, c-format
@@ -18586,204 +19524,214 @@ msgstr "Консолда белгини кўрсатиш"
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Билдиришнома"
 
-#: 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 "Бу мавзу учун %s'да ҳали bootsplash йўқ!"
 
 #: standalone/draksplash:167
 #, c-format
 msgid "choose image"
-msgstr "Тасвирни танлаш"
+msgstr "Расмни танлаш"
 
 #: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "Bootsplash мавзуси сақланмоқда..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Бажариш кўрсатгичининг рангини танлаш"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
-msgstr "Аввало тасвир файлини танлашингиз шарт!"
+msgstr "Аввало расм файлини танлашингиз шарт!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
-msgstr "Олдиндан кўриб чиқиш яратилмоқда..."
+msgid "Generating preview..."
+msgstr "Кўриб чиқиш учун маълумот яратилмоқда..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash'ни (%s) кўриб чиқиш"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "UPS ускунасини қўшиш"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Авто-аниқлаш"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Аниқлаш кетаяпти"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
 msgstr "Табриклаймиз!"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Ҳеч қандай UPS ускуна топилмади"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "UPS драйверини мослаш"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Илтимос UPS моделини танланг."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Ишлаб чиқарувчи / модел:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Номи:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "UPS номи"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Порт:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
-msgstr "UPS уланган пoрт"
+msgstr "UPS уланган порт"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "UPS ускуналар"
 
-#: 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 "Номи"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "UPS фойдаланувчилари"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr ""
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr ""
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Қоидалар"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Амал"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Даража"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "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 "UPS ускунасини мослаш воситасига марҳамат"
@@ -18805,7 +19753,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:105
@@ -18830,7 +19778,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:135
@@ -18888,7 +19836,7 @@ msgstr "Кернелнинг модули."
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -18913,13 +19861,13 @@ msgstr "Мослама файли"
 #: 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
@@ -18942,12 +19890,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
@@ -18990,7 +19938,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"
@@ -19017,8 +19965,8 @@ msgstr ""
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
-msgstr ""
+msgid "Exists!"
+msgstr "Мавжуд"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -19221,7 +20169,7 @@ msgstr ""
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Таҳрирлаб бўлмайди!"
 
 #: standalone/drakvpn:591
@@ -19229,10 +20177,10 @@ msgstr "Таҳрирлаб бўлмайди!"
 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
@@ -19268,7 +20216,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 ""
@@ -19293,7 +20241,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"
@@ -19321,7 +20269,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"
@@ -19362,23 +20310,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 ""
@@ -19485,7 +20433,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"
@@ -19513,7 +20461,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"
@@ -19538,7 +20486,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"
@@ -19566,7 +20514,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19586,7 +20534,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 ""
 
@@ -19600,11 +20548,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"
@@ -19626,18 +20574,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"
@@ -19677,7 +20625,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]"
@@ -19802,7 +20750,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"
@@ -19811,7 +20759,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"
@@ -19820,7 +20768,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 ""
@@ -19840,9 +20788,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 ""
@@ -19939,6 +20887,11 @@ msgstr ""
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "андоза"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr ""
 
@@ -19947,67 +20900,67 @@ msgstr ""
 msgid "unique"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
-msgstr "АҚСҲ (кабел)"
+msgstr "АҚШ (кабел)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Канада (кабел)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Япония (кабел)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Ғарбий Ойропа"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Шарқий Ойропа"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Франция [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Янги Зеландия"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Австралия кабел ТВ Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -20016,47 +20969,48 @@ msgstr ""
 "Илтимос\n"
 "давлатингизни ва ТВ форматингизни киритинг"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "ТВ формати:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr ""
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr ""
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Кунингиз мароқли ўтсин!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr ""
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "ТВ карта топилмади!"
 
-#: 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-"
@@ -20069,46 +21023,23 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Бошқа драйверлар"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "Товуш картаси учун бошқа драйверларнинг рўйхати"
 
-#: standalone/harddrake2:22
-#, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Канал"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI канал"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr ""
@@ -20130,130 +21061,279 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Кэшнинг ҳажми"
+msgid "Drive capacity"
+msgstr "Ускунанинг ҳажми"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "процессор кэшининг (иккинчи даража) ҳажми"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr ""
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Ускунанинг ҳажми"
+msgid "this field describes the device"
+msgstr "бу майдон ускунани таърифлайди"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
+msgid "Old device file"
+msgstr "Ускунанинг эски файли"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
 msgstr ""
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
-msgid "Coma bug"
-msgstr "Вергул хатоси"
+msgid "New devfs device"
+msgstr "Янги devfs ускунаси"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
-#: standalone/harddrake2:38
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid family"
-msgstr "Cpuid оиласи"
+msgid "Module"
+msgstr "Модул"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "процессорнинг оиласи (м-н: i686 синфи учун 6)"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "Cpuid level"
-msgstr "Cpuid' нинг даражаси"
+msgid "Extended partitions"
+msgstr "Дискнинг кенгайтирилган қисмлари"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr ""
+msgid "the number of extended partitions"
+msgstr "дискнинг кенгайтирилган қисмлар сони"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Частота (МГц)"
+msgid "Geometry"
+msgstr "Геометрия"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
-msgid "this field describes the device"
-msgstr "бу майдон ускунани таърифлайди"
+msgid "Disk controller"
+msgstr "Диск контроллери"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:44
 #, c-format
-msgid "Old device file"
-msgstr "Ускунанинг эски файли"
+msgid "the disk controller on the host side"
+msgstr ""
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:45
 #, c-format
-msgid "old static device name used in dev package"
-msgstr ""
+msgid "class of hardware device"
+msgstr "асбоб-ускунаниг синфи"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, c-format
-msgid "New devfs device"
-msgstr "Янги devfs ускунаси"
+msgid "Model"
+msgstr "Модел"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:46
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr ""
+msgid "hard disk model"
+msgstr "қаттиқ дискнинг модели"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "тармоқдаги принтернинг порти"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Модул"
+msgid "Primary partitions"
+msgstr "Дискнинг асосий қисмлари"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr ""
+msgid "the number of the primary partitions"
+msgstr "дискнинг асосий қисмлар сони"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "Extended partitions"
-msgstr "Дискнинг кенгайтирилган қисмлари"
+msgid "the vendor name of the device"
+msgstr "Ускунани ишлаб чиқарган фирманинг номи"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
-msgid "the number of extended partitions"
-msgstr "дискнинг кенгайтирилган қисмлар сони"
+msgid "Bus PCI #"
+msgstr ""
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr ""
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCI ускуна #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCI ускунанинг рақами"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr ""
+
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "Уланишнинг номи"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "Ишлаб чиқарувчи"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "Device ID"
+msgstr "Ускуна: "
+
+#: standalone/harddrake2:54
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "Sub device ID"
+msgstr "UPS ускуналар"
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "Ускунани ишлаб чиқарган фирманинг номи"
+
+#: standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Device USB ID"
+msgstr "Ускуна: "
+
+#: 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 ""
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Кэшнинг ҳажми"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "процессор кэшининг (иккинчи даража) ҳажми"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Вергул хатоси"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuid оиласи"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "процессорнинг оиласи (м-н: i686 синфи учун 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuid' нинг даражаси"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Частота (МГц)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Байроқлар"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdiv хатоси"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -20261,236 +21341,292 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU мавжудми"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00f хатоси"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:75
 #, c-format
-msgid "Geometry"
-msgstr "Геометрия"
+msgid "Halt bug"
+msgstr "Halt хатоси"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:76
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
 msgstr ""
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:77
 #, c-format
-msgid "Halt bug"
-msgstr "Halt хатоси"
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "процессорнинг авлоди (м-н: Pentium III учун 8,...)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Моделнинг номи"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "процессор ишлаб чиқарувчининг расмий номи"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "процессорнинг номи"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "Процессорнинг ИД-си"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "процессорлар сони"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr ""
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr ""
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "Процессорни ишлаб чиқарган фирманинг номи"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "Ёзишдан ҳимоялаш"
+
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
+"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 ""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "Дискетнинг формати"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr ""
+msgid "Channel"
+msgstr "Канал"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "асбоб-ускунаниг синфи"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI канал"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "Модел"
+msgid "Disk identifier"
+msgstr ""
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
 #, c-format
-msgid "hard disk model"
-msgstr "қаттиқ дискнинг модели"
+msgid "usually the disk serial number"
+msgstr ""
 
-#: standalone/harddrake2:64
-#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "процессорнинг авлоди (м-н: PentiumIII учун 8,...)"
+#: standalone/harddrake2:94
+#, fuzzy, c-format
+msgid "Logical unit number"
+msgstr "Локал принтер"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
 #, c-format
-msgid "Model name"
-msgstr "Моделнинг номи"
+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:65
+#: standalone/harddrake2:99
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "процессор ишлаб чиқарувчининг расмий номи"
+msgid "Device file"
+msgstr "Ускунанинг файли"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
 #, c-format
-msgid "Number of buttons"
-msgstr "Тугмалар сони"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "сичқончадаги тугмалар сони"
+msgid "Emulated wheel"
+msgstr ""
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
 #, c-format
-msgid "the name of the CPU"
-msgstr "процессорнинг номи"
+msgid "whether the wheel is emulated or not"
+msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
 #, c-format
-msgid "network printer port"
-msgstr "тармоқдаги принтернинг порти"
+msgid "the type of the mouse"
+msgstr "сичқончанинг тури"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
 #, c-format
-msgid "Processor ID"
-msgstr "Процессорнинг ИД-си"
+msgid "the name of the mouse"
+msgstr "сичқончанинг номи"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
 #, c-format
-msgid "the number of the processor"
-msgstr "процессорлар сони"
+msgid "Number of buttons"
+msgstr "Тугмалар сони"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:103
 #, c-format
-msgid "Primary partitions"
-msgstr "Дискнинг асосий қисмлари"
+msgid "the number of buttons the mouse has"
+msgstr "сичқончадаги тугмалар сони"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:104
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "дискнинг асосий қисмлар сони"
+msgid "the type of bus on which the mouse is connected"
+msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "Model stepping"
+msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
+msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, fuzzy, c-format
+msgid "Identification"
+msgstr "тасдиқлаш"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr ""
+msgid "Connection"
+msgstr "Уланиш"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:122
 #, c-format
-msgid "the vendor name of the device"
-msgstr "Ускунани ишлаб чиқарган фирманинг номи"
+msgid "Performances"
+msgstr "Унумдорлик"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:123
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "Процессорни ишлаб чиқарган фирманинг номи"
+msgid "Bugs"
+msgstr "Хатолар"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
 #, c-format
-msgid "Write protection"
-msgstr "Ёзишдан ҳимоялаш"
+msgid "FPU"
+msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:132
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
+msgid "Partitions"
+msgstr "Дискнинг қисмлари"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Параметрлар"
 
-#: 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 "/_Ёрдам"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Принтерларни _авто-аниқлаш"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/_Модемларни авто-аниқлаш"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_Jaz ускуналарини авто-аниқлаш"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/Чи_қиш"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Майдонлар таърифи"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrake ёрдам"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Майдонларнинг таърифи:\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 "
@@ -20499,68 +21635,75 @@ msgstr ""
 "Ускунани танласангиз, ўнг тарафдаги \"Маълумот\" фреймида у ҳақида "
 "маълумотни кўришингиз мумкин"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Хато ҳақида хабар қилиш"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Ҳақида"
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "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 ""
-"HardDrake - Mandrake учун асбоб-ускуналарни мословчи восита.\n"
+"HardDrake - Mandrakelinux учун асбоб-ускуналарни мословчи восита.\n"
 "<span foreground=\"royalblue3\">Версия:</span> %s\n"
 "<span foreground=\"royalblue3\">Муаллиф:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 - версия %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Аниқланган асбоб-ускуналар"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Модулни мослаш"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Мослаш воситасини ишга тушириш"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "номаълум"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Хар ҳил"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -20568,184 +21711,189 @@ msgstr ""
 "Ускуна ҳақида маълумотни бу ерда кўриш учун уни чап тарафдаги рўйхатдан "
 "танланг."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "Иккиламчи"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "Асосий"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr ""
 
-#: 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 "Илтимос тугмалар тартибини танланг."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 "Ўзгаришлар бажарилди, аммо амалда тўлиқ қўлланилиши учун сиз чиқишингиз "
 "керак."
 
-#: standalone/logdrake:51
-#, c-format
-msgid "Mandrake Tools Logs"
-msgstr ""
+#: standalone/logdrake:50
+#, fuzzy, c-format
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinux бошқарув маркази"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Фақат танланган кун учун кўрсатиш"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Файл/_Янги"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>Н"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/Файл/_Очиш"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>О"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Файл/_Сақлаш"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>С"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Файл/...сифатида с_ақлаш"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Файл/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Параметрлар/Синаш"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Ёрдам/_Ҳақида"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Тасдиқлаш"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Фойдаланувчи"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Хабарлар"
 
-#: 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 "Қидириш"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Логларни назорат қилиш учун восита"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Мосламалар"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Мос келадиган"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "мос келмайдиган"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Файлни танлаш"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Календар"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Файлнинг таркиби"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Хат орқали хабар бериш"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
@@ -20753,62 +21901,57 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache веб-сервери"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr ""
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP сервери"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix хат-хабар сервери"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba сервери"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH сервери"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin хизмати"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd хизмати"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Хат орқали хабар беришни мослаш"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20816,66 +21959,66 @@ msgid ""
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Сиз нима қилмоқчисиз?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Хизматларнинг мосламаси"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "Агар танланган хизматларнинг иши тўхтаса сизга хабар жўнатилади"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Мосламаларни юкаш"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Юкланганлиги"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr ""
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Илтимос электрон почтангизни киритинг"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "...сифатида сақлаш"
@@ -20900,27 +22043,74 @@ msgstr "Сичқончани синаш"
 msgid "Please test your mouse:"
 msgstr "Илтимос сичқончани синаб кўринг:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, fuzzy, c-format
+msgid "Network is up on interface %s"
+msgstr "Тармоқнинг интерфейси"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Тармоқ мосланмаган"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "%s-ни улаш"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Тармоқни назорат қилиш"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Тармоқни мослаш"
+
+#. -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 "Янгилаш"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr ""
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Тармоқни назорат қилиш"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Умумий статистика"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Ўртача"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -20929,7 +22119,7 @@ msgstr ""
 "Жўнатиш\n"
 "тезлиги:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -20938,7 +22128,7 @@ msgstr ""
 "Қабул қилиш\n"
 "тезлиги:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -20947,254 +22137,244 @@ msgstr ""
 "Уланиш\n"
 "вақти: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Илтимос кутиб туринг, алоқа синаб кўрилмоқда..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Интернет билан алоқа узилмоқда"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Интернетга уланилмоқда "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Интернетдан узилиш муваффақиятсиз тугади."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Интернетдан узилиш бажарилди."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Алоқа ўрнатилди."
 
-#: 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 ""
-"Уланиш муваффақиятсиз тугади.\n"
-"Мосламангизни Mandrake бошқарув марказида текширинг."
+"Алоқа ўрнатиш муваффақиятсиз тугади.\n"
+"Мосламани Mandrakelinux бошқарув марказида текширинг."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Рангни мослаш"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "жўнатилган: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "қабул қилинган: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "ўртачаси"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Локал кўрсатгич"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "жўнатилган"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "қабул қилинган"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr ""
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "%s-ни улаш"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Интернетга уланиш мосланмаган"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Принтернинг мосламалари юкланмоқда, илтимос кутиб туринг..."
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Ўрнатилган принтерлар ҳақида маълумот ўқилмоқда..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s принтерни бошқариш учун восита"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Амаллар"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Принтерни қўшиш"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/_Андоза деб белгилаш"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Тузатиш"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Ўчириш"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Эксперт усули"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Янгилаш"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Принтерни қўшиш"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/CUPS'ни _мослаш"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Қидириш:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Филтерни қўллаш"
 
-#: 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 "Принтернинг номи"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Уланишнинг тури"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Сервернинг номи"
 
 #. -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 "Принтерни қўшиш"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Тизимга янги принтерни қўшиш"
 
 #. -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 "Андоза деб белгилаш"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Белгиланган принтерни андоза деб белгилаш"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Белгиланган принтерни тузатиш"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Белгиланган принтерни ўчириш"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Янгилаш"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Рўйхатни янгилаш"
 
 #. -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 "CUPS'ни мослаш"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "CUPS босиб чиқариш тизимини мослаш"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Ёқилган"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Ўчирилган"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Муаллифлар: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Принтер бошқаруви\n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -21205,176 +22385,165 @@ msgstr ""
 "\n"
 "Уларни ўрнатишни истайсизми?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Scannerdrake тўхтатилмоқда."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "Мосланган сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "Янги сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr "Мосланган сканнерларнинг рўйхати бошқадан яратилмоқда..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s %s'да топилди, уни автоматик равишда мослайми?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Сканнернинг моделини танланг"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Аниқланган модел: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Порт: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s Scannerdrake дастурининг бу версиясига маълум эмас."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr ""
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr ""
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s қўлланмаган"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -21384,33 +22553,33 @@ msgstr ""
 "Printerdrake дастурини Mandrake бошқарув марказининг \"Асбоб-ускуналар\" "
 "бўлимидаги \"%s\" бандидан ишга туширишингиз мумкин."
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Мавжуд портларни автоматик равишда топиш"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Илтимос %s уланган ускунани танланг"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Изоҳ: Параллел портларни авто-аниқлаб бўлмайди)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "ускунани танланг"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Сканнерлар қидирилмоқда..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -21421,7 +22590,7 @@ msgstr ""
 "Ҳужжатларни дастурлар менюсидаги Мултимедиа/Графикада жойлашган \"XSane\" "
 "ёки \"Kooka\" ёрдамида скан қилиш мумкин"
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -21432,9 +22601,9 @@ msgstr ""
 "Қуйидаги сканнерлар\n"
 "\n"
 "%s\n"
-"системангизда мавжуд.\n"
+"компьютерда мавжуд.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -21445,44 +22614,44 @@ msgstr ""
 "Қуйидаги сканнер\n"
 "\n"
 "%s\n"
-"системангизда мавжуд.\n"
+"компьютерда мавжуд.\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 "Тизимда мавжуд бўлган сканнер топилмади.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Янги сканнерларни қидириш"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr ""
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr ""
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Масофадаги ҳамма компьютерлар"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Шу компьютер"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -21491,96 +22660,96 @@ msgstr ""
 "Бу ерда, бу компьютерга уланган сканнердан бошқа компьютер ва қайси "
 "компьютер фойдаланса бўладими-йўқми танлашингиз мумкин."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Бу компьютердаги сканнерларни бошқа компьютерлардан ҳам ишлатса бўлади"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Масофадаги компьютерлардаги сканнерлардан фойдаланиш"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Қуйидаги компьютерлардаги сканнерлардан фойдаланиш:"
 
-#: 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 ""
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Компьютерни қўшиш"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Танланган компьютерни тузатиш"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Танланган компьютерни олиб ташлаш"
 
-#: 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 "Компьютернинг номи/IP рақами:"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Компьютернинг номини ёки 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 ""
 "Бу компьютернинг номи рўйхатда аллақачон бор, уни яна қўшиб бўлмайди.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Масофадаги сканнерлардан фойдаланиш"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Сканнерлардан фойдаланиб бўладиган компьютерлар:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -21591,32 +22760,32 @@ msgstr ""
 "\n"
 "Уни ўрнатишни истайсизми?"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Сканнер(лар)ни тармоқ орқали ишлатиб бўлмайди."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "\"%s\" асбоб-ускуна синфидаги баъзи бир ускуналар олиб ташланди:\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\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Асбоб-ускуналарни аниқлаш кетаяпти"
@@ -21628,7 +22797,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 "Мослаш воситасини ишга туширишни истайсизми?"
 
 #: steps.pm:14
@@ -21699,7 +22868,7 @@ msgstr "Тармоқни мослаш"
 #: steps.pm:28
 #, c-format
 msgid "Install bootloader"
-msgstr "ОС юклагичини ўрнатиш"
+msgstr "ОТ юклагичини ўрнатиш"
 
 #: steps.pm:29
 #, c-format
@@ -21721,22 +22890,22 @@ msgstr "Янгиланишларни ўрнатиш"
 msgid "Exit install"
 msgstr "Ўрнатишдан чиқиш"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Бу тўғрими?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Рўйхатни ёйиш"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Рўйхатни йиғиш"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -21748,170 +22917,9 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 "%s ўрнатилмаган\n"
-"Ўрнатиш учун \"Кейингиси\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
+"Ўрнатиш учун \"Кейинги\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Идора станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
-"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Ўйин станцияси"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Мултимедиа станцияси"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Интернет станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
-"қилиш учун воситалар тўплами"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Тармоқдаги принтер (клиент)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Мослаш"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Консол воситалари"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOME станцияси"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
-"муҳит"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Бошқа график иш столлари"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ҳоказо"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Қўлланмалар"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Хат-хабар"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix хат-хабар сервери"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Маълумот базаси"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ёки MySQL маълумот базаси"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Файервол/Рутер"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Интернет гейтвэйи"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Тармоқдаги компьютер (сервер)"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Хат-хабар, янгиликларни ўқиш ва жўнатиш ва Интернетда сайр қилиш учун "
-"воситалар тўплами"
-
diff --git a/perl-install/share/po/uz@Latn.po b/perl-install/share/po/uz@Latn.po
index f5b0f15d6..b2b676332 100644
--- a/perl-install/share/po/uz@Latn.po
+++ b/perl-install/share/po/uz@Latn.po
@@ -6,67 +6,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uz\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-27 23:43+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-10 00:41+0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\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.9\n"
 
-#: ../move/move.pm:402
-#, c-format
-msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
-"We need one to continue (beside, it's more standard so that you\n"
-"will be able to move and access your files from machines\n"
-"running Windows). Please plug in an USB key containing a\n"
-"Windows partition instead.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
-msgstr ""
+#: ../move/move.pm:292
+#, fuzzy, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Bandning qaysi turini qo'shmoqchisiz?"
 
-#: ../move/move.pm:412
+#: ../move/move.pm:296
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
-"plug in an USB key now, Mandrake Move will have the ability\n"
-"to transparently save the data in your home directory and\n"
-"system wide configuration, for next boot on this computer\n"
-"or another one. Note: if you plug in a key now, wait several\n"
-"seconds before detecting again.\n"
-"\n"
-"\n"
-"You may also proceed without an USB key - you'll still be\n"
-"able to use Mandrake Move as a normal live Mandrake\n"
-"Operating System."
+"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:423
+#: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Need a key to save your data"
+msgid "Key isn't writable"
 msgstr ""
 
-#: ../move/move.pm:425
+#: ../move/move.pm:450
 #, c-format
-msgid "Detect USB key again"
+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:426 ../move/move.pm:456
+#: ../move/move.pm:452
 #, c-format
-msgid "Continue without USB key"
-msgstr ""
+msgid "Retry"
+msgstr "Boshqadan urinish"
 
-#: ../move/move.pm:437 ../move/move.pm:451
+#: ../move/move.pm:453 ../move/move.pm:497
 #, c-format
-msgid "Key isn't writable"
+msgid "Continue without USB key"
 msgstr ""
 
-#: ../move/move.pm:439
+#: ../move/move.pm:462
 #, c-format
 msgid ""
 "The USB key seems to have write protection enabled, but we can't safely\n"
@@ -77,118 +63,147 @@ msgid ""
 "plug the key again, and launch Mandrake Move again."
 msgstr ""
 
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
 #, c-format
 msgid "Reboot"
 msgstr "O'chirib-yoqish"
 
-#: ../move/move.pm:453
+#: ../move/move.pm:473
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
+"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"We need one to continue (beside, it's more standard so that you\n"
+"will be able to move and access your files from machines\n"
+"running Windows). Please plug in an USB key containing a\n"
+"Windows partition instead.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
 msgstr ""
 
-#: ../move/move.pm:455
+#: ../move/move.pm:483
 #, c-format
-msgid "Retry"
-msgstr "Boshqadan urinish"
+msgid ""
+"We didn't detect any USB key on your system. If you\n"
+"plug in an USB key now, Mandrake Move will have the ability\n"
+"to transparently save the data in your home directory and\n"
+"system wide configuration, for next boot on this computer\n"
+"or another one. Note: if you plug in a key now, wait several\n"
+"seconds before detecting again.\n"
+"\n"
+"\n"
+"You may also proceed without an USB key - you'll still be\n"
+"able to use Mandrake Move as a normal live Mandrake\n"
+"Operating System."
+msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:494
 #, c-format
-msgid "Setting up USB key"
+msgid "Need a key to save your data"
 msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:496
 #, c-format
-msgid "Please wait, setting up system configuration files on USB key..."
+msgid "Detect USB key again"
 msgstr ""
 
-#: ../move/move.pm:488
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Setting up USB key"
+msgstr "ISA PNP uskunalari o'rnatilmoqda: "
+
+#: ../move/move.pm:517
+#, fuzzy, c-format
+msgid "Please wait, setting up system configuration files on USB key..."
+msgstr "Iltimos kutib turing, asbob-uskunalar aniqlanmoqda va moslanmoqda..."
+
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Avto-moslash"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Iltimos kutib turing, asbob-uskunalar aniqlanmoqda va moslanmoqda..."
 
-#: ../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 "Xato"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 
-#: ../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 "Xato ro'y berdi"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -208,32 +223,39 @@ msgid ""
 "guess what's happening."
 msgstr ""
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Tizimning moslama fayllarini o'chirish"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr ""
 
-#: ../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 ""
 
-#: ../move/tree/mdk_totem:81
-#, c-format
+#: ../move/tree/mdk_totem:71
+#, fuzzy, c-format
 msgid "Kill those programs"
-msgstr ""
+msgstr "X dasturlaridan foydalanishga ruxsat etish"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr ""
 
-#: ../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 "Diqqat bilan o'qing!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -290,100 +312,100 @@ msgstr "32 Mb"
 msgid "64 MB or more"
 msgstr "64 Mb yoki ko'proq"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X serveri"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
-msgstr "X serverini tanlang"
+msgstr "Grafik kartani tanlash"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Quyidagi XFree paketini o'rnatib bo'lmadi: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Quyidagi Xorg paketini o'rnatib bo'lmadi: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Grafik kartangizni xotirasining hajmini tanlang"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree'ni moslash"
+msgid "Xorg configuration"
+msgstr "Xorg moslamasi"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "XFree'ning qanday moslamasini istaysiz?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Xorg'ning qanday moslamasini istaysiz?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama kengaytmasidan foydalanish"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Faqat \"%s\"%s kartasini moslash"
 
-#: 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 ""
 
-#: 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 ""
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Boshqa"
 
-#: 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 "Chiqish"
@@ -393,12 +415,12 @@ msgstr "Chiqish"
 msgid "Graphic Card"
 msgstr "Grafik karta"
 
-#: 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 "O'lcham"
@@ -408,14 +430,19 @@ msgstr "O'lcham"
 msgid "Test"
 msgstr "Sinash"
 
-#: 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 "Parametrlar"
 
-#: 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"
@@ -428,40 +455,40 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Monitorni tanlash"
 
-#: 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 "Andoza"
 
-#: 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 "Ishlab chiqaruvchi"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
-"Plug'n Play aniqlash muvaffaqiyatsiz tugadi. Iltimos to'g'ri keladigan monitorni "
-"tanlang"
+"Plug'n Play aniqlash muvaffaqiyatsiz tugadi. Iltimos to'g'ri keladigan "
+"monitorni tanlang"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -476,12 +503,12 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
@@ -506,58 +533,60 @@ msgstr "65 mingta rang (16 bit)"
 msgid "16 million colors (24 bits)"
 msgstr "16 millionta rang (24 bit)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "O'lchamlar"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafik karta: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: 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 "Yordam"
@@ -576,8 +605,8 @@ msgstr "Moslamalarni sinab ko'rishni istaysizmi?"
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
-"Diqqat: bu grafik kartani sinab ko'rish kompyuterni qotib qolishiga olib kelishi "
-"mumkin"
+"Diqqat: bu grafik kartani sinab ko'rish kompyuterni qotib qolishiga olib "
+"kelishi mumkin"
 
 #: Xconfig/test.pm:69
 #, c-format
@@ -652,8 +681,8 @@ msgstr "O'lchamlar: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86 drayveri: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg drayveri: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -664,12 +693,12 @@ msgstr "Tizim yuklanayotganda grafik interfeys"
 #, 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 ""
-"Men kompyuteringizni shunday o'rnatishim mumkinki, sistema yuklanayotganda grafik "
-"interfeys (XFree) ishga tushiriladi.\n"
-"O'chirib-yoqgandan keyin XFree ishga tushirilishini istaysizmi?"
+"Men kompyuteringizni shunday o'rnatishim mumkinki, tizim yuklanayotganda "
+"grafik interfeys (Xorg) ishga tushiriladi.\n"
+"O'chirib-yoqgandan keyin Xorg ishga tushirilishini istaysizmi?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -689,20 +718,49 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: 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 "Iltimos kutib turing"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "Operatsion sistema yuklagichini o'rnatish davom etmoqda"
+msgstr "Operatsion tizim yuklagichini o'rnatish davom etmoqda"
 
-#: 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 ""
+"Operatsion tizim yuklagichini o'rnatish muvaffaqiyatsiz tugadi. Quyidagi "
+"xato ro'y berdi:"
+
+#: 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 ""
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -712,329 +770,314 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Diskning birinchi sektori (MRB)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Tub qismining birinchi sektori"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Disketga"
 
-#: 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 "O'tkazib yuborish"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILO dasturini o'rnatish"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LILO/grub dasturini o'rnatish"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
-msgstr "Operatsion sistema yuklagichini qaerga o'rnatmoqchisiz?"
-
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Diskning yuklash qismining birinchi sektori"
+msgstr "Operatsion tizim yuklagichini qaerga o'rnatmoqchisiz?"
 
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Tizimni yukash uslubini moslash"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
-msgstr "Operatsion sistema yuklagichining asosiy parametrlari"
+msgstr "Operatsion tizim yuklagichining asosiy parametrlari"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "RAM'ning hajmini kiriting (Mb)"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: 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 "Maxfiy so'zlar mos kelmaydi"
 
-#: 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 "Iltimos yana urinib ko'ring"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
-msgstr "OS yuklagichi"
-
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "OS yuklagichini o'rnatish"
+msgstr "OT yuklagichi"
 
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Tizimni yuklash uskunasi"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Andoza tasvirni yuklashdan oldin kutish vaqti"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI'ni yoqish"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "APIC'ni taqiqlash"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: 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 "Maxfiy so'z"
 
-#: 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 "Maxfiy so'z (yana)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "chegaralash"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Tizimni yuklashda /tmp direktoriyasini bo'shatish"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Kerak bo'lsa, RAM'ning aniq hajmi (%d Mb topildi)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr ""
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr ""
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
-msgstr "Andoza OS?"
+msgstr "Andoza OT?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
-msgstr "Tasvir"
+msgstr "Rasm"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Diskning tub qismi"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr ""
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Video usuli"
 
-#: 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 "Tarmoqning profili"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Belgi"
 
-#: 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 "Andoza"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd'ning hajmi"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "Videosiz"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Bo'sh belgini ishlatish mumkin emas"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Kernelning tasvirini ko'rsatishingiz kerak."
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Diskning tub qismini kiritishingiz shart"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Belgi allaqachon ishlatilgan"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Bandning qaysi turini qo'shmoqchisiz?"
 
-#: 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 "Boshqa OS (SunOS...)"
+msgstr "Boshqa OT (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
-msgstr "Boshqa OS (MacOS...)"
+msgstr "Boshqa OT (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Boshqa OT (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can create additional entries or change the existing ones."
 msgstr ""
 "Tizimni yuklash menyusining bandlari.\n"
-"Qo'shimcha bandlar yaratishingiz yoki mavjud bo'lgan bandlarni o'zgartirishingiz "
-"mumkin."
+"Qo'shimcha bandlar yaratishingiz yoki mavjud bo'lgan bandlarni "
+"o'zgartirishingiz mumkin."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "X dasturlaridan foydalanishga ruxsat etish"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "RPM vositalaridan foydalanishga ruxsat etish"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" buyrug'idan foydalanishga ruxsat etish"
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "boshqaruv fayllariga ruxsat"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "tarmoq vositalardan foydalanishni ruxsat etish"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s allaqachon qo'shilgan)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Bu maxfiy so'z juda oddiy"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Iltimos foydalanuvchining ismini kiriting"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1042,22 +1085,22 @@ msgstr ""
 "Foydalanuvchining ismi faqat kichkina harf, son, \"-\" va \"_\" belgilaridan "
 "iborat bo'lishi shart"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Foydalanuvchining ismi juda uzun"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Foydalanuvchining ismi allaqachon qo'shilgan"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Foydalanuvchini qo'shish"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1066,75 +1109,78 @@ msgstr ""
 "Foydalanuvchini kiriting\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 "Tayyor"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Qabul qilish"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Foydalanuvchining haqiqiy ismi-sharifi"
 
-#: 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"
+msgid "Login name"
 msgstr "Foydalanuvchi"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Konsol"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Nishoncha"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Tizimga avtomatik ravishda kirish"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
-"Men kompyuteringizni sistemaga bitta foydalanuvchi avtomatik ravishda kirishga "
-"moslashim mumkin."
+"Kompyuterni bitta foydalanuvchi avtomatik ravishda kirishga moslash mumkin."
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Bu qulaylikdan foydalanishni istaysizmi?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Andoza foydalanuvchini tanlang:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Oynalar boshqaruvchisini tanlang:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Iltimos foydalanish uchun tilni tanlang."
 
-#: any.pm:640
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "Tilni tanlash"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1142,48 +1188,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Andoza sifatida Yunikoddan foydalanish"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Hamma tillar"
 
-#: 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 "Davlat / Region"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Davlatingizni tanlang."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Mavjud bo'lgan davlatlarning to'liq ro'yxati"
 
-#: 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 "Ko'proq"
+msgid "Other Countries"
+msgstr "Boshqa davlatlar"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Kiritish usuli:"
 
-#: any.pm:833
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Yo'q"
+
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr ""
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Hamma foydalanuvchilarga ruxsat"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1193,21 +1248,21 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
 
-#: 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 ""
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
@@ -1215,104 +1270,213 @@ msgstr ""
 "Siz NFS yoki Samba yordamida eksport qilishingiz mumkin. Iltimos bittasini "
 "tanlang."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Userdrake dasturini ishga tushirish"
 
-#: 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 "Yopish"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Lokal fayllar"
+msgid "Local file"
+msgstr "Lokal fayl"
 
-#: 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 ""
 
-#: 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 "Active Directory"
+msgid "Local file:"
+msgstr "Lokal fayl:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windows domeni:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
 msgstr ""
 
-#: authentication.pm:38
+#: 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:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Tasdiqlovchi LDAP"
 
-#: authentication.pm:39
-#, c-format
+#: authentication.pm:61
+#, fuzzy, c-format
 msgid "LDAP Base dn"
-msgstr ""
+msgstr "LDAP maxfiy so'z:"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP serveri"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "oson"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr ""
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr ""
+
+#: authentication.pm:85 authentication.pm:123
 #, c-format
 msgid "Authentication Active Directory"
 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 "Domen"
 
-#: 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 "Server"
 
-#: authentication.pm:53
-#, c-format
+#: authentication.pm:89
+#, fuzzy, c-format
 msgid "LDAP users database"
+msgstr "Ma'lumot bazasi"
+
+#: 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
+#: authentication.pm:92
 #, c-format
 msgid "Password for user"
 msgstr "Foydalanuvchi uchun maxfiy so'z"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Kodlash"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Tasdiqlovchi NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS domeni"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "NIS serveri"
 
-#: 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 "
@@ -1329,28 +1493,38 @@ msgid ""
 "good."
 msgstr ""
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr ""
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr ""
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: 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 "Andoza Idmap "
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
 #. -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"
@@ -1359,65 +1533,60 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Operasion sistemani tanlash dasturiga marhamat!\n"
+"Operatsion tizimni tanlash dasturiga marhamat!\n"
 "\n"
-"Yuqoridagi ro'yxatdan operasion sistemani tanlang\n"
+"Yuqoridagi ro'yxatdan operasion tizimni tanlang\n"
 "yoki andoza uchun kutib turing.\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 (grafik menyu)"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO (matn menyu)"
 
-#: 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 "/boot direktoriyasida etarli joy yo'q"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Operatsion sistema yuklagichini diskning %s qismiga o'rnatolmaysiz\n"
+msgstr "Operatsion tizim yuklagichini diskning %s qismiga o'rnatib bo'lmaydi\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
-msgstr "OS yuklagichini qaytadan o'rnatish"
+msgstr "OT yuklagichini qaytadan o'rnatish"
 
 #: common.pm:125
 #, c-format
@@ -1474,76 +1643,79 @@ msgstr "kdesu dasturi etishmayapti"
 msgid "consolehelper missing"
 msgstr "consolehelper dasturi etishmayapti"
 
-#: 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 "Frantsiya"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: 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 "Belgiya"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Chex Respublikasi"
 
-#: 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 "Olmoniya"
 
-#: 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 "Gretsiya"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Norvegiya"
 
-#: 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 "Shvetsiya"
 
-#: 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 "Niderlandlar"
 
-#: 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 "Italiya"
 
-#: 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 "Avstriya"
 
-#: 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 "Qo'shma Shtatlar"
 
-#: 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"
@@ -1552,87 +1724,81 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Yangi"
 
-#: 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 "Uzish"
 
-#: 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 "Ulash"
 
-#: 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 "Ulash nuqtasi"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Iltimos WebDAV serverining URL'ini kiriting"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "URL http:// yoki https:// bilan boshlanishi shart"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Server: "
 
-#: 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 "Ulash nuqtasi: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Parametrlar: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Diqqat bilan o'qing!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Iltimos avvalo ma'lumotlaringizdan zahira nusxa oling"
 
-#: 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 "
 "enough)\n"
 "at the beginning of the disk"
 msgstr ""
-"Agar rejangizda aboot dasturini ishlatish bo'lsa, diskning boshida bo'sh joy (2048 "
-"sektor etadi)\n"
+"Agar rejangizda aboot dasturini ishlatish bo'lsa, diskning boshida bo'sh joy "
+"(2048 sektor etadi)\n"
 "qoldirish esingizdan chiqmasin"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Yordamchi"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Amalni tanlang"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1643,241 +1809,248 @@ msgstr ""
 "Avvalo, uning hajmini o'zgartirishni taklif qilaman\n"
 "(uni bosing keyin \"Hajmini o'gartirish\" tugmasini bosing)."
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Iltimos diskning qismini bosing"
 
-#: 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 "Tafsilotlar"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Qattiq disklar topilmadi"
 
-#: 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 "Jurnalli FS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Svop"
 
-#: 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 "Boshqa"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Bo'sh"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
-msgstr "Fayl sistemaning turlari:"
+msgstr "Fayl tizimning turlari:"
 
-#: 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 "Buning o'rniga \"%s\"ni ishlating"
 
-#: 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 "Turi"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "Yaratish"
 
 #. -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 "O'chirish"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Avvalo \"Unmount\"ni ishlating"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Diskning boshqa qismini tanlash"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Diskning qismini tanlash"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Chiqish"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
-msgstr "Amalni bekor qilish"
+msgstr "Bekor qilish"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Odiy usuliga o'tish"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Ekspert usuliga o'tish"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
-msgstr "Bunga qaramasdan davom etaymi?"
+msgstr "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Saqlamasdan chiqish"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Diskning qismlar jadvalini saqlamasdan chiqaymi?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "/etc/fstab fayliga kiritilgan o'zgarishlarni saqlashni istaysizmi?"
 
-#: 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 ""
 "Diskning qismlar jadvaliga kiritilgan o'zgarishlar kuchga kirishi uchun "
 "kompyuterni o'chirib-yoqishingiz kerak."
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Hammasini tozalash"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Avto-taqsimlash"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Ko'proq"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "Qattiq disk haqida ma'lumot"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Diskning hamma asosiy qismlari ishlatilmoqda"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "Boshqa qism qo'shib bo'lmaydi"
 
-#: 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 "
 "partition"
-msgstr "Diskda kengaytirilgan qism yaratish uchun iltimos bitta qismni o'chiring"
+msgstr ""
+"Diskda kengaytirilgan qism yaratish uchun iltimos bitta qismni o'chiring"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Diskning qismlar jadvalini saqlash"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Diskning qismlar jadvalini qaytadan tiklash"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Diskning qismlar jadvalini qaytadan yuklash"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr ""
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Faylni tanlash"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: 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 "Diqqat"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1886,92 +2059,92 @@ msgstr ""
 "Disketni uskunaga qo'ying.\n"
 "Undagi hamma ma'lumot yo'qoladi."
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Batafsil ma'lumot"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Hajmini o'zgartirish"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Ko'chirish"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Format qilish"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "RAID'ga qo'shish"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "LVM'ga qo'shish"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "RAID'dan olib tashlash"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "LVM'dan olib tashlash"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "RAID'ni o'zgartirish"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Loopback uchun ishlatish"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Diskda yangi qism yaratish"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Boshlang'ich sektor: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Hajmi (Mb): "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
-msgstr "Fayl sistemaning turi: "
+msgstr "Fayl tizimning turi: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Afzal ko'rish: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr ""
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -1983,12 +2156,12 @@ msgstr ""
 "Avvalo diskning asosiy qismini olib tanshlang keyin diskning kengaytirilgan "
 "qismini yarating."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Loopback faylini olib tashlaymi?"
 
-#: 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"
@@ -1996,230 +2169,226 @@ msgstr ""
 "Diskning %s qismining turini o'zgartirishdan keyin undagi hamma ma'lumot "
 "yo'qoladi"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Diskning qismining turini o'zgartirish"
 
-#: 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 "Sizga qanaqa fayl tizimi kerak?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Ext2 fayl tizimidan ext3 fayl tizimiga o'tilmoqda"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "%s loopback faylini qaerga ulamoqchisiz?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "%s uskunani qaerga ulamoqchisiz?"
 
-#: 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"
 "Remove the loopback first"
 msgstr ""
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Diskning %s qismini qaerga ulamoqchisiz?"
 
-#: 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 "Hajm o'zgartirilmoqda"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "FAT fayl tizimining bog'lari hisoblanmoqda"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Diskning bu qismining hajmini o'zgartirib bo'lmaydi"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Diskning %s qismining hajmini o'zgartirgandan keyin u erdagi hamma ma'lumot "
 "yo'qoladi"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Yangi hajmni tanlang"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Yangi hajm (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"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "Buni qaysi diskga ko'chirmoqchisiz?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Sektor"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "Buni qaysi sektorga ko'chirmoqchisiz?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Ko'chirilmoqda"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Diskning qismi ko'chirilmoqda..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Qo'shish uchun mavjud bo'lgan RAID'ni tanlang"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "yangi"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Qo'shish uchun mavjud bo'lgan LVM'ni tanlang"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "LVM nomi?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Diskning bu qismini loopback uchun ishlatib bo'lmaydi"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback faylining nomi:"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Faylning nomini kiriting"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "Fylni boshqa loopback ishlatayapti, boshqasini tanlang"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Fayl allaqachon mavjud. Ishlataymi?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Ulash parametrlari"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Har xil"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "uskuna"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "daraja"
 
-#: diskdrake/interactive.pm:985
-#, c-format
-msgid "chunk size"
-msgstr ""
+#: diskdrake/interactive.pm:989
+#, fuzzy, c-format
+msgid "chunk size in KiB"
+msgstr "Yangi hajm (Mb): "
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Ehtiyot bo'ling: bu operatsiya xavfli."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Diskni qismlarga bo'lishning qaysi turi?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "%s paketi kerak. Uni o'rnataymi?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
-msgstr "O'zgarishlar amalda qo'llanilishi uchun kompyuterni o'chirib-yoqish kerak"
+msgstr ""
+"O'zgarishlar amalda qo'llanilishi uchun kompyuterni o'chirib-yoqish kerak"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "%s diskining qismlar jadvali diskga saqlanish arafasida!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Diskning %s qismi format qilgandan keyin u erdagi hamma ma'lumot yo'qoladi"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Fayllarni diskning yangi qismiga ko'chirish"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Fayllarni yashirish"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2228,53 +2397,53 @@ msgstr ""
 "Direktoriyada (%s) allaqachon ma'lumot bor\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Fayllar diskning yangi qismiga ko'chirilmoqda"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "%s'dan nusxa ko'chirilmoqda"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "%s olib tashlanmoqda"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "diskning %s qismi endi %s sifatida ma'lum"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Uskuna: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs nomi: "
 
-#: 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 "DOS diskining harfi: %s (tavakkaliga)\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 "Turi: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Nomi: "
@@ -2321,8 +2490,8 @@ msgstr "Ulangan\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
@@ -2347,7 +2516,7 @@ msgstr "%s daraja\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
+msgid "Chunk size %d KiB\n"
 msgstr ""
 
 #: diskdrake/interactive.pm:1191
@@ -2417,38 +2586,39 @@ msgstr "Disk qismlar jadvalining turi: %s\n"
 msgid "on channel %d id %d\n"
 msgstr ""
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
-msgstr "Fayl sistemaning kodlash kaliti"
+msgstr "Fayl tizimning kodlash kaliti"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
-msgstr "Fayl sistemangizning kodlash kalitini tanlang"
+msgstr "Fayl tizimngizning kodlash kalitini tanlang"
 
-#: 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 "Kodlash kaliti juda sodda (u eng kami %d belgidan iborat bo'lishi shart)"
+msgstr ""
+"Kodlash kaliti juda sodda (u eng kami %d belgidan iborat bo'lishi shart)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Kodlash kalitlari mos kelmaydi"
 
-#: 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 "Kodlash kaliti"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Kodlash kaliti (yana)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Turini o'zgartirish"
@@ -2479,7 +2649,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Foydalanuvchi"
@@ -2494,46 +2664,91 @@ msgstr "Serverlarni qidirish"
 msgid "Search new servers"
 msgstr "Yangi serverlarni qidirish"
 
-#: 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 "Paket (%s) o'rnatilishi kerak. Uni o'rnatishni istaysizmi?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Shart bo'lgan paket (%s) etishmayapti"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Paketlar o'rnatilmoqda..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Paketlar o'chirilmoqda..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Disk qismi (%s) ulanmoqda"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "Disk qismini (%s) direktoriyaga (%s) ulash muvaffaqiyatsiz tugadi"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "%s tekshirilmoqda"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "%s'ni ajratishda xato: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Diskning svop qismi (%s) yoqilmoqda"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Diskning qismi (%s) format qilinmoqda"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "%s fayli yaratilmoqda va format qilinmoqda"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "%s'ni %s turida qanday format qilishni bilmayman"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s turida %s'ni format qilish muvaffaqiyatsiz tugadi"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2541,7 +2756,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2549,17 +2764,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Fayl tizimlarni faqat o'qishga deb ulash."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2570,65 +2785,29 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Oddiy foydalanuvchilarga yozish ruxsatini berish"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Oddiy foydalanuvchilarga faqat o'qishga ruxsatini berish"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
+#: fs/type.pm:364
 #, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s turida %s'ni format qilish muvaffaqiyatsiz tugadi"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "%s'ni %s turida qanday format qilishni bilmayman"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Diskning qismi (%s) format qilinmoqda"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "%s fayli yaratilmoqda va format qilinmoqda"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Disk qismi (%s) ulanmoqda"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "Disk qismini (%s) direktoriyaga (%s) ulash muvaffaqiyatsiz tugadi"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "%s tekshirilmoqda"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "%s'ni ajratishda xato: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Diskning svop qismi (%s) yoqilmoqda"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr ""
+"Hajmi 16 Mb'dan kichik bo'lgan qismlar uchun JFS fayl tizimini ishlatib "
+"bo'lmaydi"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "oson"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+"Hajmi 32 Mb'dan kichik bo'lgan qismlar uchun ReiserFS fayl tizimini ishlatib "
+"bo'lmaydi"
 
 #: fsedit.pm:25
 #, c-format
@@ -2640,7 +2819,7 @@ msgstr "/usr bilan"
 msgid "server"
 msgstr "server"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2651,35 +2830,22 @@ msgid ""
 "Do you agree to lose all the partitions?\n"
 msgstr ""
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr ""
-"Hajmi 16 Mb'dan kichik bo'lgan qismlar uchun JFS fayl tizimini ishlatib bo'lmaydi"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr ""
-"Hajmi 32 Mb'dan kichik bo'lgan qismlar uchun ReiserFS fayl tizimini ishlatib "
-"bo'lmaydi"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Ulash nuqtalari \"/\" belgisi bilan boshlanishi shart"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Ulash nuqtalari faqat son yoki harflardan iborat bo'lishi mumkin"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "%s ulash nuqtali diskning qismi allaqachon mavjud\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2687,12 +2853,12 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2700,154 +2866,148 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 
-#: 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 "Bu direktoriya tub fayl tizimida bo'lishi kerak"
 
-#: 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 "
 "point\n"
 msgstr ""
-"Bu ulash nuqtasi uchun haqiqiy fayl tizimi (ext2/ext3, reiserfs, xfs, yoki jfs) "
-"kerak\n"
+"Bu ulash nuqtasi uchun haqiqiy fayl tizimi (ext2/ext3, reiserfs, xfs, yoki "
+"jfs) kerak\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "%s ulash nuqtasi uchun kodlangan fayl tizimini ishlatib bo'lmaydi"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Avto-taqsimlash uchun etarlicha joy yo'q"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Bajarish uchun hech narsa yo'q"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Yozish uchun %s'ni ochishda xato: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Disket"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Disk"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "Kompakt-disk"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Yozadigan kompakt-disk/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 "Magnit tasma"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Video karta"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "TV karta"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Boshqa multimedia uskunalar"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Tovush kartasi"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Veb-kamera"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Protsessorlar"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN adapterlar"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet karta"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL adapterlar"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "AGP kontrollerlar"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
-msgstr "Ko'priklar va sistemaning kontrollerlari"
+msgstr "Ko'priklar va tizimning kontrollerlari"
 
-#: 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 "Printer"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Sichqoncha"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2870,50 +3030,72 @@ msgstr "Fayervol kontrollerlar"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA kontrollerlar"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "SCSI kontrollerlar"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "USB kontrollerlar"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "USB portlar"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus kontrollerlar"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
+msgstr "UPS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "Tugmatag"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Sichqoncha"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Skanner"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Noma'lum/Boshqalar"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "protsessor # "
 
-#: 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 "Iltimos kutib turing... Moslamalar qo'llanilmoqda"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Boshqa drayver yo'q"
 
-#: 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 "
@@ -2922,21 +3104,21 @@ msgstr ""
 "Sizning %s tovush kartangizga, joriy holda %s drayveri ishlatilmoqda, ma'lum "
 "bo'lgan boshqa OSS/ALSA drayveri mavjud emas."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Tovushni moslash"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
-"Bu erda %s tovush kartangiz uchun boshqa drayverni (OSS yoki ALSA) tanlashingiz "
-"mumkin."
+"Bu erda %s tovush kartangiz uchun boshqa drayverni (OSS yoki ALSA) "
+"tanlashingiz mumkin."
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -2949,7 +3131,7 @@ msgstr ""
 "Sizning kartangiz %s\"%s\" drayverini ishlatmoqda (kartangizning andoza "
 "drayveri \"%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 "
@@ -2969,64 +3151,66 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: 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 "Drayver:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Nosozliklarni topish va bartaraf qilish"
 
-#: 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 ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: 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 "
 "driver at \"%s\"."
 msgstr ""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Ma'lum bo'lgan drayver yo'q"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr "Sizning \"%s\" tovush kartangiz uchun ma'lum bo'lgan drayver mavjud emas."
+msgstr ""
+"Sizning \"%s\" tovush kartangiz uchun ma'lum bo'lgan drayver mavjud emas."
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Noma'lum drayver"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Xato: Tovush kartangiz uchun \"%s\" drayveri ro'yxatda yo'q"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Tovush nosozliklarini topish va bartaraf qilish"
 
-#: 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"
@@ -3050,17 +3234,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Boshqa drayverni tanlash"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Ixtiyoriy drayver tanlanmoqda"
 
-#: 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 "
@@ -3069,7 +3254,8 @@ msgid ""
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Agar sizning tovush kartangizga to'g'ri keladigan drayverni rostdan bilsangiz,\n"
+"Agar sizning tovush kartangizga to'g'ri keladigan drayverni rostdan "
+"bilsangiz,\n"
 "uni yuqoridagi ro'yxatdan tanlashingiz mumkin.\n"
 "\n"
 "Sizning \"%s\" tovush kartangizning joriy drayveri \"%s\" "
@@ -3142,17 +3328,17 @@ msgstr ""
 #, 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 ""
 "Davom etishdan oldin litsenziyaning shartlarini e'tibor bilan o'qib\n"
 "chiqing. Litsenziya butun Mandrakelinux'ga tegishli. Agar uning barcha\n"
 "shartlariga rozi bo'lsangiz, \"%s\"ni tanlang. Agar rozi bo'lmasangiz,\n"
-"kompyuteringizni o'chirib-yoqish uchun \"%s\" tugmasini bosing."
+"kompyuterni o'chirib-yoqish uchun \"%s\" tugmasini bosing."
 
-#: 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 "Qabul qilish"
@@ -3160,61 +3346,65 @@ msgstr "Qabul qilish"
 #: 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 ""
 
-#: 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 "Foydalanuvchi"
+
+#: 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 "Keyingisi"
+msgstr "Keyingi"
 
-#: 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 "Qo'shimcha"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3248,36 +3438,47 @@ msgid ""
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Mandrakelinux bir nechta kompakt-disklarda tarqatiladi. Agar\n"
-"tanlangan paket boshqa kompakt-diskda joylashgan bo'lsa, DrakX\n"
-"joriy kompakt-diskni chiqaradi va tegishlisini qo'yishni so'raydi."
+"Mandrakelinux bir nechta kompakt-disklarda tarqatiladi. Agar tanlangan "
+"paket\n"
+"boshqa kompakt-diskda joylashgan bo'lsa, DrakX joriy kompakt-diskni\n"
+"chiqaradi va tegishlisini qo'yishni so'raydi. Agar so'ralgan kompakt-disk "
+"sizda\n"
+"bo'lmasa, \"%s\" tugmasini bosing. Bu holda, tegishli paketlar o'rnatilmaydi."
 
-#: 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"
@@ -3287,9 +3488,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"
@@ -3299,187 +3510,147 @@ 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 ""
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Ish stantsiyasi"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Tuzish"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafik muhit"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Paketlarni bittama-bitta tanlash"
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Yangilash"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "X bilan"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Asosiy qo'llanmalar bilan"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Haqiqiy minimal o'rnatish"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Paketlarni bittama-bitta tanlash"
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Yangilash"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 
-#: 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 "Yo'q"
 
-#: 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 "Ha"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr ""
 
-#: 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 ""
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Avto-aniqlashdan foydalanish"
-
-#: 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 ""
 
-#: 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 "Moslash"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3487,72 +3658,79 @@ 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 ""
 
-#: 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 ""
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr ""
 
-#: help.pm:238
-#, c-format
+#: help.pm:220
+#, fuzzy, 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 ""
+"Monitor\n"
+"\n"
+"   Odatda, o'rnatuvchi kompyuteringizga ulangan monitorni\n"
+"avtomatik ravishda aniqlaydi va moslaydi. Agar bu noto'g'ri\n"
+"bo'lsa, aslida ulangan monitorni ro'yxatdan tanlashingiz mumkin."
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3561,31 +3739,31 @@ 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 ""
 
-#: 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"
@@ -3593,92 +3771,93 @@ msgstr ""
 "avtomatik ravishda aniqlaydi va moslaydi. Agar bu noto'g'ri\n"
 "bo'lsa, aslida ulangan monitorni ro'yxatdan tanlashingiz mumkin."
 
-#: 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 ""
 
-#: 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 ""
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -3686,52 +3865,53 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Bo'sh joydan foydalanish"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Diskda bor qismlardan foydalanish"
 
-#: 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 "Diskning Windows qismidagi bo'sh joydan foydalanish"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Butun diskni o'chirish"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Windows'ni o'chirish"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Diskni boshqacha bo'lish"
 
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -3739,119 +3919,119 @@ 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 ""
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Avto-o'rnatish disketni yaratish"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Qaytarish"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Avtomatik"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Paketlar tanlovini saqlash"
 
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
 
-#: 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 "Oldingisi"
+msgstr "Oldingi"
 
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: 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 "O'rnatish"
 
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Xavfsizlik boshqaruvchisi"
 
-#: 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"
@@ -3926,17 +4106,17 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Odiy/ekspert usuliga o'tish"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -3970,80 +4150,81 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4052,66 +4233,74 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr ""
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr ""
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Istagan PS/2 va USB sichqoncha"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4120,16 +4309,16 @@ msgstr ""
 "Iltimos to'g'ri portni tanlang. Masalan, Windows'dagi \"COM1\"\n"
 "portining nomi GNU/Linux'da \"ttyS0\"."
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4138,201 +4327,104 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "tasdiqlash"
 
 #. -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 "Maxfiy so'zsiz"
 
-#: help.pm:736
+#: help.pm:725
 #, c-format
 msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-
-#: help.pm:768
-#, c-format
-msgid "GRUB"
-msgstr "GRUB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, c-format
-msgid "Delay before booting the default image"
-msgstr "Andoza OSni yuklashdan oldin kutib turish vaqti"
-
-#: help.pm:771
-#, c-format
-msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "Qo'shish"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "O'zgartirish"
-
-#: 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 "Olib tashlash"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr ""
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "Ekspert"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4353,157 +4445,74 @@ msgid ""
 "configure the driver."
 msgstr ""
 
-#: help.pm:847
+#: help.pm:786
 #, c-format
 msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
+"\"%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 ""
-
-#: help.pm:894
-#, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-
-#: help.pm:926
-#, 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."
-msgstr ""
-"\"%s\": agar sistemangizda tovush kartasi aniqlansa u shu erda ko'rsatiladi.\n"
-"Agar ko'rsatilgan tovush kartasi sistemangizdagi tovush kartasi\n"
+"\"%s\": agar kompyuterda tovush kartasi aniqlansa u shu erda ko'rsatiladi.\n"
+"Agar ko'rsatilgan tovush kartasi kompyuterdagi tovush kartasi\n"
 "bilan mos kelmasa, tugmani bosib boshqa drayverni tanlashingiz mumkin."
 
-#: 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 "Tovush karta"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -4513,66 +4522,67 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Tugmatag"
-
-#: 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 "Vaqt zonasi"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Grafik interfeys"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "TV karta"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "ISDN karta"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Grafik interfeys"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Tarmoq"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Proksilar"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Xavfsizlik darajasi"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Fayervol"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
-msgstr "OS yuklagichi"
+msgstr "OT yuklagichi"
 
-#: 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 "Xizmatlar"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -4580,7 +4590,7 @@ msgid ""
 "and will not be recoverable!"
 msgstr ""
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -4599,7 +4609,17 @@ msgstr ""
 "Ma'lumotni va diskning barcha qismlarini yo'qotmasdan bu\n"
 "operatsiyani to'xtatish uchun \"%s\"ni bosing."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Keyingi ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Oldingi"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -4607,12 +4627,82 @@ msgid ""
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Siz %s'ni ham format qilishingiz kerak"
 
-#: 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 "Sizda qo'shimcha kompakt-disk bormi?"
+
+#. -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 ""
+"O'rnatish uchun ishlatiladigan quyidagi manba topildi: %s\n"
+"\n"
+"\n"
+"Sizda qo'shimchi manba bormi?"
+
+#: 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 "Kompakt-disk"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Tarmoq (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Tarmoq (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Hech qanday uskuna topilmadi"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr ""
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr ""
+
+#: 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 "%s'ni %s'da topib bo'lmadi."
+
+#. -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"
@@ -4626,7 +4716,8 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: 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"
@@ -4639,41 +4730,46 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?\n"
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Iltimos %s uskunasiga formati FAT bo'lgan disketni qo'ying"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Bu disketning formati FAT emas"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: 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 faylini o'qishda xato ro'y berdi"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (avval %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Tizimni o'rnatish"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Tizimni moslash"
@@ -4707,7 +4803,7 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: 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 "Sizda /boot/efi nuqtasiga ulangan diskning FAT qismi bo'lishi shart"
@@ -4767,7 +4863,7 @@ msgstr "Diskning qaysi qismining hajmini o'zgartirmoqchisiz?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 
 #: install_interactive.pm:156
@@ -4783,7 +4879,8 @@ msgid ""
 "installation."
 msgstr ""
 
-#: 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"
@@ -4798,55 +4895,55 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr ""
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "diskning %s qismi"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Diskning Windows qismining hajmini o'zgartirish"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Diskning FAT qismining hajmini o'zgartirish muvaffaqiyatsiz tugadi: %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 ""
-"Hajmini o'zgartirish uchu diskda FAT qism mavjud emas (yoki etarli joy mavjud "
-"emas)"
+"Hajmini o'zgartirish uchu diskda FAT qism mavjud emas (yoki etarli joy "
+"mavjud emas)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Windows(TM)'ni o'chirish"
 
-#: 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 ""
 "Sizda bittadan ko'p qattiq disk mavjud. Ularni qaysiga Linux'ni o'rnatasiz?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "%s diskning barcha qismlari va ulardagi barcha ma'lumot o'chiriladi"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Fdisk dasturidan foydalanish"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4855,32 +4952,33 @@ msgstr ""
 "Endi siz %s diskni bo'lishingiz mumkin.\n"
 "Tugatgach \"w\" bilan saqlash esingizdan chiqmasin."
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "O'rnatish uchun joy topilmadi"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX diskni bo'lish yordamchisi quyidagi echimlarni topdi:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Diskni bo'lish muvaffaqiyatsiz tugadi: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Tarmoq ishga tushirilmoqda"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Tarmoq o'chirilmoqda"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -4898,7 +4996,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 "
@@ -4920,7 +5018,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"
@@ -4928,14 +5026,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"
@@ -4965,10 +5063,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"
@@ -4979,11 +5077,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"
@@ -4999,24 +5097,25 @@ 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 ""
 "Kirish\n"
 "\n"
-"Mandrakelinux distributivida mavjud bo'lgan operatsion sistema va uning turli "
+"Mandrakelinux distributivida mavjud bo'lgan operatsion tizim va uning turli "
 "qismlari \n"
 "bundan buyon \"Dasturiy Mahsulotlar\" deb yuritiladi. Dasturiy mahsulotlar \n"
-"Mandrakelinux distributivning qismlari va operatsion sistema bilan bog'liq "
+"Mandrakelinux distributivning qismlari va operatsion tizim bilan bog'liq "
 "bo'lgan\n"
-"dasturlar to'plami, usullar, qoidalar va qo'llanmalarni o'z ichiga oladi, ammo "
-"bu bilan cheklanmaydi.\n"
+"dasturlar to'plami, usullar, qoidalar va qo'llanmalarni o'z ichiga oladi, "
+"ammo bu bilan cheklanmaydi.\n"
 "\n"
 "\n"
 "1. Litsenziya kelishuvi\n"
 "\n"
 "Iltimos, ushbu hujjatni diqqat bilan o'qib chiqing. Bu hujjat Siz bilan "
-"MandrakeSoft S.A. \n"
-"o'rtasida Dasturiy Mahsulotlari bo'yicha imzolanadigan litsenziya kelishuvidir.\n"
+"Mandrakesoft S.A. \n"
+"o'rtasida Dasturiy Mahsulotlari bo'yicha imzolanadigan litsenziya "
+"kelishuvidir.\n"
 "Dasturiy Mahsulotlarni har qanday maqsad bilan o'rnatib, ko'paytirib yoki \n"
 "ulardan foydalanib Siz mazkur Litsenziyaning shartlari va qoidalarini to'liq "
 "qabul \n"
@@ -5025,9 +5124,10 @@ msgstr ""
 "Mahsulotlarni\n"
 "o'rnatish, ko'paytirish yoki ulardan foydalanishga ruxsat berilmaydi. Mazkur "
 "litsenziyaning \n"
-"shartlariga zid holda Dasturiy Mahsulotlarni o'rnatish, ko'paytirish va ulardan "
-"foydalanishga \n"
-"har qanday urinish ushbu Litsenziya asosida Sizga berilgan barcha huquqlarni\n"
+"shartlariga zid holda Dasturiy Mahsulotlarni o'rnatish, ko'paytirish va "
+"ulardan foydalanishga \n"
+"har qanday urinish ushbu Litsenziya asosida Sizga berilgan barcha "
+"huquqlarni\n"
 "bekor qiladi. Litsenziya kelishuvi bekor qilingach, Siz Dasturiy "
 "Mahsulotlarning\n"
 "barcha nusxalarini darhol o'chirib tashlashingiz lozim.\n"
@@ -5037,38 +5137,39 @@ msgstr ""
 "\n"
 "Dasturiy Mahsulotlar va ularga ilova qilingan qo'llanmalar \"o'z holicha\", "
 "qonunda yo'l qo'yilgan\n"
-"darajada hech qanday kafolatlarsiz taqdim qilinadi. MandrakeSoft S.A. qonunda "
-"yo'l qo'yilgan\n"
+"darajada hech qanday kafolatlarsiz taqdim qilinadi. Mandrakesoft S.A. "
+"qonunda yo'l qo'yilgan\n"
 "darajada hech qanday holatda Dasturiy Mahsulotlardan foydalanish yoki "
 "foydalanmaslik oqibatida\n"
-"tasodifiy, to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar (shu "
-"jumladan biznesning\n"
+"tasodifiy, to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar "
+"(shu jumladan biznesning\n"
 "kasod bo'lishi, tijorat faoliyatidagi uzilishlar, moliyaviy zararlar, sud "
 "mahkamalari natijasidagi\n"
-"sud xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita yo'qotishlar) "
-"uchun, hatto MandrakeSoft S.A.'ga\n"
-"shunday zarar ko'rish imkoniyati yoki holatlari ma'lum bo'lgan taqdirda ham,\n"
+"sud xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita "
+"yo'qotishlar) uchun, hatto Mandrakesoft S.A.'ga\n"
+"shunday zarar ko'rish imkoniyati yoki holatlari ma'lum bo'lgan taqdirda "
+"ham,\n"
 "javobgar bo'lmaydi.\n"
 "\n"
 "BA'ZI MAMLAKATLARDA MAN QILINGAN DASTURIY MAHSULOTLARGA EGALIK QILISh\n"
 "YoKI ULARDAN FOYDALANISh BILAN BOG'LIQ ChEKLANGAN MAS'ULIYaT\n"
 "\n"
-"MandrakeSoft S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada hech "
-"qanday holatda\n"
+"Mandrakesoft S.A. yoki uning tarqatuvchilari qonunda yo'l qo'yilgan darajada "
+"hech qanday holatda\n"
 "ba'zi mamlakatlarning mahalliy qonunlari bilan cheklangan yoki man qilingan "
 "dasturiy\n"
-"mahsulotlarning qismlariga egalik qilish va ulardan foydalanish, yoki Mandrake "
-"Linux\n"
-"saytlarining biridan dasturiy mahsulotning qismlarini ko'chirib olish oqibatida "
-"tasodifiy,\n"
-"to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar (shu jumladan "
-"biznesning kasod bo'lishi,\n"
+"mahsulotlarning qismlariga egalik qilish va ulardan foydalanish, yoki "
+"Mandrakelinux\n"
+"saytlarining biridan dasturiy mahsulotning qismlarini ko'chirib olish "
+"oqibatida tasodifiy,\n"
+"to'g'ridan-to'g'ri, bevosita yoki bilvosita etkazilgan zararlar (shu "
+"jumladan biznesning kasod bo'lishi,\n"
 "tijorat faoliyatidagi uzilishlar, moliyaviy zararlar, sud mahkamalari "
 "natijasidagi sud\n"
-"xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita yo'qotishlar) uchun "
-"javobgar bo'lmaydi.\n"
-"Cheklangan ma'suliyat Dasturiy Mahsulotlarga kiritiladigan kuchli kriptografiya "
-"qismlariga\n"
+"xarajatlari yoki jarimalar yoki boshqa har qanday bilvosita yo'qotishlar) "
+"uchun javobgar bo'lmaydi.\n"
+"Cheklangan ma'suliyat Dasturiy Mahsulotlarga kiritiladigan kuchli "
+"kriptografiya qismlariga\n"
 "nisbatan ham qo'llaniladi, ammo bu bilan cheklanmaydi.\n"
 "\n"
 "\n"
@@ -5076,23 +5177,24 @@ msgstr ""
 "\n"
 "Dasturiy Mahsulotlar turli kishilar yoki tashkilotlar tomonidan yaratilgan "
 "qismlardan iboratdir.\n"
-"Ushbu qismlarning ko'pchiligi bundan buyon \"GPL\" deb ataladigan GNU General "
-"Public Licence\n"
-"shartlari va qoidalari yoki shunga o'xshash litsenziyalar ta'siri ostidadir. Ushbu "
-"litsenziyalarning\n"
+"Ushbu qismlarning ko'pchiligi bundan buyon \"GPL\" deb ataladigan GNU "
+"General Public Licence\n"
+"shartlari va qoidalari yoki shunga o'xshash litsenziyalar ta'siri ostidadir. "
+"Ushbu litsenziyalarning\n"
 "ko'pchiligi o'z ta'siri ostidagi qismlarni Sizga foydalanish, ko'paytirish, "
 "moslashtirish yoki tarqatish\n"
-"huquqini beradi. Iltimos, har qanday qismdan foydalanishdan avval qismlarning "
-"har biri\n"
-"uchun litsenziya kelishuvining shartlari va qoidalarini diqqat bilan o'qib chiqing. "
-"Qismning\n"
-"litsenziyasiga oid har qanday savollar MandrakeSoft'ga emas, balki qismning "
+"huquqini beradi. Iltimos, har qanday qismdan foydalanishdan avval "
+"qismlarning har biri\n"
+"uchun litsenziya kelishuvining shartlari va qoidalarini diqqat bilan o'qib "
+"chiqing. Qismning\n"
+"litsenziyasiga oid har qanday savollar Mandrakesoft'ga emas, balki qismning "
 "muallifiga yuborilishi\n"
-"lozim. MandrakeSoft S.A. tomonidan ishlab chiqilgan dasturlar GPL litsenziyasi "
-"ta'siri\n"
-"ostidadir. MandrakeSoft S.A. tomonidan yozilgan qo'llanmalar esa maxsus "
+"lozim. Mandrakesoft S.A. tomonidan ishlab chiqilgan dasturlar GPL "
+"litsenziyasi ta'siri\n"
+"ostidadir. Mandrakesoft S.A. tomonidan yozilgan qo'llanmalar esa maxsus "
 "litsenziya ta'siri\n"
-"ostidadir. Iltimos, qo'shimcha ma'lumot uchun qo'llanmalarga murojaat qiling.\n"
+"ostidadir. Iltimos, qo'shimcha ma'lumot uchun qo'llanmalarga murojaat "
+"qiling.\n"
 "\n"
 "\n"
 "4. Intellektual mulk huquqlari\n"
@@ -5101,12 +5203,12 @@ msgstr ""
 "mualliflariga\n"
 "tegishli bo'lib, intellektual mulk va dasturiy mahsulotlarga oid mualliflik "
 "huquqi\n"
-"to'g'risidagi qonunlar bilan himoyalanadi. MandrakeSoft S.A. Dasturiy "
+"to'g'risidagi qonunlar bilan himoyalanadi. Mandrakesoft S.A. Dasturiy "
 "Mahsulotlarni to'liq\n"
 "yoki qisman, har qanday yo'l bilan va istalgan maqsadlarda o'zgartirish yoki "
 "moslashtirish huquqini\n"
 "o'zida saqlab qoladi. \"Mandrake\", \"Mandrakelinux\" va tegishli belgilar "
-"MandrakeSoft S.A.'ga\n"
+"Mandrakesoft S.A.'ga\n"
 "tegishli savdo belgilaridir.\n"
 "\n"
 "\n"
@@ -5122,12 +5224,12 @@ msgstr ""
 "ostidadir.\n"
 "Mazkur litsenziyaning shartlari va qoidalariga oid har qanday nizolar asosan "
 "sudda muhokama qilinadi.\n"
-"So'nggi navbatda masalaning ko'rilishi tegishli Parij (Frantsiya) Qonunchilik "
-"sudiga havola qilinadi.\n"
-"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha MandrakeSoft S.A. "
+"So'nggi navbatda masalaning ko'rilishi tegishli Parij (Frantsiya) "
+"Qonunchilik sudiga havola qilinadi.\n"
+"Iltimos, mazkur hujjatga oid har qanday savollar bo'yicha Mandrakesoft S.A. "
 "bilan bog'laning.\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"
@@ -5139,7 +5241,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: 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"
@@ -5172,7 +5275,7 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5205,30 +5308,31 @@ msgstr ""
 "Tizimni moslash haqida ma'lumot Mandrakelinux\n"
 "foydalanuvchilari uchun rasmiy qo'llanmasida mavjud."
 
-#: 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 "Bir hil ulash nuqtalari %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 ""
 "Ba'zi bir muhim paketlar to'g'ri o'rnatilmadi.\n"
 "Sizning kompakt-disk uskunangizda yoki kompakt-diskingizda xato bor.\n"
-"Kompakt-diskni o'rnatilgan kompyuterda \"rpm -qpl Mandrake/RPMS/*.rpm\" "
+"Kompakt-diskni o'rnatilgan kompyuterda \"rpm -qpl media/main/*.rpm\" "
 "buyrug'i bilan tekshirib ko'ring.\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Hech qanday disket uskunasi mavjud emas"
@@ -5238,7 +5342,7 @@ msgstr "Hech qanday disket uskunasi mavjud emas"
 msgid "Entering step `%s'\n"
 msgstr "%s bosqichga o'tilmoqda\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"
@@ -5247,94 +5351,95 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: 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 "Paketlarni guruh bo'yicha tanlash"
 
-#: 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 "Jami: %d / %d Mb"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Yomon paket"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Versiyasi: "
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Hajmi: "
 
-#: 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 "Muhimligi: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Bu paketni tanlolmaysiz/tanlashni bekor qilolmaysiz"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "%s etishmagani uchun"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: 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 ""
+msgstr "%s'ni qoldirish uchun"
 
-#: 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"
 msgstr ""
 "Bu paketni tanlolmaysiz, chunki uni o'rnatish uchun etarli joy mavjud emas."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Quyidagi paketlar o'rnatiladi"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Quyidagi paketlar olib tashlaniladi."
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "Bu o'rnatilishi shart bo'lgan paket, uni tanlashni bekor qilib bo'lmaydi."
+msgstr ""
+"Bu o'rnatilishi shart bo'lgan paket, uni tanlashni bekor qilib bo'lmaydi."
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "Bu paketni tanlashni bekor qilolmaysiz. U allaqachon o'rnatilgan."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5343,237 +5448,241 @@ msgstr ""
 "Bu paket yangilanishi shart.\n"
 "Uni tanlashni bekor qilishga ishonchingiz komilmi?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Bu paketni tanlashni bekor qilolmaysiz. U yangilanishi shart."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Avtomatik ravishda tanlangan paketlarni ko'rsatish"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Disketdan/ga yuklash/saqlash"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Paketlar tanlovi yangilanmoqda"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal o'rnatish"
 
-#: 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 "Siz o'rnatmoqchi bo'lgan paketlarni tanlang"
 
-#: 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 "O'rnatilmoqda"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Tafsilotlarsiz"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Chamalanmoqda"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Qolgan vaqt "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Iltimos kutib turing, o'rnatishga tayyorlanmoqda..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Tafsilotlarsiz"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d paket"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi o'rnatilmoqda"
 
-#: 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 "Rad etish"
 
-#: 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 ""
 "Kompakt-diskni almashtiring!\n"
 "\n"
-"Iltimos \"%s\" belgili kompakt-diskni qo'ying va \"Ok\" tugmasini bosing.\n"
-"Agar u sizda bo'lmasa, bu kompakt-diskdan o'rnatishni bekor qilish uchun \"Bekor "
-"qilish\" tugmasini bosing."
+"Iltimos '%s' belgili kompakt-diskni qo'ying va \"Ok\" tugmasini bosing.\n"
+"Agar u sizda bo'lmasa, bu kompakt-diskdan o'rnatishni bekor qilish uchun "
+"\"Bekor qilish\" tugmasini bosing."
 
-#: 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 "Quyidagi paketlarni saralashda xato ro'y berdi:"
 
-#: 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 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: 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 "Quyidagi paketlarni o'rnatishda xato ro'y berdi:"
 
-#: 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 "moslanmagan"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr ""
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Litsenziya kelishuvi"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "Yangi narsalar"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Iltimos tugmalar tartibini tanlang."
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Mavjud bo'lgan tugmataglarning to'liq ro'yxati"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "O'rnatish/Yangilash"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Bu o'rnatishmi yoki yangilashmi?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s'ni yangilash"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s uchun kodlash kaliti"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Iltimos sichqonchaning turini tanlang."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Sichqonchaning porti"
 
-#: 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 "Iltimos sichqoncha ulangan ketma-ket portini tanlang."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: 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 "PCMCIA kartalar moslanmoqda..."
 
-#: 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 "IDE'ni moslash"
 
-#: 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 "Diskning qismi yo'q."
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Ulash nuqtalarini topish uchun diskning qismlari tekshirilmoqda"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Ulash nuqtalarini tanlang"
 
-#: 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 "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Format qilish uchun diskning qismlarini tanlang"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr " Xato bloklarni tekshiraymi?"
 
-#: 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, "
@@ -5582,83 +5691,94 @@ msgstr ""
 "%s fayl tizimini tekshirish muvaffaqiyatsiz tugadi. Xatolarni tuzatishni "
 "istaysizmi? (esingizda tursin, siz ma'lumotni yo'qotishingiz mumkin)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr ""
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
-"Mavjud bo'lgan paketlarni qidirish va rpm ma'lumot bazasini boshqadan yaratish "
-"bajarilmoqda..."
+"Mavjud bo'lgan paketlarni qidirish va rpm ma'lumot bazasini boshqadan "
+"yaratish bajarilmoqda..."
 
-#: 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 "Mavjud bo'lgan paketlar qidirilmoqda..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Allaqachon o'rnatilgan paketlar qidirilmoqda..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Yangilash uchun paketlar qidirilmoqda..."
 
-#: 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 ""
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Paketlarni olish uchun oynani tanlang"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "Tizimda o'rnatish yoki yangilash uchun etarli joy qolmadi (%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"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Disketdan yuklash"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Disketga saqlash"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Paketlarni tanlash"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Disketdan yuklanmoqda"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Paketlar tanlovi mavjud bo'lgan disketni qo'ying"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Tanlangan hajm mavjud bo'lgan bo'sh joydan katta"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "O'rnatishning turi"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -5667,22 +5787,22 @@ msgstr ""
 "Siz hech qanday paketlar guruhini tanlamadingiz.\n"
 "Iltimos siz istagan minimal o'rnatishni tanlang:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Asosiy qo'llanmalar bilan (tavsiya qilinadi!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Haqiqiy minimal o'rnatish (xususan urpmi'siz)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Hammasi"
 
-#: 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"
@@ -5695,17 +5815,17 @@ msgstr ""
 "Agar ulardan ba'zi biri bo'lmasa, ularni tanlashni bekor qiling va \"Ok\" "
 "tugmasini bosing."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "\"%s\" belgili kompakt-disk"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "O'rnatishga tayyorlanmoqda"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5714,17 +5834,17 @@ msgstr ""
 "%s paketi o'rnatilmoqda\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "O'rnatishdan keyin moslash"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: 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"
@@ -5734,187 +5854,172 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
-msgstr ""
-
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
+"Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "Paketlarni olish uchun oynani tanlang"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr ""
 "Mavjud bo'lgan paketlarning ro'yxatini olish uchun oyna bilan aloqa "
 "o'rnatilmoqda..."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Oyna (%s)bilan aloqa o'rnatib bo'lmadi."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Boshqadan urinib ko'rishni istaysizmi?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Vaqt zonangizni tanlang?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "NTP serveri"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Hisobot"
 
-#: 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 "Tizim"
 
-#: 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 "Asbob-uskunalar"
 
-#: 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 "Masofadagi CUPS serveri"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Printer yo'q"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Sizda ISA tovush kartasi bormi?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"O'rnatishdan keyin, tovush kartangizni moslash uchun, \"sndconfig\" yoki \"alsaconf"
-"\" dasturini ishga tushiring"
+"O'rnatishdan keyin, tovush kartangizni moslash uchun, \"sndconfig\" yoki "
+"\"alsaconf\" dasturini ishga tushiring"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Tovush kartasi topilmadi. O'rnatishdan keyin \"harddrake\" dasturini sinab "
 "ko'ring."
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafik interfeys"
 
-#: 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 "Tarmoq va Internet"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Proksilar"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "moslangan"
 
-#: 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 "Xavfsizlik"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "ishlayapti"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "o'chirilgan"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Tizimni yuklanishi"
 
 #. -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 %s'da"
 
-#: 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 "Xizmatlar: %d ishlamoqda %d qayd qilingan"
 
-#: 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 "Siz X'ni moslamadingiz. Rostdan buni istaysizmi?"
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Root uchun maxfiy so'z"
 
-#: 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 "Bu maxfiy so'z juda qisqa (u eng kami %d belgidan iborat bo'lishi shart)"
+msgstr ""
+"Bu maxfiy so'z juda qisqa (u eng kami %d belgidan iborat bo'lishi shart)"
 
-#: 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 "Tasdiqlash"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
-msgstr "OS yuklagichi tayyorlanmoqda..."
+msgstr "OT yuklagichi tayyorlanmoqda..."
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5923,64 +6028,41 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "aboot dasturidan foydalanishni istaysizmi?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "OS yuklagichi o'rnatilmoqda"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-"Operatsion sistema yuklagichini o'rnatish muvaffaqiyatsiz tugadi. Quyidagi xato "
-"ro'y berdi:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: 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 "Bo'sh disketni %s uskunasiga qo'ying"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Iltimos drayverlar uchun boshqa disketni qo'ying"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Avto-o'rnatish disketi yaratilmoqda..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5991,12 +6073,12 @@ msgstr ""
 "\n"
 "Rostdan chiqishni istaysizmi?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Avto-o'rnatish disketni yaratish"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6011,29 +6093,51 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Mandrakelinux'ni o'rnatish %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 "
 msgstr ""
-"  <Tab>/<Alt-Tab> elementdan-elementga | <Space> tanlash | <F12> keyingi oyna "
+"  <Tab>/<Alt-Tab> elementdan-elementga | <Space> tanlash | <F12> keyingi "
+"oyna "
 
 #: interactive.pm:170
 #, c-format
 msgid "Choose a file"
 msgstr "Faylni tanlang"
 
+#: 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 "Qo'shish"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "O'zgartirish"
+
+#: 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 "Olib tashlash"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Asosiy"
 
-#: 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 "Tayyor"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Bajarish"
@@ -6109,572 +6213,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Boshqadan jo'natish"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Chexcha (qwertz)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Olmoncha"
 
-#: 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 "Ispancha"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Fincha"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Frantsuzcha"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Norvegcha"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Polyakcha"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Ruscha"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Shvedcha"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Buyuk Britaniya"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "AQSh"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albancha"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Armancha (eski)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Armancha (yozish moshinasi)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Armancha (fonetik)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arabcha"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Ozarbayjoncha (lotin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Belgiacha"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Bengalcha"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Bolgarcha (fonetik)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Bolgarcha (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brazilcha (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosniyacha"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Beloruscha"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Shveytsariya (Olmoncha)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Shveytsariya (Frantsuzcha)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Chexcha (qwerty)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Olmoncha (o'lik tugmalarsiz)"
 
-#: 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 "Daniya"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (AQSh)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (Norvegcha)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (Shvedcha)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estoncha"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Gruzincha (rus)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Gruzincha (lotin)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Grekcha"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Grekcha (politonik)"
 
-#: 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 "Gurmuxi"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Vengrcha"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Xorvatcha"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Irlandcha"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Isroilcha"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Isroilcha (fonetik)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Eroncha"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Islandcha"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Italyancha"
 
-#: 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 "Yaponcha 106 tugma"
 
-#: 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 "Koreyscha"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Qirg'izcha"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Lotin Amerikacha"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laoscha"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Litvacha AZERTY (eski)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Litvacha AZERTY (yangi)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Litvacha \"raqamli qator\" (qwerty)"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Litvacha \"fonetik\" (qwerty)"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Latviacha"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayalam"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Makedoncha"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Myanmar (Birma)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mug'ulcha (kiril)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Malta (Buyuk Britaniya)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Malta (AQSh)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Gollandcha"
 
-#: 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 "Polyakcha (qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polyakcha (qwertz)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Portugalcha"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Kanadcha (Kvebek)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Rumincha (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Rumincha (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Ruscha (fonetik)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (Norvegcha)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (Shvedcha/Fincha)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Slovencha"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Slovakcha (qwertz)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Slovakcha (qwerty)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbcha (kirilcha)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Suriyacha"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Eski Suriyacha (fonetik)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Telegu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Tamilcha (ISCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamilcha (yozish moshinasi)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Taycha"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Tojikcha"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Turkcha (an'anaviy \"F\" modeli)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Turkcha (zamonaviy \"Q\" modeli)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Ukraincha"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "AQSh (xalqaro)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "O'zbekcha (kiril)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vetnamcha \"raqamli qator\" (qwerty)"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Yugoslavcha (lotin)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "O'ng Alt tugmasi"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Bir vaqtda ikkala Shift tugmalari"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bir vaqtda Ctrl va Shift tugmalari"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tugmasi"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Bir vaqtda Shift va CapsLock tugmalari"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bir vaqtda Ctrl va Alt tugmalari"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bir vaqtda Alt va Shift tugmalari"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menyu\" tugmasi"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Chap \"Windows\" tugmasi"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "O'ng \"Windows\" tugmasi"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Bir vaqtda ikkala Ctrl tugmalari"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Bir vaqtda ikkala Alt tugmalari"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Chap Shift tugmasi"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "O'ng Shift tugmasi"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Chap Alt tugmasi"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Chap Ctrl tugmasi"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "O'ng Ctrl tugmasi"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6685,7 +6982,7 @@ msgstr ""
 "yaratuvchi tugma yoki tugmalar birikmasini tanlashingiz\n"
 "mumkin. (m-n: lotin va lotin emas)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6696,1164 +6993,1188 @@ msgstr ""
 "O'rnatish vaqtida turli tugmalar tartibini tanlash uchun\n"
 "o'ng \"Ctrl\" turmasini ishlating."
 
-#: 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 "Afg'oniston"
-
-#: 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 "Birlashgan Arab Amirliklari"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afg'oniston"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua va Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Angvilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albaniya"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armaniston"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Niderlandlar Antil Orollari"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentina"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "Amerika Samoasi"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Ozarbayjon"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosniya va Gertsogovina"
 
-#: 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-Fasso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Bolgariya"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrayn"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda Orollari"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Bruney Dorussalom"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Boliviya"
 
-#: 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 "Braziliya"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bagama Orollari"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Butan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Buve Oroli"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botsvana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Belorus"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Beliz"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos (Kiling) Orollari"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo (Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Markaziy Afrika Respublikasi"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo (Brazzavil)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Shveytsariya"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Kot d'Ivuar"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Kuk Orollari"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chili"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "Xitoy"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Kolumbiya"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbiya va Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Kuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Keyp Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Krismas Oroli"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Kipr"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Jibuti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Daniya"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominika"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikana Respublikasi"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Jazoir"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estoniya"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Misr"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "G'arbiy Saxara"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Eritriya"
 
-#: 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 "Ispaniya"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Efiopiya"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Finlyandiya"
 
-#: 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 "Folklend (Malvin) Orollari"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Mikroneziya"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Farer Orollari"
 
-#: 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 "Buyuk Britaniya"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
-msgstr "Gruziya"
+msgstr "Gurjiston"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "Frantsuz Gvineya"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Gana"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Grenlandiya"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambiya"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Gvineya"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Gvadelupa"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial Gvineya"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Janubiy Jorjiya va Janubiy Sendvich Orollari"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Gvineya-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Gviana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Xitoy (Gonkong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Xerd va MakDonald Orollari"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Gonduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Xorvatiya"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Gaiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Vengriya"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indoneziya"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Irlandiya"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Isroil"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "Hindiston"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Hind Okeanning Britaniya Erlari"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Iroq"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Eron"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Islandiya"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Yamayka"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Iordan"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Keniya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Qirg'iziston"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodja"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Komoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Sent-Kristofer va Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Shimoliy Koreya"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Koreya"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuvayt"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Kayman Orollari"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Qozog'iston"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Sent-Lyusiya"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Lixtenshteyn"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Shri Lanka"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Liberiya"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Litva"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Lyuksemburg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Latviya"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libiya"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Marokash"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monako"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshall Orollari"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Makedoniya"
 
-#: 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 "Mug'iliston"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Shimoliy Mariana Orollari"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinika"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mavritaniya"
 
-#: 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 "Mavrikiy"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldiv Orollari"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malavi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Meksika"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malayziya"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibiya"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Yangi Kaledoniya"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolk Oroli"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeriya"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: 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 "Yangi Zelandiya"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Ummon"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Frantsuz Polineziya"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua Yangi Gvineya"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Filippin"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pokiston"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Polsha"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Sent-Per va Mikelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitkern"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto-Riko"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Falastin"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugaliya"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paragvay"
 
-#: 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 "Reyunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Ruminiya"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Rossiya"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rvanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudiya Arabistoni"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Solomon Orollari"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seyshel Orollari"
 
-#: 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 "Avliyo Elena Oroli"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Sloveniya"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard va Yan Mayen Orollari"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Serra-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 "Somali"
 
-#: 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 "San-Tome va Prinsipi"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Suriya"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Svazilend"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks va Kaikos Orollari"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "Frantsiyaning Janubiy Erlari"
 
-#: 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 "Tailand"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tojikiston"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Sharqiy Timur"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmaniston"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turkiya"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad va Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzaniya"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Kichik Uzoqlashgan Orollar Qo'shma Shtatlari"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Urugvay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "O'zbekiston"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Vatikan"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Sent-Vinsent va Grenadina"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venesuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virginiya Orollari (Angliya)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virginiya Orollari (AQSh)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Vetnam"
 
-#: 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 "Uollis va Futuna Orollari"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yaman"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayot"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbiya va Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Janubiy Afrika"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambiya"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "Quyidagi paketlarni o'rnatish kerak: %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 "%s'ga marhamat"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr ""
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr ""
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parametrlar"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "YO'Q"
@@ -7870,8 +8191,8 @@ msgstr "Modulning hamma parametrlarini shu erda moslashingiz mumkin."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s interfeyslar topildi"
+msgid "Found %s interfaces"
+msgstr "%s interfeyslar topildi"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -7924,12 +8245,12 @@ msgid "Module options:"
 msgstr "Modulning parametrlari:"
 
 #. -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 "Qaysi %s drayverni sinab ko'ray?"
 
-#: 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"
@@ -7941,17 +8262,17 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Avto-aniqlash"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Parametrlarni aniqlash"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -8010,11 +8331,11 @@ msgstr "G'ildirakli andoza PS2 sichqoncha"
 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 "Avtomatik"
@@ -8159,50 +8480,55 @@ msgstr "Universal"
 msgid "Any PS/2 & USB mice"
 msgstr "Istagan PS/2 va USB sichqoncha"
 
-#: 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 "yo'q"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Sichqoncha yo'q"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Iltimos sichqonchani sinab ko'ring"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Sichqonchani ishga tushirish uchun,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "G'ILDIRAKNI AYLANTIRING!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "pppoe'dan foydalanish"
+msgid "use PPPoE"
+msgstr "PPPoE'dan foydalanish"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "pptp'dan foydalanish"
+msgid "use PPTP"
+msgstr "PPTP'dan foydalanish"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "dhcp'dan foydalanish"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -8211,33 +8537,33 @@ msgstr " - topildi"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem (pppoa'ni ishlatib) usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (PPPoA'ni ishlatib) USB"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem (dhcp'ni ishlatib) usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (DHCP'ni ishlatib) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Internetga ulanish"
 
-#: 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 ""
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "ADSL ulanishning turi:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Veb serveri"
@@ -8290,7 +8616,7 @@ msgstr ""
 #: network/drakfirewall.pm:65
 #, c-format
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #: network/drakfirewall.pm:131
 #, c-format
@@ -8361,269 +8687,275 @@ msgstr "Hammasi (fayervol yo'q)"
 msgid "Other ports"
 msgstr "Boshqa portlar"
 
-#: 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 "Men bilmayman"
 
-#: 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 ""
+msgstr "Qo'lbola"
 
-#: 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 ""
+msgstr "Qo'lbola tanlash"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Ichki ISDN karta"
 
-#: 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 "Managed"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Repiter"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Ikkilamchi"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Avto"
 
-#: 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 ""
+msgstr "Qo'lbola moslash"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Avtomatik IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Avtomatik IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Oyropa protokoli (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"
 "No D-Channel (leased lines)"
 msgstr ""
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB modemi"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB modemi"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan modemi"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus modemi"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
-msgstr ""
+msgstr "TCP/IP moslamarini qo'lbola moslash"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: 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 "Skriptda asoslangan"
 
-#: 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 "Terminalda asoslangan"
 
-#: 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 "Tarmoq va Internetni moslash"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(%s portida topildi)"
 
 #. -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 "(%s topildi)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(topildi)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Vin-modem orqali ulanish"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN orqali ulanish"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL orqali ulanish"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Kabel orqali ulanish"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "LAN orqali ulanish"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Simsiz ulanish"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Siz moslamoqchi bo'lgan ulanishni tanlang"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8636,131 +8968,130 @@ msgstr ""
 "\n"
 "Davom etish uchun \"%s\" tugmasini bosing."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Aloqani moslash"
 
-#: 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 ""
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Kartaning IRQ'si"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kartaning xotirasi (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Kartaning IO'si"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Kartaning IO_0'si"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Kartaning IO_1'si"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Shaxsiy telefon raqamingiz"
 
-#: 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 "Provayderning nomi (m-n provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Provayderning telefon raqami"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Provayderning DNS 1 (tanlasa bo'ladi)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Provayderning DNS 2 (tanlasa bo'ladi)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr ""
 
-#: 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 "Aloqaning tezligi"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Aloqa taymauti (soniyada)"
 
-#: 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 "Foydalanuvchi"
 
-#: 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 "Maxfiy so'z"
 
-#: 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 "Moslash uchun tarmoq interfeysini tanlang:"
 
-#: 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 "Tarmoq uskunasi"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Tashqi ISDN modem"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Uskunani tanlang!"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN'ni moslash"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Sizda qanday karta bor?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -8776,34 +9107,48 @@ msgstr ""
 "Agar sizda PCMCIA kartasi bo'lsa, kartangizning \"irq\" va \"io\" "
 "qiymatlarini bilishingiz kerak.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Davom etish"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "To'xtatish"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Quyidagilarning qayi biri sizning ISDN kartangiz?"
 
-#: 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 "Drayver"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Qaysi protokoldan foydalanmoqchisiz?"
 
-#: 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 "Protokol"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -8812,137 +9157,132 @@ msgstr ""
 "Provayderingizni tanlang.\n"
 "Agar ro'yxatda yo'q bo'lsa, \"Ro'yxatda yo'q\"ni tanlang."
 
-#: 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 "Provayder:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
-"Modemingizni bu sistemada ishlatib bo'lmaydi.\n"
+"Modemingizni bu tizimda ishlatib bo'lmaydi.\n"
 "http://www.linmodem.org veb-saytiga qarang."
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Moslash uchun modemni tanlang:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr ""
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Iltimos, modem ulangan ketma-ket portini tanlang."
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Provayderingizni tanlang:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr ""
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Ulanishning nomi"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Telefon raqami"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Foydalanuvchi"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr ""
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "IP parametrlari"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "IP raqami"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr ""
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: 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 ""
+msgstr "Domenning nomi"
 
-#: 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 "Birinchi DNS serveri (tanlab bo'ladi)"
 
-#: 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 "Ikkinchi DNS serveri (tanlab bo'ladi)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr ""
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Geytvey"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Geytveyning IP raqami"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL moslamasi"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Iltimos ADSL provayderingizni tanlang"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8950,32 +9290,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Disketdan foydalanish"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Diskning Windows qismini ishlatish"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Keyinroq bajarish"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8989,22 +9329,22 @@ msgstr ""
 "dan yozib oling va mgmt.o faylini /usr/share/speedtouch direktoriyasiga "
 "ko'chiring."
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr ""
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9013,21 +9353,23 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Drayverni qo'lbola yuklash"
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
+"DIQQAT: Bu uskuna Internetga ulanish uchun allaqachon moslangan.\n"
+"Uni boshqadan moslashni istaysizmi?"
 
-#: 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"
@@ -9036,24 +9378,24 @@ msgstr ""
 "Tabriklaymiz, tarmoqni va Internetni moslash tugadi.\n"
 "\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 "Tarmoq uskunasi %s (%s drayveri) moslanmoqda"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9064,89 +9406,95 @@ msgstr ""
 "Yozuvning har qaysi nuqta bilan ajratilgan o'nlik son shaklida\n"
 "IP raqam bo'lishi kerak (m-n 1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr ""
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP xostning nomi"
 
-#: 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 "Tarmoq maskasi"
 
-#: 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 ""
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Tizim yuklanayotganda ishga tushirish"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klienti"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP raqami quyidagi formatda bo'lishi shart: 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 ""
 
-#: 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'dan allaqachon foydalanilmoqda\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: 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 ""
 
-#: 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 "
@@ -9155,19 +9503,19 @@ msgstr ""
 "Chastota \"M\" yoki \"G\" bilan tugashi kerak (masalan, 2.46 GHz uchun\n"
 "\"2.46G\"), yoki etarlicha \"0\" (nol) qo'shing."
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: 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 "
@@ -9181,33 +9529,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
@@ -9219,12 +9567,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 ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9242,29 +9590,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 ""
-"Sizning sistemangizda ethernet tarmoq adapteri topilmadi.\n"
-"Men aloqaning bunday turini o'rnatolmayman."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Tarmoq interfeysini tanlash"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Iltimos, Internetga ulanish uchun qaysi tarmoq adapteridan foydalanishni "
-"tanlang."
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9273,84 +9599,86 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Xostning nomi (tanlab bo'ladi)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Kompyuterning nomi"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "DNS serveri 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "DNS serveri 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "DNS serveri 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr ""
 
-#: 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 "Geytvey (m-n %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Geytvey uskunasi"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS serverning manzili quyidagi formatda bo'lishi shart: 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 ""
 
-#: 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 "Zeroconf kompyuterning nomi"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconf kompyuterning nomida \".\" belgisi bo'lmashi kerak"
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9361,36 +9689,57 @@ msgstr ""
 "Foydalanish uchun bittasini tanlang.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Internetga ulanish"
 
-#: 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 "Moslash bajarildi, moslamalarni qo'llashni istaysizmi?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Tizim yuklanayotganda ulanishni istaysizmi?"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "Tizim yuklanayotganda ishga tushirish"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "Manually (the interface would still be activated at boot)"
 msgstr ""
-"Tarmoqni boshqadan ishga tushirish kerak. Uni boshqadan ishga tushirishni istaysizmi?"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1271
+#, fuzzy, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Tizim yuklanayotganda ulanishni istaysizmi?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
+msgstr ""
+"Tarmoqni boshqadan ishga tushirish kerak. Uni boshqadan ishga tushirishni "
+"istaysizmi?"
+
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Tarmoqni moslash"
 
-#: 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 ""
@@ -9398,27 +9747,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 "Internetga ulanishga urinib ko'rishni istaysizmi?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Aloqa sinab ko'rilmoqda..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Tizim Internetga ulangan."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr ""
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9427,24 +9776,25 @@ msgstr ""
 "Tizim Internetga ulanmaganga o'xshaydi.\n"
 "Aloqani boshqadan moslashga urinib ko'ring."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
 "Bu tugaganidan so'ng, kompyuterning nomi bilan bog'liq bo'lgan muammolarni "
-"oldini olish uchun X muhitingizni boshqadan ishga tushirishni biz tavsiya qilamiz."
+"oldini olish uchun X muhitingizni boshqadan ishga tushirishni biz tavsiya "
+"qilamiz."
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9453,10 +9803,11 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 "Tarmoqdan o'rnatayotganingiz uchun tarmoq allaqachon moslangan.\n"
-"Tarmoqni moslamalarini saqlab qolish uchun \"Ok\" tugmasini bosing, Internetga "
-"va tarmoqga ulanishni boshqadan moslash uchun \"Bekor qilish\" tugmasini bosing.\n"
+"Tarmoqni moslamalarini saqlab qolish uchun \"Ok\" tugmasini bosing, "
+"Internetga va tarmoqga ulanishni boshqadan moslash uchun \"Bekor qilish\" "
+"tugmasini bosing.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -9465,27 +9816,27 @@ msgstr ""
 "Kutilmagan xato ro'y berdi:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Proksilarni moslash"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP proksi"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP proksi"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Proksi \"http://...\" bo'lishi kerak"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL \"'ftp:\" yoki \"http:\" bilan boshlanishi shart"
@@ -9502,7 +9853,7 @@ msgid ""
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9519,34 +9870,34 @@ msgstr ""
 "\t\teth0 yoki eth1 kabel orqali ulanish uchun,\n"
 "\t\tippp+ ISDN orqali ulanish uchun.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Disketni qo'ying"
 
-#: 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 "
 "press %s"
 msgstr ""
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr ""
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "ulash muvaffaqiyatsiz tugadi: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: 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"
@@ -9554,22 +9905,22 @@ msgid ""
 "to the extended partitions."
 msgstr ""
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Fayldan (%s) qayta tiklash muvaffaqiyatsiz tugadi: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr ""
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Faylga (%s) yozishda xato"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9578,27 +9929,27 @@ msgid ""
 "data."
 msgstr ""
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "bo'lishi shart"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "muhim"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "juda yaxshi"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "yaxshi"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "balki"
@@ -9613,7 +9964,7 @@ msgstr "(%s'da)"
 msgid "(on this machine)"
 msgstr "(shu kompyuterda)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Boshqa kompyuterlarda moslangan"
@@ -9623,307 +9974,317 @@ msgstr "Boshqa kompyuterlarda moslangan"
 msgid "On CUPS server \"%s\""
 msgstr "CUPS serverida \"%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 " (Andoza)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Navbatga qo'ymasdan bosib chiqarish"
 
-#: 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 ""
 
-#: 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'ning yangi avlodi"
 
-#: 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 - Umumiy Yuniks Bosib chiqarish Tizimi"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Umumiy Yuniks Bosib chiqarish Tizimi (masofadagi server)"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "Masofadagi CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Noma'lum model"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Lokal printer"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Masofadagi printer"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Masofadagi CUPS serveridagi printer"
 
-#: 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 "Masofadagi LPD serveridagi printer"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Tarmoqdagi printer (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT serveridagi printer"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "NetWare serveridagi printer"
 
-#: 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 "Bosib chiqarish uskunasining URI'ni kiriting"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Vazifaning natijasini buyrug'ga ulash (pipe)"
 
-#: 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 "Noma'lum model"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Shu kompyuterda moslangan"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " #%s parallel portida"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB printer \\#%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr ", USB printer"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", \\#%s parallel portidagi ko'p amalli uskuna"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", parallel portidagi ko'p amalli uskuna"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", USB portidagi ko'p amalli uskuna"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirect'dagi ko'p amalli uskuna"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ", ko'p amalli uskuna"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", %s yordamida bosib chiqarilmoqda"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " LPD serverida \"%s\", printer \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP xost \"%s\", port %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " Novell serverida \"%s\", printer \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", %s buyrug'i yordamida"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Parallel porti #%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB printer \\#%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "USB printer"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Parallel portidagi (#%s) ko'p amalli uskuna"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Parallel portidagi ko'p amalli uskuna"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "USB portidagi ko'p amalli uskuna"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "HP JetDirect'dagi ko'p amalli uskuna"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Ko'p amalli uskuna"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "%s yordamida bosib chiqarilmoqda"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "LPD server \"%s\", printer \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "TCP/IP xost \"%s\", port %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/Windows serveri \"%s\", printer \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Novell serveri \"%s\", printer \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "%s buyrug'i yordamida"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Lokal tarmoq(lar)"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Interfeys \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Tarmoq %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Xostning nomi %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"
 msgstr ""
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "CUPS printerini moslash"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -9932,51 +10293,48 @@ msgstr ""
 "Bu erda, bu kompyuterga ulangan printerdan boshqa kompyuter va qaysi "
 "kompyuter foydalansa bo'ladimi-yo'qmi tanlashingiz mumkin."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
-msgstr "Boshqa kompyuterlar shu kompyuterdagi printerlardan foydalanishi mumkin"
+msgstr ""
+"Boshqa kompyuterlar shu kompyuterdagi printerlardan foydalanishi mumkin"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
-"Masofadagi kompyuterda mavjud bo'lgan printerlarni avtomatik ravishda aniqlash"
+"Masofadagi kompyuterda mavjud bo'lgan printerlarni avtomatik ravishda "
+"aniqlash"
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr ""
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Boshqacha moslash"
 
-#: 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 "Masofadagi kompyuter yo'q"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Qo'shimcha CUPS serverlar: "
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Yo'q"
-
-#: 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 "
@@ -9989,29 +10347,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Yapon matnlarini bosib chiqarish usuli"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "CUPS'ning moslamasini avtomatik ravishda to'g'rilash"
 
-#: 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 "
@@ -10028,12 +10386,38 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, fuzzy, c-format
+msgid "On"
+msgstr "Ummon"
+
+#: 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 ""
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -10042,61 +10426,61 @@ msgstr ""
 "Quyidagi kompyuterlar va tarmoqlar shu kompyuterga ulangan printer(lar)dan "
 "foydalanishi mumkin:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Xostni/tarmoqni qo'shish"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Tanlangan xostni/tarmoqni tuzatish"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Tanlangan xostni/tarmoqni olib tashlash"
 
-#: 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 "Xostning/tarmoqning IP raqami:"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Xostning/tarmoqning IP raqami aniqlanmagan."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Ko'rsatilgan xost/tarmoq no'to'g'ri.\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 "To'g'ri IP raqamlarning misoli:\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 "Bu xost/tarmoq allaqachon ro'yxatda, uni yana qo'shib bo'lmaydi.\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 ""
 
-#: 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 "
@@ -10104,104 +10488,121 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Serverni qo'shish"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Tanlangan serverni tuzatish"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Tanlangan serverni olib tashlash"
 
-#: 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 ""
 "Printerlaridan foydalanmoqchi bo'lgan kompyuterning IP raqamini va portini "
 "kiriting."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
-msgstr "Agar hech qanday port ko'rsatilmasa, andoza sifatida 631 qabul qilinadi."
+msgstr ""
+"Agar hech qanday port ko'rsatilmasa, andoza sifatida 631 qabul qilinadi."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "Serverning IP raqami aniqlanmagan!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Kiritilgan IP noto'g'ri.\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 "Portning raqami butun son bo'lishi shart!"
 
-#: 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 "Server allaqachon ro'yxatda, uni yana qo'shib bo'lmaydi.\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
+#, fuzzy, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "Masofadagi LPD serveridagi printer"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPS serverning nomi yoki IP raqami ko'rsatilmagan."
+
+#: 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 "Printer haqida ma'lumot o'qilmoqda..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "CUPS boshqadan ishga tushirilmoqda..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Printerga ulanishni tanlang"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Printer qaday ulangan?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -10212,7 +10613,7 @@ msgstr ""
 "Masofadagi CUPS serveridagi printerlarni moslashingiz shart emas, ular "
 "avtomatik ravishda aniqlanadi."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10220,28 +10621,28 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Tizim tekshirilmoqda..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "va bitta noma'lum printer"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "va %d noma'lum printer"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -10252,9 +10653,9 @@ msgstr ""
 "Quyidagi printerlar\n"
 "\n"
 "%s%s\n"
-"sistemangizga to'g'ridan-to'g'ri ulangan."
+"kompyuterga to'g'ridan-to'g'ri ulangan"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10262,12 +10663,12 @@ msgid ""
 "%s%s\n"
 "are directly connected to your system"
 msgstr ""
-"Quyidagi printerlar\n"
+"Quyidagi printer\n"
 "\n"
 "%s%s\n"
-"sistemangizga to'g'ridan-to'g'ri ulangan."
+"kompyuterga to'g'ridan-to'g'ri ulangan"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10278,9 +10679,9 @@ msgstr ""
 "Quyidagi printer\n"
 "\n"
 "%s%s\n"
-"sistemangizga to'g'ridan-to'g'ri ulangan."
+"kompyuterga to'g'ridan-to'g'ri ulangan"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -10289,7 +10690,7 @@ msgstr ""
 "\n"
 "Tizimga bitta noma'lum printer to'g'ridan-to'g'ri ulangan"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -10298,92 +10699,87 @@ msgstr ""
 "\n"
 "Tizimga %d noma'lum printer to'g'ridan-to'g'ri ulangan"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Sizning kompyuteringizga to'g'ridan-to'g'ri ulangan printer topilmadi"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
 " (Hamma printerlar ulanganligiga va yoqilganligiga ishonch hosil qiling).\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 "
 "printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
-"Bu kompyuterga bosib chiqarish imkoniyatini o'rnatishga ishonchingiz komilmi?\n"
+"Bu kompyuterga bosib chiqarish imkoniyatini o'rnatishga ishonchingiz "
+"komilmi?\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 "
 "additional software will be installed."
 msgstr ""
-"IZOH: Printerning modeliga va bosib chiqarish tizimiga bog'liq ravishda hajmi to "
-"%d Mb bo'lgan qo'shimcha dasturlar o'rnatiladi."
+"IZOH: Printerning modeliga va bosib chiqarish tizimiga bog'liq ravishda "
+"hajmi to %d Mb bo'lgan qo'shimcha dasturlar o'rnatiladi."
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Yangi printerlar qidirilmoqda..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "Printer moslanmoqda..."
+msgid "Found printer on %s..."
+msgstr "Printer \"%s\"da topildi..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Printer (\"%s\") moslanmoqda..."
-
-#: 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 " da "
 
-#: 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 "Printerning modelini tanlash"
 
-#: 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 "Sizning printeringizning modeli?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10396,7 +10792,7 @@ msgstr ""
 "Printerdrake %s printeringizning modelini aniqlolmadi. Iltimos, quyidagi "
 "ro'yxatdan to'g'ri keladigan modelni tanlang."
 
-#: 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 "
@@ -10405,21 +10801,24 @@ msgstr ""
 "Agar siznig printeringiz ro'yxatda bo'lmasa, unga mos keladigan (printerning "
 "ko'llanmasiga qarang) yoki unga o'xshash printerni tanlang."
 
-#: 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
+#, fuzzy, c-format
+msgid "Configuring printer on %s..."
+msgstr "Printer (\"%s\") moslanmoqda..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, c-format
-msgid "Configuring applications..."
-msgstr "Dasturlar moslanmoqda..."
+msgid "Configuring printer \"%s\"..."
+msgstr "Printer (\"%s\") moslanmoqda..."
 
-#: 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 "Yangi printerni qo'shish"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10433,7 +10832,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10457,24 +10856,25 @@ msgstr ""
 "\n"
 "Printerni o'rnatish yordamchisiga marhamat!\n"
 "\n"
-"Yordamchi shu kompyuterga ulangan yoki to'g'ridan-to'g'ri tarmoqqa yoki masofadagi "
-"Windows kompyuteriga ulangan printer(lar)ingizni o'rnatishda sizga yordam "
-"beradi.\n"
+"Yordamchi shu kompyuterga ulangan yoki to'g'ridan-to'g'ri tarmoqqa yoki "
+"masofadagi Windows kompyuteriga ulangan printer(lar)ingizni o'rnatishda "
+"sizga yordam beradi.\n"
 "\n"
 "Agar shu kompyuterga ulangan printer(lar)ingiz bo'lsa, uni/ularni avtomatik "
-"ravishda aniqlash uchun uni/ularni yoqilgan holatga keltiring. Tarmoqqa ulangan "
-"printer(lar)ingiz va Windows kompyuterlar ham yoqilgan holatda bo'lishi kerak.\n"
+"ravishda aniqlash uchun uni/ularni yoqilgan holatga keltiring. Tarmoqqa "
+"ulangan printer(lar)ingiz va Windows kompyuterlar ham yoqilgan holatda "
+"bo'lishi kerak.\n"
 "\n"
-"E'tibor bering, tarmoqqa ulangan printerlarni avtomatik ravishda aniqlash shu "
-"kompyuterga ulangan printerlarni aniqlashdan ko'ra ko'proq vaqtni oladi. Shuning "
-"uchun, agar bu sizga kerak bo'lmasa, tarmoqqa ulangan printerlarni va/yoki "
-"Windows kompyuteriga ulangan printerlarni avtomatik ravishda aniqlashni "
-"o'chiring.\n"
+"E'tibor bering, tarmoqqa ulangan printerlarni avtomatik ravishda aniqlash "
+"shu kompyuterga ulangan printerlarni aniqlashdan ko'ra ko'proq vaqtni oladi. "
+"Shuning uchun, agar bu sizga kerak bo'lmasa, tarmoqqa ulangan printerlarni "
+"va/yoki Windows kompyuteriga ulangan printerlarni avtomatik ravishda "
+"aniqlashni o'chiring.\n"
 "\n"
-" Tayyor bo'lganingizdan so'ng \"Keyingisi\"ni yoki printer(lar)ingizni o'rnatishni "
-"istamasangiz \"Bekor qilish\"ni bosing."
+" Tayyor bo'lganingizdan so'ng \"Keyingi\"ni yoki printer(lar)ingizni "
+"o'rnatishni istamasangiz \"Bekor qilish\"ni bosing."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10492,16 +10892,16 @@ msgstr ""
 "\n"
 "Printerni o'rnatish yordamchisiga marhamat!\n"
 "\n"
-"Yordamchi shu kompyuterga ulangan printer(lar)ingizni o'rnatishda sizga yordam "
-"beradi.\n"
+"Yordamchi shu kompyuterga ulangan printer(lar)ingizni o'rnatishda sizga "
+"yordam beradi.\n"
 "\n"
-"Shu kompyuterga ulangan printer(lar)ingizni avtomatik ravishda aniqlash uchun "
-"uni/ularni yoqilgan holatga keltiring.\n"
+"Shu kompyuterga ulangan printer(lar)ingizni avtomatik ravishda aniqlash "
+"uchun uni/ularni yoqilgan holatga keltiring.\n"
 "\n"
-" Tayyor bo'lganingizdan so'ng \"Keyingisi\"ni yoki printer(lar)ingizni o'rnatishni "
-"istamasangiz \"Bekor qilish\"ni bosing."
+" Tayyor bo'lganingizdan so'ng \"Keyingi\"ni yoki printer(lar)ingizni "
+"o'rnatishni istamasangiz \"Bekor qilish\"ni bosing."
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10524,22 +10924,22 @@ msgstr ""
 "\n"
 "Printerni o'rnatish yordamchisiga marhamat!\n"
 "\n"
-"Yordamchi shu kompyuterga yoki to'g'ridan-to'g'ri tarmoqqa ulangan printer(lar)"
-"ingizni o'rnatishda sizga yordam beradi.\n"
+"Yordamchi shu kompyuterga yoki to'g'ridan-to'g'ri tarmoqqa ulangan printer"
+"(lar)ingizni o'rnatishda sizga yordam beradi.\n"
 "\n"
 "Agar shu kompyuterga ulangan printer(lar)ingiz bo'lsa, uni/ularni avtomatik "
-"ravishda aniqlash uchun uni/ularni yoqilgan holatga keltiring. Tarmoqqa ulangan "
-"printer(lar)ingiz ham yoqilgan holatda bo'lishi kerak.\n"
+"ravishda aniqlash uchun uni/ularni yoqilgan holatga keltiring. Tarmoqqa "
+"ulangan printer(lar)ingiz ham yoqilgan holatda bo'lishi kerak.\n"
 "\n"
-"E'tibor bering, tarmoqqa ulangan printerlarni avtomatik ravishda aniqlash shu "
-"kompyuterga ulangan printerlarni aniqlashdan ko'ra ko'proq vaqtni oladi. Shuning "
-"uchun, agar bu sizga kerak bo'lmasa, tarmoqqa ulangan printerlarni avtomatik "
-"ravishda aniqlashni o'chiring.\n"
+"E'tibor bering, tarmoqqa ulangan printerlarni avtomatik ravishda aniqlash "
+"shu kompyuterga ulangan printerlarni aniqlashdan ko'ra ko'proq vaqtni oladi. "
+"Shuning uchun, agar bu sizga kerak bo'lmasa, tarmoqqa ulangan printerlarni "
+"avtomatik ravishda aniqlashni o'chiring.\n"
 "\n"
-" Tayyor bo'lganingizdan so'ng \"Keyingisi\"ni yoki printer(lar)ingizni o'rnatishni "
-"istamasangiz \"Bekor qilish\"ni bosing."
+" Tayyor bo'lganingizdan so'ng \"Keyingi\"ni yoki printer(lar)ingizni "
+"o'rnatishni istamasangiz \"Bekor qilish\"ni bosing."
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10557,33 +10957,33 @@ msgstr ""
 "\n"
 "Printerni o'rnatish yordamchisiga marhamat!\n"
 "\n"
-"Yordamchi shu kompyuterga ulangan printer(lar)ingizni o'rnatishda sizga yordam "
-"beradi.\n"
+"Yordamchi shu kompyuterga ulangan printer(lar)ingizni o'rnatishda sizga "
+"yordam beradi.\n"
 "\n"
 "Agar shu kompyuterga ulangan printer(lar)ingiz bo'lsa, uni/ularni avtomatik "
 "ravishda aniqlash uchun uni/ularni yoqilgan holatga keltiring.\n"
 "\n"
-" Tayyor bo'lganingizdan so'ng \"Keyingisi\"ni yoki printer(lar)ingizni o'rnatishni "
-"istamasangiz \"Bekor qilish\"ni bosing."
+" Tayyor bo'lganingizdan so'ng \"Keyingi\"ni yoki printer(lar)ingizni "
+"o'rnatishni istamasangiz \"Bekor qilish\"ni bosing."
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Bu kompyuterga ulangan printerlarni avtomatik ravishda aniqlash"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Lokal tarmoqqa ulangan printerlarni avtomatik ravishda aniqlash"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Microsoft Windows boshqarayotgan kompyuterlarga ulangan avto-aniqlangan "
 "printerlar"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -10597,70 +10997,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "%s paketlarini o'rnatib bo'lmadi!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Printerni avto-aniqlash"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Uskunalar aniqlanilmoqda..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", tarmoqdagi printer \"%s\", port %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", \"%s\" printer \"%s\" SMB/Windows serverida"
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "%s aniqlandi"
 
-#: 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 "\\#%s parallel portidagi printer"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Tarmoqdagi printer \"%s\", port %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "\"%s\" printer \"%s\" SMB/Windows serverida"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Lokal printer"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10669,32 +11069,32 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Uskunaning yoki faylning nomini kiritishingiz shart!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Hech qanday printer topilmadi!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Lokal printerlar"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Mavjud bo'lgan printerlar"
 
-#: 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 "Quyidagi printer avtomatik ravishda aniqlandi. "
 
-#: 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 "
@@ -10703,26 +11103,27 @@ msgstr ""
 "Agar bu siz moslamoqchi bo'lgan printer bo'lmasa, uskunaning/faylning nomini "
 "kiriting."
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Istasangiz, uskunaning/faylning nomini ko'rsatishingiz mumkin."
 
-#: 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 "Avto-aniqlangan printerlarning ro'yxati. "
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr ""
-"Siz o'rnatmoqchi bo'lgan printerning yoki uskunaning/faylning nomini kiriting."
+"Siz o'rnatmoqchi bo'lgan printerning yoki uskunaning/faylning nomini "
+"kiriting."
 
-#: 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 "
@@ -10731,7 +11132,7 @@ msgstr ""
 "Iltimos bosib chiqarish vazifalari jo'natiladigan printerni tanlang yoki "
 "uskunaning/faylning nomini kiriting."
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10739,12 +11140,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10753,12 +11154,12 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Iltimos bosib chiqarish vazifalari jo'natiladigan printerni tanlang."
 
-#: 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 "
@@ -10767,105 +11168,105 @@ msgstr ""
 "Iltimos printeringiz ulangan portni tanlang yoki uskunanig/faylning nomini "
 "kiriting."
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Iltimos printeringiz ulangan portni tanlang."
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
-" (Parallel portlar: /dev/lp0, /dev/lp1, ..., LPT1:, LPT2:, ... ga teng, 1-chi "
-"USB printer: /dev/usb/lp0, 2-chi USB printer: /dev/usb/lp1, ...)."
+" (Parallel portlar: /dev/lp0, /dev/lp1, ..., LPT1:, LPT2:, ... ga teng, 1-"
+"chi USB printer: /dev/usb/lp0, 2-chi USB printer: /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Printer yoki uskunani tanlashingiz yoki kiritishingiz shart!"
 
-#: 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 "To'xtatilmoqda"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Masofadagi LPD printerning parametrlari"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
-"Masofadagi LPD printeridan foydalanish uchun printer o'rnatilgan kompyuterning "
-"nomini va printerning nomini ko'rsatishingiz kerak."
+"Masofadagi LPD printeridan foydalanish uchun printer o'rnatilgan "
+"kompyuterning nomini va printerning nomini ko'rsatishingiz kerak."
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Masofadagi xostning nomi"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Masofadagi printerning nomi"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Masofadagi xostning nomi aniqlanmagan!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Masofadagi printerning nomi aniqlanmagan!"
 
-#: 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 "Ma'lumot"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Aniqlangan model: %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Tarmoq qidirilmoqda..."
 
-#: 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 ", \"%s\" printer \"%s\" serverda"
 
-#: 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 "\"%s\" printer \"%s\" serverda"
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printerning parametrlari"
 
-#: 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 "
@@ -10874,57 +11275,57 @@ msgid ""
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
-"Agar siz istagan printer avtomatik ravishda aniqlangan bo'lsa, uni ro'yxatdan "
-"tanlang va foydalanuvchini, maxfiy so'zni va kerak bo'lsa ishchi guruhni "
-"ko'rsating."
+"Agar siz istagan printer avtomatik ravishda aniqlangan bo'lsa, uni "
+"ro'yxatdan tanlang va foydalanuvchini, maxfiy so'zni va kerak bo'lsa ishchi "
+"guruhni ko'rsating."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "SMB serverning xosti"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB serverning IP raqami"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Ishchi guruh"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Avto-aniqlandi"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Serverning nomi yoki serverning IP raqami kiritilishi shart!"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "XAVFSIZLIK OGOHNOMASI!"
 
-#: 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 "
@@ -10948,7 +11349,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -10957,7 +11358,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -10966,12 +11367,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare printerning parametrlari"
 
-#: 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 "
@@ -10980,42 +11381,42 @@ msgid ""
 "name and password."
 msgstr ""
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Bosib chiqarish serveri"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Bosib chiqarish navbatining nomi"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP serverining nomi aniqlanmagan!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP navbatning nomi aniqlanmagan!"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", xost \"%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 "Xost \"%s\", port %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket printerning parametrlari"
 
-#: 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 "
@@ -11025,7 +11426,7 @@ msgstr ""
 "printerning xost nomini yoki IP raqamini va istasangiz port raqamini (andoza "
 "- 9100) kiriting."
 
-#: 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 "
@@ -11036,29 +11437,30 @@ msgstr ""
 "TCP yoki socket printerlari yordamida bosib chiqarish uchun printerning xost "
 "nomini yoki IP raqamini va istasangiz portning raqamini (andoza - 9100) "
 "kiritishingiz kerak. HP JetDirect serverlarda odatda portning raqami 9100, "
-"boshqa serverlarda boshqacha bo'lishi mumkin. Asbobingizning qo'llanmasiga qarang."
+"boshqa serverlarda boshqacha bo'lishi mumkin. Asbobingizning qo'llanmasiga "
+"qarang."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Kompyuterning nomi yoki IP raqami aniqlanmagan!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Kompyuterning nomi yoki IP raqami"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr ""
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "Printer uskunasining URI'i"
 
-#: 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 "
@@ -11066,36 +11468,36 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Haqiqiy URI kiritilishi kerak!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Buyrug'ga ulash"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
-"Vazifani printerga to'g'ridan-to'g'ri jo'natishni o'rniga uni istagan buyrug'ga ulash "
-"(pipe) mumkin. Bu erda o'sha buyrug'ni kiritishingiz mumkin."
+"Vazifani printerga to'g'ridan-to'g'ri jo'natishni o'rniga uni istagan "
+"buyrug'ga ulash (pipe) mumkin. Bu erda o'sha buyrug'ni kiritishingiz mumkin."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Buyruq"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Buyruq kiritishi kerak!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -11106,75 +11508,75 @@ msgstr ""
 "1100/1200/1220/3200/3300 skanner bilan, DeskJet 450, Sony IJP-V100), HP "
 "PhotoSmart yoki HP LaserJet 2200 ko'p amalli uskunami?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "HPOJ paketlari o'rnatilmoqda..."
 
-#: 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 "Uskuna tekshirilmoqda va HPOJ moslanmoqda..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANE paketlari o'rnatilmoqda..."
 
-#: 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 "mtools paketlari o'rnatilmoqda..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Printerning porti CUPS bilan ishlaydigan qilinmoqda..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Printer ma'lumot bazasi o'qilmoqda..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Printerning nomini va izohni kiriting"
 
-#: 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 ""
-"Printerning nomi faqat harf, son va tagidan chizish belgisidan iborat bo'lishi "
-"kerak"
+"Printerning nomi faqat harf, son va tagidan chizish belgisidan iborat "
+"bo'lishi kerak"
 
-#: 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"
@@ -11183,45 +11585,45 @@ msgstr ""
 "Printer \"%s\" allaqachon mavjud.\n"
 "Uning moslamalarini almashtirishni rostdan istaysizmi?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 "Har qanday printerning nomi bo'lishi shart (m-n \"printer\"). \"Ta'rifi\" va "
-"\"Manzili\" maydonlarni to'ldirish shart emas. Ular foydalanuvchilar uchun izoh "
-"sifatida ishlatiladi."
+"\"Manzili\" maydonlarni to'ldirish shart emas. Ular foydalanuvchilar uchun "
+"izoh sifatida ishlatiladi."
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Printerning nomi"
 
-#: 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 "Ta'rifi"
 
-#: 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 "Manzili"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Printer ma'lumot bazasi tayyorlanmoqda..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Sizning printeringizning modeli"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11236,18 +11638,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "To'g'ri model"
 
-#: 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 "Modelni o'zingiz tanlang"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11257,38 +11659,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11296,65 +11698,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr ""
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "Kompakt-disk"
-
-#: 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 "Disket"
 
-#: 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 "Boshqa joy"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "PPD-faylini tanlash"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPD-fayli o'rnatilmoqda..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI vin-printerni moslash"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11365,12 +11760,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark inkjet printerini moslash"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11379,7 +11774,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11392,12 +11787,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark X125 printerini moslash"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11406,12 +11801,31 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85G moslamasi"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Canon LBP-460/660 moslamasi"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11422,27 +11836,27 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Printerning andoza moslamalari"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Parametr %s butun son bo'lishi kerak!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Parametr %s son bo'lishi kerak!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Parametr %s chegaradan tashqarida!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -11451,12 +11865,12 @@ msgstr ""
 "Bu printerni (\"%s\") andoza deb\n"
 "belgilashni istaysizmi?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Sinov betlari"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11465,61 +11879,61 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 "Iltimos siz bosib chiqarmoqchi bo'lgan sinov betini tanlang.\n"
-"Izoh: surat sinov betini bosib chiqarish ancha uzoq vaqt davom etishi mumkin va "
-"juda kichik hotirali lazer printerlarda umuman chiqmashi mumkin. Ko'p hollarda, "
-"andoza sinov betini bosib chiqarish kifoya."
+"Izoh: surat sinov betini bosib chiqarish ancha uzoq vaqt davom etishi mumkin "
+"va juda kichik hotirali lazer printerlarda umuman chiqmashi mumkin. Ko'p "
+"hollarda, andoza sinov betini bosib chiqarish kifoya."
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Sinov beti yo'q"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Bosib chiqarish"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Andoza sinov beti"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Boshqa sinov beti (Xat)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Boshqa sinov beti (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Surat sinov beti"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Sinov betini bosib chiqarmash"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Sinov bet(lar) bosib chiqarilmoqda..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "%s paketini o'rnatib bo'lmadi!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11534,7 +11948,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11543,17 +11957,17 @@ msgstr ""
 "Sinov bet(lar) printerga jo'natildi.\n"
 "Printer ishini boshlaguncha biroz vaqt o'tishi mumkin.\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "To'g'ri ishladimi?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr ""
 
-#: 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 "
@@ -11562,7 +11976,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11570,8 +11984,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -11580,18 +11994,19 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
 "list shown below or click on the \"Print option list\" button.%s%s%s\n"
 "\n"
 msgstr ""
-"Joriy printer uchun mavjud bo'lgan parametrlarni bilish uchun quyidagi ro'yxatni "
-"o'qing yoki \"Parametrlar ro'yxatini ko'rsatish\" tugmasini bosing. %s%s%s\n"
+"Joriy printer uchun mavjud bo'lgan parametrlarni bilish uchun quyidagi "
+"ro'yxatni o'qing yoki \"Parametrlar ro'yxatini ko'rsatish\" tugmasini "
+"bosing. %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"
@@ -11600,15 +12015,15 @@ msgstr ""
 "Joriy printer uchun mavjud bo'lgan parametrlarning ro'yxati:\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 "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11616,7 +12031,7 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -11625,14 +12040,14 @@ msgstr ""
 "Joriy printer uchun mavjud bo'lgan parametrlarni bilish uchun \"Parametrlar "
 "ro'yxatini ko'rsatish\" tugmasini bosing."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11643,7 +12058,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -11652,42 +12067,32 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "\"%s\" yordamida bosib chiqarilmoqda/skan qilinmoqda"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Printer (%s) yordamida bosib chiqarilmoqda..."
 
-#: 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 "Yopish"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Parametrlar ro'yxatini ko'rsatish"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11698,10 +12103,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11715,18 +12122,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Printer haqida ma'lumot o'qilmoqda..."
-
-#: 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 "Printerning moslamalarini uzatish"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11736,14 +12138,14 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -11752,19 +12154,19 @@ msgstr ""
 "PDQ bilan faqat lokal printerlarni, masofadagi LPD printerlarni va Socket/"
 "TCP printerlarni ishlatib bo'ladi.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD va LPRng bilan IPP printerlarni ishlatib bo'lmaydi.\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -11775,7 +12177,7 @@ msgstr ""
 "Ishlab chiqaruvchining PPD-fayllari yoki CUPS'ning asl drayverlari bilan "
 "moslangan printerlarni ham uzatib bo'lmaydi."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -11786,17 +12188,17 @@ msgstr ""
 "Siz uzatmoqchi bo'lgan printerni belgilang va\n"
 "\"Uzatish\" tugmasini bosing."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Printerlarni uzatmash"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Uzatish"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11808,17 +12210,17 @@ msgstr ""
 "Printerning boshqa nomini kiritishingiz yoki uni o'tkazib jo'natishingiz ham "
 "mumkin."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Yangi printerning nomi"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s uzatilmoqda..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -11827,28 +12229,28 @@ msgstr ""
 "Siz oldingi andoza printerni (\"%s\") uzatdingiz. U yangi bosib chiqarish "
 "tizimi (\"%s\") uchun ham andoza printer bo'lsinmi?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Printer ma'lumoti yangilanmoqda..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Tarmoq ishga tushirilmoqda..."
 
-#: 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 "Tarmoqni moslash"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Tarmoq moslanmagan"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -11857,12 +12259,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Tarmoqni moslamay davom etish"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -11872,7 +12274,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -11880,27 +12282,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Bosib chiqarish sisemasi boshqadan ishga tushirilmoqda..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "yuqori"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "paranoid"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -11915,12 +12317,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr ""
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -11934,67 +12336,150 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "O'rnatilgan dasturlar tekshirilmoqda..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
-msgstr "\"%s\" olib tashlanmoqda..."
+msgid "Removing %s..."
+msgstr "%s olib tashlanmoqda..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "%s bosib chiqarish tizimini olib tashlab bo'lmadi!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
-msgstr "\"%s\" o'rnatilmoqda..."
+msgid "Installing %s..."
+msgstr "%s o'rnatilmoqda..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "%s bosib chiqarish tizimini o'rnatib bo'lmadi!"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Masofadagi serverning nomi yoki IP raqami:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Andoza printer o'rnatilmoqda..."
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Lokal CUPS bosib chiqarish tizimi yoki masofadagi CUPS serveri?"
+
+#: 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 "Lokal CUPS bosib chiqarish tizimi"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Printer spulerini tanlash"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Qaysi bosib chiqarish tizimini (spuler) ishlatmoqchisiz?"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Printerni (\"%s\") moslash muvaffaqiyatsiz tugadi!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomatic dasturi o'rnatilmoqda..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Kerak bo'lgan paketni o'rnatib bo'lmadi. %s'ni ishga tushirib bo'lmaydi!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -12005,197 +12490,161 @@ msgstr ""
 "andoza deb belgilash, yoki u haqida ma'lumotni ko'rish uchun uni ikki marta "
 "bosing."
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Mavjud bo'lgan masofadagi hamma CUPS printerlarni ko'rsatish"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
-"Printerlar ro'yxatini yangilash (masofadagi hamma CUPS printerlarni ko'rsatish "
-"uchun)"
+"Printerlar ro'yxatini yangilash (masofadagi hamma CUPS printerlarni "
+"ko'rsatish uchun)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS'ni moslash"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Bosib chiqarish tizimini o'zgartirish"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Oddiy usul"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Ekspert usuli"
 
-#: 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 "Printerning parametrlari"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Printerning moslamalarini o'zgartirish"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"Printer %s\n"
+"Printer %s%s\n"
 "Bu printerning nimasini o'zgartirishni istaysiz?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "Printer o'chirilgan"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Bajarish!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Printerga ulanishning turi"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Printerning nomi, ta'rifi, manzili"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Printerning ishlab chiqaruvchisi, modeli, drayveri"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Printerning ishlab chiqaruvchisi, modeli"
 
-#: 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 "Bu printerni andoza deb belgilash"
 
-#: 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 "Bu printerni Star Office/OpenOffice.org/GIMP dasturlariga qo'shish"
+msgid "Enable Printer"
+msgstr "Printerni yoqish"
 
-#: 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 "Bu printerni Star Office/OpenOffice.org/GIMP dasturlaridan olib tashlash"
+msgid "Disable Printer"
+msgstr "Printerni o'chirish"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Sinov betini bosib chiqarish"
 
-#: 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 "Printerdan foydalanishni o'rganish"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Printerni olib tashlash"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Eski printer (\"%s\") olib tashlanmoqda"
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP dasturlariga printer qo'shilmoqda"
-
-#: printer/printerdrake.pm:4493
+#: printer/printerdrake.pm:4781
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP dasturlariga \"%s\" printerni qo'shish "
-"muvaffaqiyatli tugadi."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP dasturlariga \"%s\" printerni qo'shish "
-"muvaffaqiyatsiz tugadi."
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Star Office/OpenOffice.org/GIMP dasturlaridan printer olib tashlanmoqda"
-
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP dasturlaridan \"%s\" printerni olib tashlash "
-"muvaffaqiyatli tugadi."
+msgid "Printer \"%s\" is now enabled."
+msgstr "Printer \"%s\" yoqildi."
 
-#: printer/printerdrake.pm:4499
+#: printer/printerdrake.pm:4786
 #, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Star Office/OpenOffice.org/GIMP dasturlaridan \"%s\" printerni olib tashlash "
-"muvaffaqiyatsiz tugadi."
+msgid "Printer \"%s\" is now disabled."
+msgstr "Printer \"%s\" o'chirildi."
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Rostdan printerni (\"%s\") olib tashlashni istaysizmi?"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Printer (\"%s\") olib tashlanmoqda"
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Andoza printer"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Printer (\"%s\") andoza deb belgilandi."
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr ""
-
-#: raid.pm:139
+#: raid.pm:36
 #, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr ""
-"mkraid buyrug'i muvaffaqiyatsiz tugadi (balki raidtools dasturi etishmayapti?)."
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid buyrug'i muvaffaqiyatsiz tugadi."
 
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "RAID'ni %d chi darajasi uchun diskning etarli qismlari mavjud emas\n"
@@ -12220,16 +12669,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, c-format
 msgid "Scannerdrake"
 msgstr "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 ""
@@ -12259,7 +12708,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr "Avto-kirishga ruxsat etish/etmash."
 
-#: 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"
@@ -12269,22 +12719,22 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Konsol orqali kompyuterni o'chirib-yoqishga ruxsat etish/etmash."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Root masofadan kirishiga ruxsat etish/etmash."
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Root to'g'ridan-to'g'ri kirishiga ruxsat etish/etmash."
 
-#: 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 "
@@ -12293,7 +12743,16 @@ msgstr ""
 "Tizimning foydalanuvchilar ro'yxatini displey boshqaruvchilar (KDM va GDM) "
 "ko'rsatishga ruxsat etish/etmas."
 
-#: 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"
@@ -12305,14 +12764,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12328,7 +12788,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12341,7 +12801,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12350,80 +12810,85 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Xavfsizlik xabarnomasi:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Foydalanuvchilarni tasdiqlash uchun maxfiy so'zdan foydalanish."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr " Kundalik xavfsizlik tekshiruvini yoqish/o'chirish."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -12432,20 +12897,20 @@ msgstr ""
 "Maxfiy so'zning eng qisqa uzunligini, undagi sonlarning va bosh harflarning "
 "eng kichik sonini aniqlash."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr ""
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "agar \"ha\" bo'lsa, ochiq portlarni tekshirish"
 
-#: 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"
@@ -12454,104 +12919,106 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "agar \"ha\" bo'lsa, kundalik xavfsizlik tekshirishlarini bajarish"
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
-msgstr "agar \"ha\" bo'lsa, /etc/shadow faylidagi bo'sh maxfiy so'zlarni tekshirish"
+msgstr ""
+"agar \"ha\" bo'lsa, /etc/shadow faylidagi bo'sh maxfiy so'zlarni tekshirish"
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "agar \"ha\" bo'lsa, chkrootkit tekshiruvini bajarish"
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "agar \"ha\" bo'lsa, tekshiruv natijasini xat orqali jo'natish"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
-"Konsoldan kiritilgan buyruqlar tarixining hajmini aniqlash. -1 cheksizga teng."
+"Konsoldan kiritilgan buyruqlar tarixining hajmini aniqlash. -1 cheksizga "
+"teng."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr ""
@@ -12595,215 +13062,222 @@ msgstr "root'ning to'g'ridan-to'g'ri kirishi"
 #, c-format
 msgid "List users on display managers (kdm and gdm)"
 msgstr ""
-"Foydalanuvchilarning ro'yxatini displey boshqaruvchilarda (KDM va GDM) ko'rsatish"
+"Foydalanuvchilarning ro'yxatini displey boshqaruvchilarda (KDM va GDM) "
+"ko'rsatish"
 
 #: 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 "X Windows ulanishlarga ruxsat etish"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr ""
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr ""
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
-#: 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 ""
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr ""
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Foydalanuvchilarni tasdiqlash uchun maxfiy so'zdan foydalanish"
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Kundalik xavfsizlik tekshiruvi"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr ""
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr ""
 
-#: 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 "Maxfiy so'z tarixining uzunligi"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
-"Maxfiy so'zning eng qisqa uzunligi, undagi sonlarning va bosh harflarning soni"
+"Maxfiy so'zning eng qisqa uzunligi, undagi sonlarning va bosh harflarning "
+"soni"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr ""
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Konsolda bajarilgan buyruqlar tarixining hajmi"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Konsol uchun taymaut"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr ""
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Ochiq portlarni tekshirish"
 
-#: 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 ""
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Kundalik xavfsizlik tekshirishlarini bajarish"
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Bo'sh maxfiy so'zni /etc/shadow faylida tekshirish"
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "suid/sgid fayllarning checksum'ini tekshirish"
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "chkrootkit tekshiruvlarini bajarish"
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Tekshiruv natijasini elektron xat orqali jo'natish"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -12854,8 +13328,8 @@ msgid ""
 "This is the standard security recommended for a computer that will be used "
 "to connect to the Internet as a client."
 msgstr ""
-"Bu Internet tarmog'ida klient sifatida ishlatiladigan kompyuter uchun tavsiya "
-"etilgan xavfsizlikning andoza darajasi."
+"Bu Internet tarmog'ida klient sifatida ishlatiladigan kompyuter uchun "
+"tavsiya etilgan xavfsizlikning andoza darajasi."
 
 #: security/level.pm:46
 #, c-format
@@ -12863,8 +13337,8 @@ msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
 msgstr ""
-"Tizimda allaqachon ba'zi cheklashlar mavjud va har kuni avtomatik tekshiruvlar "
-"bajariladi."
+"Tizimda allaqachon ba'zi cheklashlar mavjud va har kuni avtomatik "
+"tekshiruvlar bajariladi."
 
 #: security/level.pm:47
 #, c-format
@@ -12876,11 +13350,11 @@ msgid ""
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
 msgstr ""
-"Xavfsizlikning bu darajasida sistemani server sifatida ishlatish mumkin.\n"
+"Xavfsizlikning bu darajasida tizimni server sifatida ishlatish mumkin.\n"
 "Tizimni bir qancha klientlar bilan aloqa o'rnata oladigan server sifatida "
-"ishlatish uchun xavfsizlik darajasi etarlicha yoqori.\n"
-"Izoh: agar kompyuteringizni Internet tarmog'ida klient sifatida ishlatsangiz, "
-"pastrog' darajani tanlang."
+"ishlatish uchun xavfsizlik darajasi etarlicha yuqori.\n"
+"Izoh: agar kompyuteringizni Internet tarmog'ida klient sifatida "
+"ishlatsangiz, pastroq darajani tanlang."
 
 #: security/level.pm:50
 #, c-format
@@ -12888,7 +13362,7 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Bu daraja oldingi darajaga o'xshaydi, ammo sistema umuman yopiq va xavfsizlik\n"
+"Bu daraja oldingi darajaga o'xshaydi, ammo tizim umuman yopiq va xavfsizlik\n"
 "parametrlari eng yuqori qiymatlarga ega."
 
 #: security/level.pm:55
@@ -12925,7 +13399,8 @@ msgstr "Xavfsizlik boshqaruvchi (foydalanuvchi yoki elektron pochtasi)"
 #: services.pm:19
 #, c-format
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "ALSA (Advanced Linux Sound Architecture) tovush tizimini ishga tushirish"
+msgstr ""
+"ALSA (Advanced Linux Sound Architecture) tovush tizimini ishga tushirish"
 
 #: services.pm:20
 #, c-format
@@ -13084,7 +13559,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 
 #: services.pm:66
@@ -13157,7 +13632,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 
 #: services.pm:87
@@ -13179,8 +13654,9 @@ msgstr "USB uskunalaringiz uchun drayverlarni yuklash."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "X shrift serverini (XFree'ni ishga tushirish uchun kerak) ishga tushiradi."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr ""
+"X shrift serverini (Xorg'ni ishga tushirish uchun kerak) ishga tushiradi."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -13224,8 +13700,8 @@ msgstr "to'xtatilgan"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
-msgstr "Xizmatlar va demonlar"
+msgid "Services and daemons"
+msgstr "Xizmat va demonlar"
 
 #: services.pm:221
 #, c-format
@@ -13236,7 +13712,7 @@ msgstr ""
 "Uzr, bu xizmat haqida\n"
 "qo'shimcha ma'lumot yo'q."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Ma'lumot"
@@ -13251,752 +13727,1208 @@ msgstr "Talab qilinganda ishga tushirish"
 msgid "On boot"
 msgstr "Tizim yuklanayotganda"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Ishga tushirish"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "To'xtatish"
 
-#: 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>Mandrakelinux tizimini tanlaganingiz bilan tabriklaymiz!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Mandrakelinux nima?</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 "Open Source olamiga marhamat!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "<b>Mandrakelinux</b> tizimiga marhamat!"
 
-#: 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 ""
-"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari MandrakeSoft "
-"tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan ish "
-"natijasidir."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgstr ""
+
+#: 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 "<b>Open Source</b> olamiga marhamat!"
+
+#: share/advertising/02.pl:17
+#, fuzzy, c-format
+msgid ""
+"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 ""
+"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari Mandrakesoft "
+"tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan "
+"ish natijasidir."
+
+#: 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 ""
 "Ushbu mahsulotni ishlab chiqarishda o'z hissasini qo'shgan barchaga biz o'z "
-"minnatdorchiligimizni bildiramiz."
+"<b>minnatdorchiligimizni</b> bildiramiz."
 
-#: 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>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 ""
 
-#: 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."
+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 ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:19
 #, c-format
-msgid "<b>The KDE Choice</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 ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Birlashmaga qo'shiling</b>"
+
+#: 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 ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/04.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "<b>Download</b> versiya"
+
+#: 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 ""
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Internetda sayr qiling</b>"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
+
+#: share/advertising/06.pl:13
+#, c-format
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/06.pl:15
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/06.pl:17
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+
+#: share/advertising/07.pl:13
+#, c-format
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:15
 #, c-format
-msgid "You can also:"
-msgstr "Hamda:"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:17
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Internetda sayr qilishingiz mumkin"
+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:17
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- chat"
-msgstr "\t- Internet orqali suhbat qilishingiz mumkin"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- video konferentsiya tashkil qilishingiz mumkin"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- o'zingizni veb-saytingizni yaratishingiz mumkin"
+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-06.pl:20
+#: share/advertising/09.pl:13
 #, c-format
-msgid "\t- ..."
-msgstr "\t- va hokazo"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakesoft mahsulotlari</b>"
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:15
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
 msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:17
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Audio kompakt-disklarni <b>KsCD</b> bilan tinglang."
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:18
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "<b>Totem</b> bilan musiqa tinglang va video tomosha qiling."
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:19
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
 msgstr ""
-"Rasm va suratlarni <b>GIMP</b> va <b>GQview</b> bilan tomosha qiling va "
-"tahrirlang!"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:20
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrake boshqaruv markazi</b>"
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/10.pl:13
 #, c-format
-msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
 msgstr ""
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:15
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:17
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:13
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "<b>MandrakeClub</b> a'zosi bo'ling!"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:16
 #, c-format
-msgid "\t- Full access to commercial applications"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Mandrakelinux tizimiga qaysi dasturlarni qo'shish uchun ovoz berish"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid "<b>The KDE Choice</b>"
 msgstr ""
 
-#: 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"
+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 "Ko'proq ma'lumot uchun <b>www.mandrakeclub.com</b> saytiga qarang."
+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 "Sizga yordam kerakmi?"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
+msgstr ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> - texnik yordam uchun asosiy manba."
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b>Sizga mos kelgan grafik ish stolini tanlang</b>"
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:15
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Agar Linux'ga doir savollaringiz bo'lsa, <b>www.mandrakeexpert.com</b> sayti "
-"orqali MandrakeExpert'ga yoziling."
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Mandrakelinux birlashmasiga qo'shiling!</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
-"Agar siz ham o'z hissangizni qo'shmoqchi bo'lsangiz, iltimos elektron maktub "
-"orqali \"Cooker\" muhokamalarga <b>mandrake-linux.com/cooker</b> sayti "
-"orqali qo'shiling"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "<b>OpenOffice.org</b>"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr ""
+
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Bizning birlashma haqida ko'proq ma'lumot uchun <b>www.mandrake-linux.com</b> "
-"saytiga qarang!"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/14.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinux nima?</b>"
+msgid ""
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
+msgstr ""
+
+#: share/advertising/15.pl:13
+#, c-format
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Internetda sayr qiling</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr ""
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* <b>Konqueror</b> yordamida Internetda sayr qiling"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr ""
+"\t* <b>Kopete</b> yordamida o'rtoqlaringiz bilan Internet orqali gaplashing"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* <b>KBear</b> yordamida Internetdan fayllarni yozib oling"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t* va hokazo"
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr ""
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/17.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr ""
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Rasm va suratlarni <b>GIMP</b> bilan tahrirlang"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
+msgstr ""
+"Mandrakelinux menyusidan <b>barcha vazifalar</b> uchun <b>qulay dasturlarni</"
+"b> topsa bo'ladi:"
+
+#: share/advertising/18.pl:16
+#, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
+"\t* Hujjatlaringizni <b>OpenOffice.org</b> yordamida yarating va tahrirlang"
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
+msgstr ""
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
 msgstr ""
+"\t* <b>Mozilla</b> va <b>Konqueror</b> yordamida internetda sayr qiling"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* Onlayn suxbatda <b>Kopete</b> yordamida qatnashing"
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
+"\t* <b>Audio kompakt-disk</b> va <b>audio fayllarni</b> tinglang, "
+"<b>videoni</b> tomosha qiling"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* <b>GIMP</b> yordamida rasm yarating va tahrirlang"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/19.pl:13
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "<b>Development Environments</b>"
+msgstr "<b>Tuzish vositalari</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 ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
+
+#: share/advertising/20.pl:13
+#, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Tuzish uchun tahrirchilar</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
+
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
+"\t* <b>Vim</b>: Andoza Vi tahrirchiga qaraganda ko'proq imkoniyatlarga ega "
+"kengaytirilgan matn tahrirchi"
+
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Dasturlash tillari</b>"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
+msgstr ""
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr ""
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: 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 "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>MandrakeClub a'zosi bo'ling!</b>"
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:20
+#, fuzzy, c-format
+msgid "\t* Scripting languages:"
+msgstr "Bosib chiqarish boshqaruvchisi"
+
+#: 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 "<b>Do you require assistance?</b>"
-msgstr "<b>Sizga yordam kerakmi?</b>"
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Izoh</b>"
+msgid "\t* And many more."
+msgstr "\t* Va boshqalar"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/22.pl:13
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "Bu Mandrakelinux <b>Download</b> versiyasi."
+msgid "<b>Development Tools</b>"
+msgstr "<b>Tuzish vositalari</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, fuzzy, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Serverlar</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
+msgstr ""
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Elektron maktublarni jo'natish va qabul qilish"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
 msgstr ""
-"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari MandrakeSoft "
-"tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan ish "
-"natijasidir."
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/23.pl:18
 #, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr ""
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "<b>Serverlar</b>"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
+"\t* <b>Samba</b>: Microsoft® Windows® klientlari uchun fayl va bosib "
+"chiqarish xizmatlari"
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:17
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>Grafik ish stolingizni tanlang!</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: Eng keng ishlatiladigan veb-server"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
+"\t* <b>MySQL</b> va <b>PostgreSQL</b>: Dunyodagi eng ommabop Open Source "
+"ma'lumot bazasi"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"Mandrakelinux menyusida barcha vazifalar uchun qulay dasturlarni topsa bo'ladi:"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
-"\t- Hujjatlaringizni <b>OpenOffice.org</b> yordamida yarating va tahrirlang"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/25.pl:13
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> va <b>Konqueror</b> yordamida internetda sayr qiling"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux boshqaruv markazi</b>"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Onlayn suxbatda <b>Kopete</b> yordamida qatnashing"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
+msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:17
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
-"\t- Audio kompakt-disk va audio fayllarni <b>KsCD</b> va <b>Totem</b> bilan "
-"tinglang"
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Rasm va suratlarni <b>GIMP</b> bilan tahrirlang"
+msgid "<b>The Open Source Model</b>"
+msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/27.pl:13
+#, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>Internet do'kon</b>"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"\t- <b>Vim</b>: Andoza Vi tahrirchiga qaraganda ko'proq imkoniyatlarga ega "
-"kengaytirilgan matn tahrirchi"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:18
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
-#, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Elektron maktublarni jo'natish va qabul qilish"
+#: share/advertising/28.pl:20
+#, fuzzy, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Onlayn suxbatda <b>Kopete</b> yordamida qatnashing"
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:21
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:13
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Manzillar daftari (server va klient)"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:17
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- <b>Samba</b>: MS-Windows klientlari uchun fayl va bosib chiqarish xizmatlari"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: Eng keng ishlatiladigan veb-serveri"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:19
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: Dunyodagi eng ommabop Open Source ma'lumot bazasi"
+msgid ""
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:20
 #, c-format
-msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:13
+#, c-format
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
+
+#: share/advertising/30.pl:15
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Va boshqalar"
+msgid ""
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
+msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
-"Mandrakelinux operatsion tizimi va uning ko'plab dasturlari MandrakeSoft "
-"tuzuvchilari va butun olam bo'ylab hissa qo'shuvchilar hamkorlikda bajargan ish "
-"natijasidir."
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
-"Oxirgi versiyani ishlab chiqishda qatnashgan barchaga o'z minnatdorchiligimizni "
-"bildiramiz"
 
-#: share/advertising/pwp-02.pl:13
+#: share/compssUsers.pl:25
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "Office Workstation"
+msgstr "Idora stantsiyasi"
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:27
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"Idora uchun dasturlar: matn protsessorlari (OpenOffice.org Writer, Kword), "
+"elektron jadvallar (OpenOffice.org Calc, Kspread), PDF ko'ruvchilar va hokazo"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"Mandrakelinux menyusida barcha vazifalar uchun qulay dasturlarni topsa bo'ladi:"
+"Idora uchun dasturlar: matn protsessorlari (kword, abiword), elektron "
+"jadvallar (kspread, gnumeric), PDF ko'ruvchilar va hokazo"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "O'yin stantsiyasi"
+
+#: share/compssUsers.pl:34
+#, c-format
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Ovunchoq dasturlar: arkada, stol o'yinlari, strategiya va hokazo"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimedia stantsiyasi"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Audio va videoni o'ynash/tahrirlash uchun dasturlar"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internet stantsiyasi"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Xat-xabar, yangiliklarni o'qish va jo'natish (mutt, tin..) va Internetda "
+"sayr qilish uchun vositalar to'plami"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Tarmoqdagi kompyuter (klient)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Turli protokollar, shu jumlada SSH, uchun klientlar"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Moslash"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Kompyuterni moslashni engilashtirish uchun vositalar"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Konsol vositalari"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Tahrirchilar, konsollar, fayl vositalari, terminallar"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Qo'llanmalar"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux va erkin dasturlar haqida kitoblar va Howto'lar"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- <b>Mozilla</b> va <b>Konqueror</b> yordamida internetda sayr qiling"
+msgid "LSB"
+msgstr "LSB"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "Linux Standard Base. Third party applications support"
 msgstr ""
-"\t- Audio kompakt-disk va audio fayllarni <b>KsCD</b> va <b>Totem</b> bilan "
-"tinglang"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:85
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Tuzish vositalari</b>"
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Guruh"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolab serveri"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Fayervol/Ruter"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet geytveyi"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "Xat-xabar/Yangiliklar"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix xat-xabar serveri, Inn yangiliklar serveri"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "Direktoriya serveri"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTP serveri"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "DNS serveri"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Bosib chiqarish serveri"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFS serveri, Samba serveri"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Ma'lumot bazasi"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL va MySQL ma'lumot bazasi"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "Xat-xabar"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfix xat-xabar serveri"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL yoki MySQL ma'lumot bazasi"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Tarmoqdagi kompyuter (server)"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS serveri, SMB serveri, Proxy serveri, SSH serveri"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE stantsiyasi"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
-msgstr ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - vositalar to'plami bilan birga asosiy grafik muhit"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:151
 #, c-format
-msgid "And of course the editors!"
-msgstr "Va albatta tahrirchilar!"
+msgid "GNOME Workstation"
+msgstr "GNOME stantsiyasi"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
 msgstr ""
+"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
+"grafik muhit"
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:155
 #, c-format
-msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+msgid "Other Graphical Desktops"
+msgstr "Boshqa grafik ish stollari"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, va hokazo"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "Vositalar"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH serveri"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Terminal serverini moslash"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Tarmoq vositalari/Nazorat qilish"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
-"\t- <b>Vim</b>: Andoza Vi tahrirchiga qaraganda ko'proq imkoniyatlarga ega "
-"kengaytirilgan matn tahrirchi"
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft yordamchilari"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "Serverni moslash uchun yordamchilar"
 
 #: standalone.pm:21
 #, c-format
@@ -14049,8 +14981,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14073,7 +15005,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"
@@ -14086,7 +15018,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14156,7 +15088,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -14167,106 +15099,101 @@ msgstr ""
 "Foydalanish: %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 "Iltimos bu erdan chiqing va Ctrl-Alt-BackSpace tugmalarni bosing"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "O'zgarishlar to'liq qo'llanilishi uchun sistemaga boshqadan kirishingiz kerak"
+msgstr ""
+"O'zgarishlar to'liq qo'llanilishi uchun tizimga boshqadan kirishingiz kerak"
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Terminal serverisiz foydasiz"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s foydalanuvchini talab qiladi...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s kompyuterning nomini talab qiladi...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "Ok"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Terminal serverini moslash"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Serverni yoqish"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Serverni o'chirish"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Serverni ishga tushirish"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Serverni to'xtatish"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Foydalanuvchilarni qo'shish/o'chirish"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Klientlarni qo'shish/o'chirish"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Dastlabki kirish yordamchisi"
 
-#: 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"
@@ -14283,22 +15210,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 "Yordamchini bekor qilish"
 
-#: 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 ""
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14307,45 +15234,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Bu bir necha minut davom etadi."
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Tayyor!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr ""
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14361,7 +15288,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14381,7 +15308,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14392,14 +15319,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"
@@ -14420,7 +15347,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14438,7 +15365,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14449,7 +15376,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14460,7 +15387,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14480,7 +15407,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14490,7 +15417,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"
@@ -14510,13 +15437,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -14528,62 +15455,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Tizimni yuklash disketi"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
-msgstr "PXE tasvir"
+msgstr "PXE rasm"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Andoza kernelning versiyasi"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Hech qanday kernel tanlanmagan!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Hech qanday NIC tanlangani yo'q!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- O'chirish"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Hamma NBI'larni o'chirish"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14591,174 +15518,174 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Foydalanuvchini qo'shish -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Foydalanuvchini o'chirish"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "turi: %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr ""
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr ""
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr ""
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Klientni qo'shish -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "turi: fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr ""
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr ""
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr ""
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Klientni tuzatish"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Klientni o'chirish"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd'ni moslash"
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
-"O'zgarishlarni qo'llash uchun oynalar boshqaruvchisi boshqadan ishga tushirilishi "
-"kerak.\n"
+"O'zgarishlarni qo'llash uchun oynalar boshqaruvchisi boshqadan ishga "
+"tushirilishi kerak.\n"
 "(service dm restart - konsolda)"
 
-#: 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 ""
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Tarmoq maskasi:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Ruterlar:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr ""
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Nom serverlari:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP chegarasining boshi:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "IP chegarasining oxiri:"
 
-#: 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 "Moslamani yozish"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd serverini moslash"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14766,108 +15693,103 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Iltimos disketni qo'ying:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Disketni endi olishingiz mumkin"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Disket uskunasi mavjud emas!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
-msgstr "PXE tasviri: %s/%s"
+msgstr "PXE rasmi: %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "%s/%s yozishda xato"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO tasviri: %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Avvalo /etc/dhcpd.conf faylini yaratish kerak!"
 
-#: 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 foydalanuvchi emas\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s allaqachon terminal server foydalanuvchisi\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s terminal serveriga qo'shildi\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "%s o'chirildi\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s topilmadi...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s'dan allaqachon foydalanilmoqda\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 va /etc/hosts.deny fayllari allaqachon moslangan - "
 "o'zgartirilmadi"
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
-msgstr "Moslama o'zgardi. clusternfs/dhcpd xizmati boshqadan ishga tushirilsinmi?"
+msgstr ""
+"Moslama o'zgardi. clusternfs/dhcpd xizmati boshqadan ishga tushirilsinmi?"
 
 #: standalone/drakautoinst:38
 #, c-format
@@ -14949,10 +15871,11 @@ msgstr ""
 "\n"
 "Marhamat.\n"
 "\n"
-"Avtomatik ravishda o'rnatishning parametrlari chap tarafdagi bo'limlarda mavjud"
+"Avtomatik ravishda o'rnatishning parametrlari chap tarafdagi bo'limlarda "
+"mavjud"
 
-#: 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 "Tabriklaymiz!"
@@ -14991,66 +15914,61 @@ msgstr "qattiq disk"
 msgid "tape"
 msgstr "magnit tasma"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Hech qanday uskuna topilmadi"
-
-#: 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 "Bu sistema uchun maxfiy so'zni DrakBackup moslamasida saqlash."
+msgstr "Bu tizim uchun maxfiy so'zni DrakBackup moslamasida saqlash."
 
-#: 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 "
 "original 'base' backup."
 msgstr ""
 
-#: 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 "
@@ -15058,7 +15976,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 "
@@ -15066,56 +15984,56 @@ 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 ""
 
-#: 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\" na haqiqiy elektron pochta na mavjud lokal foydalanuvchi!"
 
-#: 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 ""
 
-#: 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 "Foydalanuvchilarning eski ro'yxati:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Foydalanuvchilarning eski ro'yxati\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -15124,14 +16042,14 @@ msgstr ""
 "\n"
 "                      DrakBackup hisoboti \n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -15144,13 +16062,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 ""
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15159,42 +16077,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Kalitlarni yaratish bir oz vaqtni olishi mumkin."
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr ""
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr ""
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s'ni %s'da topib bo'lmadi."
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s javob bermayapti"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15205,84 +16123,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Uskunada CDR/DVDR yo'q!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Yozish mumkin bo'lgan ma'lumot tashuvchiga o'xshamaydi!"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "O'chirib bo'lmaydigan ma'lumot tashuvchi!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "%s'da magnit tasma yo'q!"
 
-#: 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 ""
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr ""
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr ""
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr ""
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr ""
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15290,7 +16208,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15298,7 +16216,7 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -15306,12 +16224,12 @@ msgstr ""
 "Faylni FTP orqali jo'natishda xato ro'y berdi. Iltimos FTP moslamalaringizni "
 "to'g'rilang."
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTP orqali jo'natilgan fayllarning ro'yxati: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15319,7 +16237,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15327,22 +16245,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Xatni jo'natishda xato ro'y berdi. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Katalogni yaratib bo'lmadi!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -15351,41 +16269,41 @@ msgstr ""
 "\n"
 "Sizga kerak bo'lgan parametrlarni tekshiring.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -15394,177 +16312,177 @@ msgstr ""
 "Bu parametr orqali /etc direktoriyangizning istagan versiyasini\n"
 "tiklashingiz mumkin."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr ""
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Bauzerning keshini kiritmash"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Fayllarni yoki direktoriyalarni tanlang va \"Ok\" tugmasini bosing"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Tanlanganni olib tashlash"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Foydalanuvchilar"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr ""
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Tarmoq usuli:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Uzatish"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
 msgstr "Kompyuterning nomi  yoki IP raqami"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "Foydalanuvchi"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Bu maxfiy so'zni eslab qolish"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Kompyuterning nomi, foydalanuvchi va maxfiy so'z kerak!"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Kompakt-disk/DVD uskunasini tanlang (Mb)"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Kompakt-disk/DVD'ning hajmini tanlang"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Ko'p seansli kompakt-disk"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr ""
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " Darhol o'chirish "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr ""
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM uskuna"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Kompakt-disk uskunasi aniqlanmagan!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr ""
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr ""
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr ""
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr ""
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Saqlash uchun direktoriyani kiriting:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Saqlash uchun direktoriya"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -15573,314 +16491,314 @@ msgstr ""
 "Drakbackup uchun ajratilgan\n"
 " yuqori chegarani kiriting (Mb)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "Kompakt-disk / DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Qatiq disk / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "har soat"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "har kun"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "har hafta"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "har oy"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "boshqa"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Yanvar"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Fevral"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Mart"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Aprel"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "May"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Iyun"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Iyul"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Avgust"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Sentyabr"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Oktyabr"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Noyabr"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Dekabr"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Yakshanba"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Dushanba"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Seshanba"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Chorshanba"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Payshanba"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Juma"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Shanba"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Demondan foydalanish"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr ""
 
-#: 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 "Soat"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Kun"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Oy"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Havta kuni"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr ""
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr ""
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr ""
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Xat-xabar uchun SMTP serveri:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Nima"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Qaerda"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Qachon"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Qo'shimcha parametrlar"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr ""
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup moslamasi"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr ""
 
-#: 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 "Tarmoq orqali"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "Kompakt-diskga"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "Magnit tasma uskunasiga"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr " (andoza: hamma foydalanuvchilar)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr ""
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr ""
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr ""
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -15889,7 +16807,7 @@ msgstr ""
 "\n"
 "- Tizimning fayllari:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -15898,7 +16816,7 @@ msgstr ""
 "\n"
 "- Foydalanuvchining fayllari:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -15907,36 +16825,26 @@ msgstr ""
 "\n"
 "- Boshqa fayllar:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "Yo'q"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "HA"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -15945,22 +16853,22 @@ msgstr ""
 "\n"
 "- Kompakt-diskga yozish"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " Uskunaga: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr " (ko'p seansli)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -15969,12 +16877,17 @@ msgstr ""
 "\n"
 "- %s uskunadagi magnit tasmaga saqlash"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tO'chirish=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -15983,7 +16896,7 @@ msgstr ""
 "\n"
 "- %s orqali %s xostida saqlash\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -15992,7 +16905,7 @@ msgstr ""
 "\t\t foydalanuvchi: %s\n"
 "\t\t direktoriya: %s\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -16001,89 +16914,89 @@ msgstr ""
 "\n"
 "- Parametrlar:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tTizimning fayllarini kiritmash\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr ""
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr ""
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\t%s'ga xat jo'natish\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\t %s SMTP serveri yordamida\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Qattiq disk.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-Kompakt-disk.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Magnit tasma \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Tarmoq FTP orqali.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Tarmoq SSH orqali.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Tarmoq rsync orqali.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Tarmoq webdav orqali.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -16092,27 +17005,27 @@ msgstr ""
 "Tiklash uchun ma'lumotlar ro'yxati:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Tizimning fayllarini tiklash:\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Foydalanuvchining fayllarini tiklash:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Boshqa fayllarni tiklash:\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -16121,141 +17034,141 @@ msgstr ""
 "Buzuq ma'lumotning ro'yxati:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr ""
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          %s da muvaffaqiyatli tiklandi          "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Moslamani tiklash         "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Ok - boshqa fayllarni tiklash uchun"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Iltimos tiklash uchun sanani tanlang:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Qattiq diskdan tiklash."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr ""
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Tiklash uchun boshqa ma'lumot tashuvchini tanlang"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Boshqa ma'lumot tashuvchisi"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Tizimni tiklash"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Foydalanuvchilarni tiklash"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Boshqani tiklash"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Tiklash uchun yo'lni tanlang (/ o'rniga)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr ""
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Tiklashdan oldin foydalanuvchilarning direktoriyalarini o'chirish."
 
-#: 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 ""
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Tanlanganni tiklash"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -16264,320 +17177,325 @@ msgstr ""
 "Tanlangan fayllarni\n"
 "tiklash"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Kompakt-diskdan tiklash"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Magnit tasmasidan tiklash"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Tarmoq orqali tiklash"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Quyidagi tarmoq protokoli orqali tiklash: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Kompyuterning nomi"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Xostga yo'l yoki modul"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Maxfiy so'z kerak"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Foydalanuvchining nomi kerak"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Xostning homi kerak"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Yo'l yoki modul kerak"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Fayllar tiklandi"
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Tiklash muvaffaqiyatsiz tugadi"
 
-#: 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 "Tiklash uchun fayllarni qidirish"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr ""
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Katalogdan tiklash"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr ""
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "%s to'g'ri yo'lligini tekshiring"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "Kompakt-diskni joyiga qo'ying - davom eting."
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr ""
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr ""
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Saqlash"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr ""
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Tiklash"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Quyidagi paketlarni o'rnatish kerak:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Iltimos tiklash uchun ma'lumotni tanlang..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr ""
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr ""
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr ""
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Fayllar FTP orqali jo'natilmoqda"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Fayllar jo'natilmoqda..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr ""
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr ""
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Moslash yordamchisi"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Qo'shimcha moslamalar"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Moslamani ko'rish"
 
-#: 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 ""
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: 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 ""
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Tizimning usuli"
 
-#: 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 "/_Fayl"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fayl/Chi_qish"
 
-#: 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>Ch"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Mavzularni o'rnatish"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Yangi mavzuni yaratish"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "Uni moslashni istaysizmi?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Mavzu"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -16586,147 +17504,131 @@ msgstr ""
 "Mavzularni\n"
 "konsolda ko'rsatish"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Tizim yuklanayotganda grafik muhitini ishga tushirish"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
-msgstr "Yo'q, avtomatik ravishda sistemaga kirishni istamayman"
+msgstr "Yo'q, tizimga avtomatik ravishda kirishni istamayman"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Ha, avtomatik ravishda sistemaga kirishni istayman"
+msgstr "Ha, tizimga avtomatik ravishda kirishni istayman"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Andoza foydalanuvchi"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Andoza ish stoli"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s'ni o'rnatish muvaffaqiyatsiz tugadi. Quyidagi xato ro'y berdi:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake uchun xato haqida xabar qiluvchi vosita"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinux uchun xato haqida xabar qiluvchi vosita"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake boshqaruv markazi"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux boshqaruv markazi"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Tenglashtirish asbobi"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "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 "Masofadan boshqarish"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Dasturlar boshqaruvchisi"
 
-#: 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 ""
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Moslash yordamchilari"
 
-#: 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 "Dastur:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Paket: "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Kernel:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr ""
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -16735,163 +17637,182 @@ msgstr ""
 "Dasturning nomi\n"
 "yoki to'liq yo'l:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Paketni qidirish"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Hisobot: "
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
+msgid "Bug Description/System Information"
 msgstr ""
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
+msgid "YOUR TEXT HERE"
 msgstr ""
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, c-format
 msgid "Submit kernel version"
 msgstr ""
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr ""
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Xabar berish"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "O'rnatilmagan"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Paket o'rnatilmagan"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "TOPILMADI"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "%s bilan aloqa o'rnatilmoqda..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Hech qanday brauzer mavjud emas! Iltimos birortasini o'rnating"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Iltimos paketning nomini kiriting."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Iltimos hisobotni kiriting."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "aniqlanmagan"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Vaqt zonasini o'zgartirish"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Vaqt zonasi - 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 ""
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Server:"
 
-#: 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 "Tiklash"
 
-#: 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 ""
+"Tarmoq Vaqt Protokolini yoqish\n"
+"uchun ntp paketini o'rnatish kerak\n"
+"\n"
+"Uni o'rnatishni istaysizmi?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Tarmoqning moslamasi (%d adapter)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Geytvey:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interfeys:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Iltimos kutib turing"
@@ -16901,12 +17822,8 @@ msgstr "Iltimos kutib turing"
 msgid "Interface"
 msgstr "Interfeys"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Drayver"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Holati"
@@ -16921,7 +17838,7 @@ msgstr "Kompyuterning nomi: "
 msgid "Configure hostname..."
 msgstr "Kompyuterning nomini moslash"
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Lokal tarmoqni moslash"
@@ -16931,8 +17848,8 @@ msgstr "Lokal tarmoqni moslash"
 msgid "Configure Local Area Network..."
 msgstr "Lokal tarmoqni moslash"
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Qo'llash"
@@ -16942,107 +17859,113 @@ msgstr "Qo'llash"
 msgid "Manage connections"
 msgstr "Aloqalarni boshqarish"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Uskuna tanlangan"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "IP moslamasi"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "DNS serverlari"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr ""
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "statik"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
+msgstr "Metrik"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr ""
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr ""
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Modem uchun taymaut"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr ""
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr ""
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Modem tovushi"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Yoqish"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "O'chirish"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Ma'lumot tashuvchining sinfi"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Modulning nomi"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Mac raqami"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: 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 "
@@ -17051,20 +17974,20 @@ msgstr ""
 "Tizimda tarmoq adapteri aniqlanmadi. Iltimos asbob-uskunani moslovchi "
 "vositani ishga tushiring."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Tarmoq interfeysini olib tashlash"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Olib tashlash uchun tarmoq interfeysini tanlang:"
 
-#: 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 ""
@@ -17072,70 +17995,70 @@ 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 "Tabriklaymiz. \"%s\" tarmoq interfeysi muvaffaqiyatli olib tashlandi."
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Yo'q"
+msgid "No IP"
+msgstr "IP raqami ko'rsatilmagan"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Maskasiz"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "ishlayapti"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "ishlamayapti"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Ulangan"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Ulanmagan"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Uzish..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Ulanish..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "O'chirish"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Yoqish"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -17144,79 +18067,103 @@ msgstr ""
 "Sizda moslangan interfeys yo'q.\n"
 "Avvalo, ularni \"Moslash\"ni bosib moslang."
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Lokal tarmoqni moslash"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr ""
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Tizim yuklanganda ishga tushirilgan"
 
-#: 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 ""
 "Bu interfeys hali moslangani yo'q.\n"
-"Mandrake boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini ishga tushiring."
+"Mandrakelinux boshqaruv markazidan \"Interfeysni qo'shish\" yordamchini "
+"ishga tushiring"
 
-#. -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 ""
+"Internet bilan aloqa moslanmagan.\n"
+"Mandrakelinux boshqaruv markazidan \"Yangi aloqa\" yordamchini ishga "
+"tushiring"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internetga ulanishni moslash"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Uchinchi DNS serveri (tanlab bo'ladi)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internetga ulanishni moslash"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Internetga ulanish"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Ulanishning turi: "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Holati:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (X Display Manager)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Displey boshqaruvchisini tanlash"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -17224,114 +18171,123 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
+#, c-format
+msgid "The change is done, do you want to restart the dm service?"
+msgstr ""
+"O'zgarishlar qo'llandi, dm xizmatini boshqadan ishga tushirishni istaysizmi?"
+
+#: standalone/drakedm:80
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
-msgstr "O'zgarishlar qo'llandi, dm xizmatini boshqadan ishga tushirishni istaysizmi?"
+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:40
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Tizimni yuklash diskini yaratish"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Umumiy"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Uskuna"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Kernelning versiyasi"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Moslash"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Qo'shimcha moslamalar"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Hajmi"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Mkinitrd uchun boshqa argumentlar"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "majburiy"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "RAID modullarsiz"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "agar kerak bo'lsa"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "SCSI modullarsiz"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Modulni qo'shish"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Modulni olib tashlash"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "%s uskunasida ma'lumot tashuvchi borligiga ishonch hosil qiling"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr ""
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Disketni yaratish bajarildi"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Tizimni yukash disketi muvaffaqiyatli bajarildi.\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"
@@ -17347,7 +18303,7 @@ msgstr "O'rnatilgan shriftlarni qidirish"
 #: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
-msgstr "O'rnatilgan shriftlarni belgilashni bekor qilish"
+msgstr "O'rnatilgan shriftlarni tanlashni bekor qilish"
 
 #: standalone/drakfont:208
 #, c-format
@@ -17466,7 +18422,7 @@ msgstr "Shriftlarning ro'yxati"
 msgid "About"
 msgstr "Haqida"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "O'chirish"
@@ -17476,10 +18432,11 @@ msgstr "O'chirish"
 msgid "Import"
 msgstr "Import qilish"
 
-#: 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"
@@ -17489,7 +18446,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17509,7 +18466,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17527,12 +18484,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr ""
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17542,123 +18499,129 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "Andoza printerlar"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
-msgstr "Shrift faylini yoki direktoriyani tanlang va \"Qo'shish\" tugmasini bosing"
+msgstr ""
+"Shrift faylini yoki direktoriyani tanlang va \"Qo'shish\" tugmasini bosing"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
-msgstr "Fayl tanlash"
+msgstr "Faylni tanlash"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Siz hech qanday shriftni tanlamadingiz"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Shriftlarni import qilish"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Shriftlarni o'rnatish"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "agar ishonchingiz komil bo'lsa, bu erni bosing."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "bu erga, agar \"yo'q\" bo'lsa."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Hech qaysini tanlamash"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Hammasini tanlash"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Ro'yxatni olib tashlash"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Shriftlar import qilinmoqda"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Boshlang'ich sinovlar"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Tizimga shriftlardan nusxa ko'chirish"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Shriftlarni o'rnatish va aylantirish"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "O'rnatishdan keyin amallar"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Tizimdan shriftlarni olib tashlash"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr ""
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
+msgid "Sorry, we support only 2.4 and above kernels."
 msgstr ""
 
 #: standalone/drakgw:125
 #, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr ""
+
+#: standalone/drakgw:126
+#, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -17666,39 +18629,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "yoqish"
 
-#: 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 "Boshqadan moslash"
 
-#: 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 "voz kechish"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Serverlar yoqilmoqda..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr ""
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17707,22 +18670,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "o'chirish"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Serverlar o'chirilmoqda..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr ""
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17736,27 +18699,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interfeys %s (%s moduli ishlatilmoqda)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interfeys %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Tizimda tarmoq adapteri mavjud emas!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Tarmoqning interfeysi"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17771,19 +18734,24 @@ msgstr ""
 "\n"
 "Men shu adapter bilan lokal tarmog'ingizni o'rnataman."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Tarmoq interfeysini tanlash"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Iltimos lokal tarmog'ingizga ulanadigan tarmoq adapterini tanlang."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Tarmoq interfeysi allaqachon moslangan"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17793,27 +18761,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Avtomatik ravishda boshqadan moslash"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Yo'q (faqat ekspertlar uchun)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Joriy interfeysning moslamasini ko'rsatish"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Joriy interfeysni moslash"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17824,7 +18792,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17840,12 +18808,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Lokal tarmoqning manzili"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17855,76 +18823,78 @@ msgid ""
 msgstr ""
 "DHCP serverni moslash.\n"
 "\n"
-"Bu erda DHCP serverini moslash uchun turli parametrlarni tanlashingiz mumkin.\n"
+"Bu erda DHCP serverini moslash uchun turli parametrlarni tanlashingiz "
+"mumkin.\n"
 "Agar biror parametrning ma'nosini bilmasangiz, uni shunday qoldiring."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Bu) DHCP serverning IP raqami"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS serverining IP raqami"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr ""
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP'ning pastgi chegarasi"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP'ning yuqori chegarasi"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Interfeysni va DHCP serverini boshqadan moslash"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Moslanmoqda..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
-"Skriptlar moslanmoqda, dasturlar o'rnatilmoqda, serverlar ishga tushirilmoqda..."
+"Skriptlar moslanmoqda, dasturlar o'rnatilmoqda, serverlar ishga "
+"tushirilmoqda..."
 
-#: 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 "Paketni (%s) o'rnatishda muammolar paydo bo'ldi"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -17937,14 +18907,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"
 "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 "\n"
 "Foydalanish:\n"
@@ -17967,14 +18937,19 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux yordam markazi"
+
+#: 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 "
@@ -17983,42 +18958,42 @@ msgstr ""
 "Tizimda hech qanday brauzer o'rnatilmagan. Agar yordam tizimini ko'rmoqchi "
 "bo'lsangiz, iltimos birortasini o'rnating"
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Tizim moslamalari"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Qo'shimcha moslamalar"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
-msgstr "Qo'shimcha va sistema moslamalari"
+msgstr "Qo'shimcha va tizim moslamalari"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Tahrirlab bo'ladi"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Yo'l"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Foydalanuvchi"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Guruh"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Huquqlar"
@@ -18076,9 +19051,9 @@ msgid "Delete selected rule"
 msgstr "Belgilangan qoidani o'chirish"
 
 #. -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 "Tahrirlash"
@@ -18088,101 +19063,120 @@ msgstr "Tahrirlash"
 msgid "Edit current rule"
 msgstr "Joriy qoidani tuzatish"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "o'tish"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "foydalanuvchi"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "guruh"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "boshqa"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "O'qish"
 
-#: 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 "Faylni o'qish uchun \"%s\"ni yoqing"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Yozish"
 
-#: 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 "Faylga yozish uchun \"%s\"ni yoqing"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Bajarish"
 
-#: 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 "Faylni bajarish uchun \"%s\"ni yoqing"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Yopishqoq bit"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
 "Direktoriyalar uchun ishlatiladi:\n"
-" uni faqat direktoriyaning egasi yoki shu direktoriyadagi fayl o'chirishi mumkin"
+" uni faqat direktoriyaning egasi yoki shu direktoriyadagi fayl o'chirishi "
+"mumkin"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "UID'ni o'rnatish"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "GID'ni o'rnatish"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr ""
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
-msgstr "Foydalanuvchi :"
+msgid "User:"
+msgstr "Foydalanuvchi:"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
-msgstr "Guruh :"
+msgid "Group:"
+msgstr "Guruh:"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Joriy foydalanuvchi"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Belgilansa, egasi va gurh o'zgartirilmaydi"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Yo'lni tanlash"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Egalik"
@@ -18262,7 +19256,7 @@ msgstr ""
 #: standalone/drakpxe:196
 #, c-format
 msgid "No image found"
-msgstr "Tasvir topilmadi"
+msgstr "Rasm topilmadi"
 
 #: standalone/drakpxe:197
 #, c-format
@@ -18289,54 +19283,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "auto_install.cfg fayli joylashgan joy"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "HAMMASI"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOKAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "andoza"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "e'tibor bermash"
-
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "yo'q"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, c-format
-msgid "yes"
-msgstr "ha"
+msgid "Ignore"
+msgstr "E'tibor bermash"
 
-#. -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 "
@@ -18371,59 +19353,56 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Maydonlarning ta'rifi:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(andoza qiymati: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Xavfsizlik darajasi:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Xavfsizlik xabarnomasi:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Xavfsizlik boshqaruvchisi:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Asosiy parametrlar"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Tarmoqning parametrlari"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Tizimning parametrlari"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Davriy tekshiruvlar"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Iltimos kutib turing, xavfsizlik darajasi o'rnatilmoqda"
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Iltimos kutib turing, xavfsizlik darajasi o'rnatilmoqda..."
@@ -18433,7 +19412,8 @@ msgstr "Iltimos kutib turing, xavfsizlik darajasi o'rnatilmoqda..."
 msgid "No Sound Card detected!"
 msgstr "Tovush kartasi topilmadi!"
 
-#: 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-"
@@ -18446,7 +19426,7 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -18459,8 +19439,8 @@ msgstr ""
 "\n"
 "\n"
 "Izoh: agar sizda ISA PnP tovush kartasi bo'lsa, alsaconf yoki sndconfig "
-"dasturini ishlatishingiz kerak bo'ladi. Konsolda \"alsaconf\" yoki \"sndconfig\" "
-"buyrug'ini bajaring xolos."
+"dasturini ishlatishingiz kerak bo'ladi. Konsolda \"alsaconf\" yoki "
+"\"sndconfig\" buyrug'ini bajaring xolos."
 
 #: standalone/draksplash:21
 #, c-format
@@ -18469,8 +19449,8 @@ msgid ""
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
 "o'rnatishni tugatish uchun \"ImageMagick\" paketi kerak.\n"
-"\"ImageMagick\" paketini o'rnatish uchun \"Ok\"ni yoki chiqish uchun \"Bekor qilish"
-"\"ni bosing."
+"\"ImageMagick\" paketini o'rnatish uchun \"Ok\"ni yoki chiqish uchun \"Bekor "
+"qilish\"ni bosing."
 
 #: standalone/draksplash:68
 #, c-format
@@ -18485,7 +19465,7 @@ msgstr ""
 #: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
-msgstr "tasvir faylini tanlash"
+msgstr "rasm faylini tanlash"
 
 #: standalone/draksplash:73
 #, c-format
@@ -18500,7 +19480,7 @@ msgstr "Tanlash"
 #: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
-msgstr "Bootsplash tasvirini moslash"
+msgstr "Bootsplash rasmini moslash"
 
 #: standalone/draksplash:96
 #, c-format
@@ -18586,204 +19566,214 @@ msgstr "Konsolda belgini ko'rsatish"
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Bildirishnoma"
 
-#: 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 "Bu mavzu uchun %s'da hali bootsplash yo'q!"
 
 #: standalone/draksplash:167
 #, c-format
 msgid "choose image"
-msgstr "Tasvirni tanlash"
+msgstr "Rasmni tanlash"
 
 #: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "Bootsplash mavzusi saqlanmoqda..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Bajarish ko'rsatgichining rangini tanlash"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
-msgstr "Avvalo tasvir faylini tanlashingiz shart!"
+msgstr "Avvalo rasm faylini tanlashingiz shart!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
-msgstr "Oldindan ko'rib chiqish yaratilmoqda..."
+msgid "Generating preview..."
+msgstr "Ko'rib chiqish uchun ma'lumot yaratilmoqda..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s BootSplash'ni (%s) ko'rib chiqish"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "UPS uskunasini qo'shish"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Avto-aniqlash"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Aniqlash ketayapti"
 
-#: 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 "Tabriklaymiz!"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Hech qanday UPS uskuna topilmadi"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "UPS drayverini moslash"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Iltimos UPS modelini tanlang."
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Ishlab chiqaruvchi / model:"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Nomi:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "UPS nomi"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Port:"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
 msgstr "UPS ulangan port"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "UPS uskunalar"
 
-#: 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 "Nomi"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "UPS foydalanuvchilari"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr ""
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr ""
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Qoidalar"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Amal"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Daraja"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "ACL nomi"
 
-#: 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 "UPS uskunasini moslash vositasiga marhamat"
@@ -18805,7 +19795,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:105
@@ -18830,7 +19820,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:135
@@ -18888,7 +19878,7 @@ msgstr "Kernelning moduli."
 #: 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"
@@ -18913,13 +19903,13 @@ msgstr "Moslama fayli"
 #: 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
@@ -18942,12 +19932,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
@@ -18990,7 +19980,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"
@@ -19017,8 +20007,8 @@ msgstr ""
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
-msgstr ""
+msgid "Exists!"
+msgstr "Mavjud"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -19221,7 +20211,7 @@ msgstr ""
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Tahrirlab bo'lmaydi!"
 
 #: standalone/drakvpn:591
@@ -19229,10 +20219,10 @@ msgstr "Tahrirlab bo'lmaydi!"
 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
@@ -19268,7 +20258,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 ""
@@ -19293,7 +20283,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"
@@ -19321,7 +20311,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"
@@ -19362,23 +20352,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 ""
@@ -19485,7 +20475,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"
@@ -19513,7 +20503,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"
@@ -19538,7 +20528,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"
@@ -19566,7 +20556,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19586,7 +20576,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 ""
 
@@ -19600,11 +20590,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"
@@ -19626,18 +20616,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"
@@ -19677,7 +20667,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]"
@@ -19802,7 +20792,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"
@@ -19811,7 +20801,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"
@@ -19820,7 +20810,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 ""
@@ -19840,9 +20830,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 ""
@@ -19939,6 +20929,11 @@ msgstr ""
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "andoza"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr ""
 
@@ -19947,67 +20942,67 @@ msgstr ""
 msgid "unique"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
-msgstr "AQSH (kabel)"
+msgstr "AQSh (kabel)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Kanada (kabel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Yaponiya (kabel)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "G'arbiy Oyropa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Sharqiy Oyropa"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Frantsiya [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Yangi Zelandiya"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Avstraliya kabel TV Optus"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
@@ -20016,47 +21011,48 @@ msgstr ""
 "Iltimos\n"
 "davlatingizni va TV formatingizni kiriting"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "TV formati:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr ""
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr ""
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Kuningiz maroqli o'tsin!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr ""
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "TV karta topilmadi!"
 
-#: 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-"
@@ -20069,46 +21065,23 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Boshqa drayverlar"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "Tovush kartasi uchun boshqa drayverlarning ro'yxati"
 
-#: standalone/harddrake2:22
-#, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Kanal"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI kanal"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr ""
@@ -20130,130 +21103,279 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Keshning hajmi"
+msgid "Drive capacity"
+msgstr "Uskunaning hajmi"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "protsessor keshining (ikkinchi daraja) hajmi"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr ""
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Uskunaning hajmi"
+msgid "this field describes the device"
+msgstr "bu maydon uskunani ta'riflaydi"
 
-#: 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 "Uskunaning eski fayli"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
 msgstr ""
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
-msgid "Coma bug"
-msgstr "Vergul xatosi"
+msgid "New devfs device"
+msgstr "Yangi devfs uskunasi"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
-#: standalone/harddrake2:38
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
 #, c-format
-msgid "Cpuid family"
-msgstr "Cpuid oilasi"
+msgid "Module"
+msgstr "Modul"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "protsessorning oilasi (m-n: i686 sinfi uchun 6)"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "Cpuid level"
-msgstr "Cpuid' ning darajasi"
+msgid "Extended partitions"
+msgstr "Diskning kengaytirilgan qismlari"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:42
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr ""
+msgid "the number of extended partitions"
+msgstr "diskning kengaytirilgan qismlar soni"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid "Frequency (MHz)"
-msgstr "Chastota (MGts)"
+msgid "Geometry"
+msgstr "Geometriya"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:43
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
-msgid "this field describes the device"
-msgstr "bu maydon uskunani ta'riflaydi"
+msgid "Disk controller"
+msgstr "Disk kontrolleri"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:44
 #, c-format
-msgid "Old device file"
-msgstr "Uskunaning eski fayli"
+msgid "the disk controller on the host side"
+msgstr ""
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:45
 #, c-format
-msgid "old static device name used in dev package"
-msgstr ""
+msgid "class of hardware device"
+msgstr "asbob-uskunanig sinfi"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, c-format
-msgid "New devfs device"
-msgstr "Yangi devfs uskunasi"
+msgid "Model"
+msgstr "Model"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:46
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr ""
+msgid "hard disk model"
+msgstr "qattiq diskning modeli"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "tarmoqdagi printerning porti"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
 #: standalone/harddrake2:48
 #, c-format
-msgid "Module"
-msgstr "Modul"
+msgid "Primary partitions"
+msgstr "Diskning asosiy qismlari"
 
 #: standalone/harddrake2:48
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr ""
+msgid "the number of the primary partitions"
+msgstr "diskning asosiy qismlar soni"
 
 #: standalone/harddrake2:49
 #, c-format
-msgid "Extended partitions"
-msgstr "Diskning kengaytirilgan qismlari"
+msgid "the vendor name of the device"
+msgstr "Uskunani ishlab chiqargan firmaning nomi"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:50
 #, c-format
-msgid "the number of extended partitions"
-msgstr "diskning kengaytirilgan qismlar soni"
+msgid "Bus PCI #"
+msgstr ""
 
 #: standalone/harddrake2:50
 #, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr ""
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCI uskuna #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCI uskunaning raqami"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr ""
+
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "Ulanishning nomi"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "Ishlab chiqaruvchi"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "Device ID"
+msgstr "Uskuna: "
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "Uskunani ishlab chiqargan firmaning nomi"
+
+#: 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
+#, fuzzy, c-format
+msgid "Sub device ID"
+msgstr "UPS uskunalar"
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "Uskunani ishlab chiqargan firmaning nomi"
+
+#: standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Device USB ID"
+msgstr "Uskuna: "
+
+#: 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 ""
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Keshning hajmi"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "protsessor keshining (ikkinchi daraja) hajmi"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Vergul xatosi"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuid oilasi"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "protsessorning oilasi (m-n: i686 sinfi uchun 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuid' ning darajasi"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Chastota (MGts)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+
+#: standalone/harddrake2:69
+#, c-format
 msgid "Flags"
 msgstr "Bayroqlar"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Fdiv xatosi"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -20261,236 +21383,292 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU mavjudmi"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "F00f xatosi"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:75
 #, c-format
-msgid "Geometry"
-msgstr "Geometriya"
+msgid "Halt bug"
+msgstr "Halt xatosi"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:76
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
 msgstr ""
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:77
 #, c-format
-msgid "Halt bug"
-msgstr "Halt xatosi"
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "protsessorning avlodi (m-n: Pentium III uchun 8,...)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "Modelning nomi"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "protsessor ishlab chiqaruvchining rasmiy nomi"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "protsessorning nomi"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "Protsessorning ID-si"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "protsessorlar soni"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr ""
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr ""
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "Protsessorni ishlab chiqargan firmaning nomi"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "Yozishdan himoyalash"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
+"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 ""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "Disketning formati"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr ""
+msgid "Channel"
+msgstr "Kanal"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "asbob-uskunanig sinfi"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI kanal"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "Model"
+msgid "Disk identifier"
+msgstr ""
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
 #, c-format
-msgid "hard disk model"
-msgstr "qattiq diskning modeli"
+msgid "usually the disk serial number"
+msgstr ""
 
-#: standalone/harddrake2:64
-#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "protsessorning avlodi (m-n: PentiumIII uchun 8,...)"
+#: standalone/harddrake2:94
+#, fuzzy, c-format
+msgid "Logical unit number"
+msgstr "Lokal printer"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
 #, c-format
-msgid "Model name"
-msgstr "Modelning nomi"
+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:65
+#: standalone/harddrake2:99
 #, c-format
-msgid "official vendor name of the cpu"
-msgstr "protsessor ishlab chiqaruvchining rasmiy nomi"
+msgid "Device file"
+msgstr "Uskunaning fayli"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
 #, c-format
-msgid "Number of buttons"
-msgstr "Tugmalar soni"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
 #, c-format
-msgid "the number of buttons the mouse has"
-msgstr "sichqonchadagi tugmalar soni"
+msgid "Emulated wheel"
+msgstr ""
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
 #, c-format
-msgid "the name of the CPU"
-msgstr "protsessorning nomi"
+msgid "whether the wheel is emulated or not"
+msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
 #, c-format
-msgid "network printer port"
-msgstr "tarmoqdagi printerning porti"
+msgid "the type of the mouse"
+msgstr "sichqonchaning turi"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
 #, c-format
-msgid "Processor ID"
-msgstr "Protsessorning ID-si"
+msgid "the name of the mouse"
+msgstr "sichqonchaning nomi"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
 #, c-format
-msgid "the number of the processor"
-msgstr "protsessorlar soni"
+msgid "Number of buttons"
+msgstr "Tugmalar soni"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:103
 #, c-format
-msgid "Primary partitions"
-msgstr "Diskning asosiy qismlari"
+msgid "the number of buttons the mouse has"
+msgstr "sichqonchadagi tugmalar soni"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:104
 #, c-format
-msgid "the number of the primary partitions"
-msgstr "diskning asosiy qismlar soni"
+msgid "the type of bus on which the mouse is connected"
+msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "Model stepping"
+msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
 #, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
+msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, fuzzy, c-format
+msgid "Identification"
+msgstr "tasdiqlash"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr ""
+msgid "Connection"
+msgstr "Ulanish"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:122
 #, c-format
-msgid "the vendor name of the device"
-msgstr "Uskunani ishlab chiqargan firmaning nomi"
+msgid "Performances"
+msgstr "Unumdorlik"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:123
 #, c-format
-msgid "the vendor name of the processor"
-msgstr "Protsessorni ishlab chiqargan firmaning nomi"
+msgid "Bugs"
+msgstr "Xatolar"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
 #, c-format
-msgid "Write protection"
-msgstr "Yozishdan himoyalash"
+msgid "FPU"
+msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:132
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
+msgid "Partitions"
+msgstr "Diskning qismlari"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Parametrlar"
 
-#: 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 "/_Yordam"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Printerlarni _avto-aniqlash"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/_Modemlarni avto-aniqlash"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_Jaz uskunalarini avto-aniqlash"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/Chi_qish"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Maydonlar ta'rifi"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrake yordam"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Maydonlarning ta'rifi:\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 "
@@ -20499,68 +21677,75 @@ msgstr ""
 "Uskunani tanlasangiz, o'ng tarafdagi \"Ma'lumot\" freymida u haqida "
 "ma'lumotni ko'rishingiz mumkin"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Xato haqida xabar qilish"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Haqida"
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Harddrake haqida"
 
 #. -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 ""
-"HardDrake - Mandrake uchun asbob-uskunalarni moslovchi vosita.\n"
+"HardDrake - Mandrakelinux uchun asbob-uskunalarni moslovchi vosita.\n"
 "<span foreground=\"royalblue3\">Versiya:</span> %s\n"
 "<span foreground=\"royalblue3\">Muallif:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 - versiya %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Aniqlangan asbob-uskunalar"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Modulni moslash"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Moslash vositasini ishga tushirish"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "noma'lum"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Noma'lum"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "Xar hil"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
@@ -20568,184 +21753,189 @@ msgstr ""
 "Uskuna haqida ma'lumotni bu erda ko'rish uchun uni chap tarafdagi ro'yxatdan "
 "tanlang."
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "Ikkilamchi"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "Asosiy"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr ""
 
-#: 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 "Iltimos tugmalar tartibini tanlang."
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
 #, c-format
-msgid "The change is done, but to be effective you must logout"
-msgstr ""
-"O'zgarishlar bajarildi, ammo amalda to'liq qo'llanilishi uchun siz chiqishingiz "
-"kerak."
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
 
-#: standalone/logdrake:51
+#: standalone/localedrake:67
 #, c-format
-msgid "Mandrake Tools Logs"
+msgid "The change is done, but to be effective you must logout"
 msgstr ""
+"O'zgarishlar bajarildi, ammo amalda to'liq qo'llanilishi uchun siz "
+"chiqishingiz kerak."
 
-#: standalone/logdrake:52
+#: standalone/logdrake:50
+#, fuzzy, c-format
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinux boshqaruv markazi"
+
+#: 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 "Faqat tanlangan kun uchun ko'rsatish"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Fayl/_Yangi"
 
-#: 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 "/Fayl/_Ochish"
 
-#: 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 "/Fayl/_Saqlash"
 
-#: 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 "/Fayl/...sifatida s_aqlash"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Fayl/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Parametrlar/Sinash"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Yordam/_Haqida"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Tasdiqlash"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Foydalanuvchi"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Xabarlar"
 
-#: 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 "Qidirish"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Loglarni nazorat qilish uchun vosita"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Moslamalar"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Mos keladigan"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "mos kelmaydigan"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Faylni tanlash"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Faylning tarkibi"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Xat orqali xabar berish"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
@@ -20753,62 +21943,57 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr ""
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache veb-serveri"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr ""
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP serveri"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix xat-xabar serveri"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba serveri"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSH serveri"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin xizmati"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd xizmati"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Xat orqali xabar berishni moslash"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20816,66 +22001,66 @@ msgid ""
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Siz nima qilmoqchisiz?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Xizmatlarning moslamasi"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "Agar tanlangan xizmatlarning ishi to'xtasa sizga xabar jo'natiladi"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Moslamalarni yukash"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Yuklanganligi"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr ""
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Iltimos elektron pochtangizni kiriting"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "...sifatida saqlash"
@@ -20900,27 +22085,74 @@ msgstr "Sichqonchani sinash"
 msgid "Please test your mouse:"
 msgstr "Iltimos sichqonchani sinab ko'ring:"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, fuzzy, c-format
+msgid "Network is up on interface %s"
+msgstr "Tarmoqning interfeysi"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Tarmoq moslanmagan"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "%s-ni ulash"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr ""
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "Tarmoqni nazorat qilish"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "Tarmoqni moslash"
+
+#. -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 "Yangilash"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr ""
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Tarmoqni nazorat qilish"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Umumiy statistika"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "O'rtacha"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -20929,7 +22161,7 @@ msgstr ""
 "Jo'natish\n"
 "tezligi:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -20938,7 +22170,7 @@ msgstr ""
 "Qabul qilish\n"
 "tezligi:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -20947,254 +22179,244 @@ msgstr ""
 "Ulanish\n"
 "vaqti: "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Iltimos kutib turing, aloqa sinab ko'rilmoqda..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Internet bilan aloqa uzilmoqda"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Internetga ulanilmoqda "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Internetdan uzilish muvaffaqiyatsiz tugadi."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Internetdan uzilish bajarildi."
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Aloqa o'rnatildi."
 
-#: 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 ""
-"Ulanish muvaffaqiyatsiz tugadi.\n"
-"Moslamangizni Mandrake boshqaruv markazida tekshiring."
+"Aloqa o'rnatish muvaffaqiyatsiz tugadi.\n"
+"Moslamani Mandrakelinux boshqaruv markazida tekshiring."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Rangni moslash"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "jo'natilgan: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "qabul qilingan: "
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "o'rtachasi"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Lokal ko'rsatgich"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "jo'natilgan"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "qabul qilingan"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr ""
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "%s-ni ulash"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Internetga ulanish moslanmagan"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Printerning moslamalari yuklanmoqda, iltimos kutib turing..."
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "O'rnatilgan printerlar haqida ma'lumot o'qilmoqda..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s printerni boshqarish uchun vosita"
 
-#: 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 "/_Amallar"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Printerni qo'shish"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "/_Andoza deb belgilash"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Tuzatish"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_O'chirish"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Ekspert usuli"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Yangilash"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Printerni qo'shish"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/CUPS'ni _moslash"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Qidirish:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Filterni qo'llash"
 
-#: 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 "Printerning nomi"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Ulanishning turi"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, c-format
 msgid "Server Name"
 msgstr "Serverning nomi"
 
 #. -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 "Printerni qo'shish"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Tizimga yangi printerni qo'shish"
 
 #. -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 "Andoza deb belgilash"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Belgilangan printerni andoza deb belgilash"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Belgilangan printerni tuzatish"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Belgilangan printerni o'chirish"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Yangilash"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, c-format
 msgid "Refresh the list"
 msgstr "Ro'yxatni yangilash"
 
 #. -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 "CUPS'ni moslash"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "CUPS bosib chiqarish tizimini moslash"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "Yoqilgan"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "O'chirilgan"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Mualliflar: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Printer boshqaruvi\n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -21205,176 +22427,165 @@ msgstr ""
 "\n"
 "Ularni o'rnatishni istaysizmi?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Scannerdrake to'xtatilmoqda."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "Moslangan skannerlar qidirilmoqda..."
 
-#: 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 "Yangi skannerlar qidirilmoqda..."
 
-#: 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 "Moslangan skannerlarning ro'yxati boshqadan yaratilmoqda..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s %s'da topildi, uni avtomatik ravishda moslaymi?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Skannerning modelini tanlang"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Aniqlangan model: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Port: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s Scannerdrake dasturining bu versiyasiga ma'lum emas."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr ""
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr ""
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "%s qo'llanmagan"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -21384,33 +22595,33 @@ msgstr ""
 "Printerdrake dasturini Mandrake boshqaruv markazining \"Asbob-uskunalar\" "
 "bo'limidagi \"%s\" bandidan ishga tushirishingiz mumkin."
 
-#: 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 "Mavjud portlarni avtomatik ravishda topish"
 
-#: 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 "Iltimos %s ulangan uskunani tanlang"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Izoh: Parallel portlarni avto-aniqlab bo'lmaydi)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "uskunani tanlang"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Skannerlar qidirilmoqda..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -21421,7 +22632,7 @@ msgstr ""
 "Hujjatlarni dasturlar menyusidagi Multimedia/Grafikada joylashgan \"XSane\" "
 "yoki \"Kooka\" yordamida skan qilish mumkin"
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -21432,9 +22643,9 @@ msgstr ""
 "Quyidagi skannerlar\n"
 "\n"
 "%s\n"
-"sistemangizda mavjud.\n"
+"kompyuterda mavjud.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -21445,44 +22656,44 @@ msgstr ""
 "Quyidagi skanner\n"
 "\n"
 "%s\n"
-"sistemangizda mavjud.\n"
+"kompyuterda mavjud.\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 "Tizimda mavjud bo'lgan skanner topilmadi.\n"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Yangi skannerlarni qidirish"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr ""
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr ""
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Masofadagi hamma kompyuterlar"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Shu kompyuter"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -21491,96 +22702,97 @@ msgstr ""
 "Bu erda, bu kompyuterga ulangan skannerdan boshqa kompyuter va qaysi "
 "kompyuter foydalansa bo'ladimi-yo'qmi tanlashingiz mumkin."
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
-msgstr "Bu kompyuterdagi skannerlarni boshqa kompyuterlardan ham ishlatsa bo'ladi"
+msgstr ""
+"Bu kompyuterdagi skannerlarni boshqa kompyuterlardan ham ishlatsa bo'ladi"
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Masofadagi kompyuterlardagi skannerlardan foydalanish"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Quyidagi kompyuterlardagi skannerlardan foydalanish:"
 
-#: 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 ""
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Kompyuterni qo'shish"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Tanlangan kompyuterni tuzatish"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Tanlangan kompyuterni olib tashlash"
 
-#: 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 "Kompyuterning nomi/IP raqami:"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Kompyuterning nomini yoki IP raqamini kiritishingiz kerak.\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 ""
 "Bu kompyuterning nomi ro'yxatda allaqachon bor, uni yana qo'shib bo'lmaydi.\n"
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Masofadagi skannerlardan foydalanish"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Skannerlardan foydalanib bo'ladigan kompyuterlar:"
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -21591,32 +22803,32 @@ msgstr ""
 "\n"
 "Uni o'rnatishni istaysizmi?"
 
-#: 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 "Skanner(lar)ni tarmoq orqali ishlatib bo'lmaydi."
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "\"%s\" asbob-uskuna sinfidagi ba'zi bir uskunalar olib tashlandi:\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 "Ba'zi bir uskunalar qo'shildi: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Asbob-uskunalarni aniqlash ketayapti"
@@ -21628,7 +22840,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 "Moslash vositasini ishga tushirishni istaysizmi?"
 
 #: steps.pm:14
@@ -21699,7 +22911,7 @@ msgstr "Tarmoqni moslash"
 #: steps.pm:28
 #, c-format
 msgid "Install bootloader"
-msgstr "OS yuklagichini o'rnatish"
+msgstr "OT yuklagichini o'rnatish"
 
 #: steps.pm:29
 #, c-format
@@ -21721,22 +22933,22 @@ msgstr "Yangilanishlarni o'rnatish"
 msgid "Exit install"
 msgstr "O'rnatishdan chiqish"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Bu to'g'rimi?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Ro'yxatni yoyish"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Ro'yxatni yig'ish"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr ""
@@ -21748,170 +22960,10 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 "%s o'rnatilmagan\n"
-"O'rnatish uchun \"Keyingisi\" yoki chiqish uchun \"Bekor qilish\" tugmasini bosing"
+"O'rnatish uchun \"Keyingi\" yoki chiqish uchun \"Bekor qilish\" tugmasini "
+"bosing"
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Idora stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Idora uchun dasturlar: matn protsessorlari (kword, abiword), elektron "
-"jadvallar (kspread, gnumeric), PDF ko'ruvchilar va hokazo"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "O'yin stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Ovunchoq dasturlar: arkada, stol o'yinlari, strategiya va hokazo"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimedia stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Audio va videoni o'ynash/tahrirlash uchun dasturlar"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Xat-xabar, yangiliklarni o'qish va jo'natish (mutt, tin..) va Internetda sayr "
-"qilish uchun vositalar to'plami"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Tarmoqdagi printer (klient)"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Turli protokollar, shu jumlada SSH, uchun klientlar"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Moslash"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Kompyuterni moslashni engilashtirish uchun vositalar"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsol vositalari"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Tahrirchilar, konsollar, fayl vositalari, terminallar"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE - vositalar to'plami bilan birga asosiy grafik muhit"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOME stantsiyasi"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat grafik "
-"muhit"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Boshqa grafik ish stollari"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, va hokazo"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Qo'llanmalar"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux va erkin dasturlar haqida kitoblar va Howto'lar"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
-
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "Xat-xabar"
-
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfix xat-xabar serveri"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Ma'lumot bazasi"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL yoki MySQL ma'lumot bazasi"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Fayervol/Ruter"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet geytveyi"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Tarmoqdagi kompyuter (server)"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS serveri, SMB serveri, Proxy serveri, SSH serveri"
-
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"Xat-xabar, yangiliklarni o'qish va jo'natish va Internetda sayr qilish uchun "
-"vositalar to'plami"
-
diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index 6ad8d7eca..5ea6f1f35 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -1,3 +1,10 @@
+# translation of zh_TW.po to 
+# translation of zh_TW.po to
+# translation of zh_TW.po to
+# translation of zh_TW.po to
+# translation of zh_TW.po to
+# translation of zh_TW.po to 繁體中文
+# translation of zh_TW.po to Chinese Traditional
 # translation of DrakX-zh_TW.po to Chinese Traditional
 # drakbootdisk messages in Traditional Chinese
 # Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
@@ -7,20 +14,75 @@
 # Joe Man <trmetal@yahoo.com.hk>, 2001.
 # Chong Sein Yeo <csyeo@hal-pc.org>, 2003.
 # Hilbert <freehil@yahoo.com>, 2003, 2004.
+# Hilbert <h@mandrake.org>, 2004.
+# hilbert <h@mandrake.org>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-zh_TW\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-01-20 19:34+0800\n"
-"Last-Translator: Hilbert <freehil@yahoo.com>\n"
-"Language-Team: Chinese Traditional <zh@li.org>\n"
+"Project-Id-Version: zh_TW\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-10-08 21:55+0800\n"
+"Last-Translator: Hilbert <h@mandrake.org>\n"
+"Language-Team:  <zh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"X-Generator: KBabel 1.3.1\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "您想要格式化那一個 USB key?"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Key 無法寫入"
+
+#: ../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 "重試"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr "不用 USB key 而繼續"
+
+#: ../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 "重新開機"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -35,7 +97,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"
@@ -51,151 +113,113 @@ msgid ""
 "Operating System."
 msgstr ""
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
-msgstr ""
+msgstr "需要一 key 以儲存您的資料"
 
-#: ../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
+#: ../move/move.pm:517
 #, fuzzy, c-format
-msgid "Key isn't writable"
-msgstr "XawTV 程式並未安裝！"
-
-#: ../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 "重新開機"
-
-#: ../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 "重試"
-
-#: ../move/move.pm:466
-#, c-format
 msgid "Setting up USB key"
-msgstr ""
+msgstr "不用 USB key 而繼續"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "請稍後, 設定系統 USB key 組態檔..."
+msgstr "請稍後, 設定系統設定檔於 USB key 上"
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 
-#: ../move/move.pm:498
-#, fuzzy, c-format
+#: ../move/move.pm:556
+#, c-format
 msgid "Auto configuration"
-msgstr "警示設定"
+msgstr "自動設定"
 
-#: ../move/move.pm:498
-#, fuzzy, c-format
+#: ../move/move.pm:556
+#, c-format
 msgid "Please wait, detecting and configuring devices..."
-msgstr "請稍後，設定安全等級中..."
-
-#: ../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
+msgstr "請稍後, 正在偵測與設定裝置中..."
+
+#: ../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 "錯誤"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"發生了一個程式不知道該如何妥善處置的錯誤，\n"
-"要繼續安裝工作的話請小心。"
+"發生了一個錯誤, 但我不知道該如何妥善處置它.\n"
+"要繼續安裝工作的話請小心."
 
-#: ../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 "發生一個錯誤"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -215,32 +239,39 @@ msgid ""
 "guess what's happening."
 msgstr ""
 
-#: ../move/move.pm:622
-#, fuzzy, c-format
+#: ../move/move.pm:681
+#, c-format
 msgid "Remove system config files"
-msgstr "移除繞回裝置 (loopback) 檔案？"
+msgstr "移除系統設定檔案"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
-msgstr ""
+msgstr "簡單地重新開機"
 
-#: ../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 ""
+msgstr "您只能以沒有 CDROM 支援下跑"
 
-#: ../move/tree/mdk_totem:81
-#, fuzzy, c-format
+#: ../move/tree/mdk_totem:71
+#, c-format
 msgid "Kill those programs"
-msgstr "存取 X 發生錯誤"
+msgstr "殺死那些程式"
 
-#: ../move/tree/mdk_totem:82
-#, fuzzy, c-format
+#: ../move/tree/mdk_totem:72
+#, c-format
 msgid "No CDROM support"
-msgstr "Radio 支援："
+msgstr "沒有 CDROM 支援"
+
+#: ../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 "詳細閱讀!"
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -255,161 +286,161 @@ msgstr ""
 #: Xconfig/card.pm:13
 #, c-format
 msgid "256 kB"
-msgstr "256 kB"
+msgstr ""
 
 #: Xconfig/card.pm:14
 #, c-format
 msgid "512 kB"
-msgstr "512 kB"
+msgstr ""
 
 #: Xconfig/card.pm:15
 #, c-format
 msgid "1 MB"
-msgstr "1 MB"
+msgstr ""
 
 #: Xconfig/card.pm:16
 #, c-format
 msgid "2 MB"
-msgstr "2 MB"
+msgstr ""
 
 #: Xconfig/card.pm:17
 #, c-format
 msgid "4 MB"
-msgstr "4 MB"
+msgstr ""
 
 #: Xconfig/card.pm:18
 #, c-format
 msgid "8 MB"
-msgstr "8 MB"
+msgstr ""
 
 #: Xconfig/card.pm:19
 #, c-format
 msgid "16 MB"
-msgstr "16 MB"
+msgstr ""
 
 #: Xconfig/card.pm:20
 #, c-format
 msgid "32 MB"
-msgstr "32 MB"
+msgstr ""
 
 #: Xconfig/card.pm:21
 #, c-format
 msgid "64 MB or more"
-msgstr "16 MB 或者更多"
+msgstr "64 MB 或者更多"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
-msgstr "X 伺服程式"
+msgstr "X 伺服器"
 
-#: Xconfig/card.pm:152
-#, fuzzy, c-format
+#: Xconfig/card.pm:156
+#, c-format
 msgid "Choose an X server"
-msgstr "選取合適的 X 伺服程式"
+msgstr "選取一個 X 伺服器"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
-msgstr "多重顯示卡設定"
+msgstr "多頭端(Multi-head)設定"
 
-#: Xconfig/card.pm:185
-#, fuzzy, c-format
+#: Xconfig/card.pm:189
+#, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"您的系統支援多重顯示卡環境。\n"
-"您打算怎麼做呢？"
+"您的系統支援多頭端(multiple head)設定組態.\n"
+"您打算怎麼做呢?"
 
-#: Xconfig/card.pm:251
-#, fuzzy, c-format
-msgid "Can't install XFree package: %s"
-msgstr "正在安裝 %s 套件"
+#: Xconfig/card.pm:255
+#, c-format
+msgid "Can't install Xorg package: %s"
+msgstr "無法安裝 Xorg 套件: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
-msgstr "設定顯示卡上的繪圖記憶體大小"
+msgstr "選擇顯示卡上的記憶體大小"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "XFree 設定"
+msgid "Xorg configuration"
+msgstr "Xorg 設定"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "您要用哪一個 XFree 設定 ?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "您想要有哪一個 Xorg 設定?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
-msgstr "設定所有顯示卡"
+msgstr "獨立設定所有頭端(head)"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "使用 Xinerama 延伸"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "僅設定這張 \"%s\"%s 卡"
+msgstr "僅設定 \"%s\"%s 卡"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s 包含 3D 硬體加速功能"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s 含 3D 硬體加速功能"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "您的顯示卡搭配 XFree %s 有 3D 硬體加速功能。"
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "您的顯示卡搭配 Xorg %s 有 3D 硬體加速功能."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s 搭配實驗性質 3D 硬體加速"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s 搭配實驗性質 3D 硬體加速"
 
-#: 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 ""
-"您的顯示卡搭配 XFree %s 能夠啟用 3D 硬體加速功能。\n"
-"但是請注意，這是實驗性質的支援項目，而且上可能會有不預期的情況。"
+"您的顯示卡搭配 Xorg %s 能夠啟用 3D 硬體加速功能,\n"
+"但是請注意, 這是實驗性質的支援項目, 而且可會凍結您的電腦."
 
-#: 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 "自訂"
 
-#: 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 "結束"
+msgstr "離開"
 
 #: Xconfig/main.pm:117
 #, c-format
 msgid "Graphic Card"
 msgstr "顯示卡"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "螢幕"
 
-#: 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 "解析度"
@@ -419,14 +450,19 @@ msgstr "解析度"
 msgid "Test"
 msgstr "測試"
 
-#: 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 "選項"
 
-#: 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"
@@ -434,43 +470,43 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"儲存目前的變更？\n"
-"目前的組態是：\n"
+"保留目前的變更?\n"
+"目前的組態是:\n"
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
-#, fuzzy, c-format
+#: Xconfig/monitor.pm:111
+#, c-format
 msgid "Choose a monitor for head #%d"
-msgstr "選取合適的螢幕"
+msgstr "選取一個監視器給頭端(head) #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
-msgstr "選取合適的螢幕"
+msgstr "選取一個監視器"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
-msgstr "隨插即用"
+msgstr "隨插即用 Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "一般"
 
-#: 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 "廠商"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
-msgstr "Plug'n Play 偵測失敗，請選擇預期的螢幕項目"
+msgstr "隨插即用 Plug'n Play 偵測失敗, 請選擇正確的監視器"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -484,20 +520,20 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"這兩個參數乃是您螢幕的垂直更新頻率，以及很重要\n"
-"的水平更新頻率，前者是您整個螢幕影像更新的週期，\n"
-"後者是電子槍掃描的速率。\n"
+"這兩個重要的參數是您監視器的垂直更新頻率, 以及最重要\n"
+"的水平更新頻率, 前者是您整個螢幕影像更新的頻率,\n"
+"後者是電子槍掃描的速率.\n"
 "\n"
-"您必須特別注意，不要設定超過螢幕頻寬顯示能力的\n"
-"數值：過高的頻率有可能傷害您寶貴的螢幕。\n"
-"若您不確定螢幕規格的話，請選擇保守一點的設定值。"
+"特別重要的是, 不要設定一個超過您正在用的監視器\n"
+"同步範圍的監視器: 您可能傷害您的監視器.\n"
+"若您不確定的話, 請選擇保守一點的設定值."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "水平更新頻率"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂直更新頻率"
@@ -522,58 +558,60 @@ msgstr "6 萬 5 千色 (16 位元)"
 msgid "16 million colors (24 bits)"
 msgstr "1 千 6 百萬色 (24 位元)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "解析度"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
-msgstr "選取解析度以及顏色數"
+msgstr "選取解析度以及顏色深度"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "顯示卡: %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 "確定"
 
-#: 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 "取消"
 
-#: 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 "求助"
@@ -581,17 +619,17 @@ msgstr "求助"
 #: Xconfig/test.pm:30
 #, c-format
 msgid "Test of the configuration"
-msgstr "測試設定值"
+msgstr "設定值測試"
 
 #: Xconfig/test.pm:31
 #, c-format
 msgid "Do you want to test the configuration?"
-msgstr "您想要測試您的設定值嗎？"
+msgstr "您想要測試設定值嗎?"
 
 #: Xconfig/test.pm:31
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "警告：在這張卡上面作顯示測試時可能會讓您系統停止回應"
+msgstr "警告: 測試這張顯示卡時可能會冰凍您的系統"
 
 #: Xconfig/test.pm:69
 #, c-format
@@ -600,86 +638,89 @@ msgid ""
 "%s\n"
 "Try to change some parameters"
 msgstr ""
+"一個錯誤發生了:\n"
+"%s\n"
+"試著改變某些參數"
 
 #: Xconfig/test.pm:133
-#, fuzzy, c-format
+#, c-format
 msgid "Leaving in %d seconds"
-msgstr "%d 秒"
+msgstr "%d 秒後離開"
 
 #: Xconfig/test.pm:133
 #, c-format
 msgid "Is this the correct setting?"
-msgstr "這是正確設定值嗎？"
+msgstr "這是正確設定值嗎?"
 
 #: Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
-msgstr "鍵盤的形式： %s\n"
+msgstr "鍵盤布局: %s\n"
 
 #: Xconfig/various.pm:30
 #, c-format
 msgid "Mouse type: %s\n"
-msgstr "滑鼠的種類： %s\n"
+msgstr "滑鼠種類: %s\n"
 
 #: Xconfig/various.pm:31
 #, c-format
 msgid "Mouse device: %s\n"
-msgstr "滑鼠連接的位置： %s\n"
+msgstr "滑鼠裝置: %s\n"
 
 #: Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
-msgstr "螢幕： %s\n"
+msgstr "監視器: %s\n"
 
 #: Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "螢幕水平更新頻率： %s\n"
+msgstr "監視器水平更新頻率: %s\n"
 
 #: Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "螢幕垂直更新頻率： %s\n"
+msgstr "監視器垂直更新頻率: %s\n"
 
 #: Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
-msgstr "顯示卡： %s\n"
+msgstr "顯示卡: %s\n"
 
 #: Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
-msgstr "繪圖記憶體： %s kB\n"
+msgstr "顯示卡繪圖記憶體: %s kB\n"
 
 #: Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
-msgstr "顏色深度： %s\n"
+msgstr "顏色深度: %s\n"
 
 #: Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
-msgstr "解析度： %s\n"
+msgstr "解析度: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86 驅動程式： %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Xorg 驅動程式: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
 msgid "Graphical interface at startup"
-msgstr "開機時啟動 X 環境"
+msgstr "開機時啟動圖形介面"
 
 #: Xconfig/various.pm:74
 #, 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 ""
-"程式可以幫您設定在開機時自動進入 X 環境，\n"
-"您希望在重新開機以後就自動進入 X 環境嗎 ?"
+"我可以設定您的電腦在開機時自動開始圖形介面(Xorg).\n"
+"您希望在重新開機時開始 Xorg?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -693,32 +734,66 @@ msgid ""
 "\n"
 "Do you have this feature?"
 msgstr ""
-"您的顯示卡似乎有支援 TV-OUT 連接裝置，\n"
-"所以這張顯示卡能在 frame-buffer 模式下工作。\n"
+"您的顯示卡似乎有支援 TV-OUT 連接裝置.\n"
+"所以這張顯示卡能用 frame-buffer 工作.\n"
 "\n"
-"若是要使用的話，您需要在你重新開機之前插入你的顯示卡，\n"
-"然後選擇 \"TVout\" 這個項目開機\n"
-"您要使用這項功能嗎？"
+"若是要使用的話, 您需要在你重新開機之前插入你的顯示卡到您的電視.\n"
+"然後選擇 \"TVout\" 這個開機載入項目\n"
+"\n"
+"您要使用這項功能嗎?"
 
 #: Xconfig/various.pm:99
 #, c-format
 msgid "What norm is your TV using?"
-msgstr ""
+msgstr "您的電視用什麼標準?"
 
-#: 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 "請稍候"
 
-#: any.pm:103
-#, fuzzy, c-format
+#: any.pm:116
+#, c-format
 msgid "Bootloader installation in progress"
-msgstr "安裝開機程式"
+msgstr "開機載入器安裝中"
 
-#: 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 "開機程式安裝失敗, 發生如下之錯誤："
+
+#: 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 ""
+"您也許需要改變您的 Open Firmware 上面的開機裝置設定, \n"
+"以便於開啟開機啟動程式的功能。如果您開機時並沒有開到\n"
+"開機程式的任何訊息, 於重新開機時按住 Command-Option-O-F, \n"
+"然後輸入: setenv boot-device %s,\\\\:tbxi\n"
+"然後再輸入: shut-down\n"
+"然後你下一次開機時應該就可以看到開機啟動程式的訊息了。"
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -727,481 +802,479 @@ msgid ""
 "\n"
 "On which drive are you booting?"
 msgstr ""
-"您確定要將開機管理程式安裝於分割區上面。\n"
-"這可能會附蓋掉原本分割區上面原有的開機管理程式\n"
-"(比方 System Commander)。\n"
+"您決定要將開機載入器安裝於分割區上面.\n"
+"這意旨你已經有一個開機載入器於你開機的硬碟上\n"
+"(比方 System Commander).\n"
 "\n"
-"您打算用那顆硬碟開機呢？"
+"您正用那顆硬碟開機呢?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
-msgstr "硬碟的第一個磁區 (MBR)"
+msgstr "硬碟的第一個扇區 (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "根分隔區的第一扇區"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "在軟碟機"
 
-#: 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 "略過"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "SILO 安裝"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
-msgstr "安裝 LILO 或 GRUB"
+msgstr "LILO/GRUB 安裝"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
-msgstr "您要將開機程式安裝在那個位置 ?"
-
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "開機分割區的第一個磁區"
+msgstr "您要將開機載入器安裝在那裡?"
 
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "開機樣式組態設定"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
-msgstr "開機程式主要選項"
+msgstr "開機載入器主要選項"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "輸入記憶體大小 (以 MB 為單位)"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
-msgstr "選項「限制指令行參數」在沒有設定密碼的情況下會失效"
+msgstr "選項 ``限制命令列選項'' 在沒有設定密碼的情況下會無用"
 
-#: 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 "輸入的密碼不符合"
+msgstr "密碼不符合"
 
-#: 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 "請再試一次"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
-msgstr "要使用那個開機程式"
-
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "安裝開機程式"
+msgstr "要用的開機載入器"
 
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "開機裝置"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
-msgstr "在啟動作業系統前先延遲的時間"
+msgstr "在開機到預設的影像前的延遲"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "啟用 ACPI"
 
-#: any.pm:232 help.pm:768
-#, fuzzy, c-format
+#: any.pm:260
+#, c-format
 msgid "Force no APIC"
 msgstr "強制無 APIC"
 
-#: any.pm:234
-#, fuzzy, c-format
+#: any.pm:262
+#, c-format
 msgid "Force No Local APIC"
-msgstr "強制無 APIC"
+msgstr "強制無本地端 APIC"
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1220 network/netconnect.pm:595
+#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
+#: standalone/drakbackup:1647 standalone/drakbackup:3490
+#: standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "密碼"
 
-#: 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 "密碼 (再一次)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
-msgstr "限制在 boot: 指令行輸入參數"
+msgstr "限制命令列選項"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
-msgstr "限制參數"
+msgstr "限制"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
-msgstr "每次開機時自動清理 /tmp 目錄暫存檔"
+msgstr "每次開機時清理 /tmp"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "需要的話，輸入正確的記憶體大小 (找到 %d MB)"
+msgstr "需要的話, 輸入精確的記憶體大小 (找到 %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "使用多重設定檔"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "啟動訊息"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
-msgstr "開啟 Firmware Delay"
+msgstr "開啟 Firmware 延遲"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
-msgstr "核心啟動時間逾時時間"
+msgstr "核心啟動時間逾時"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
-msgstr "允許 CD 開機？"
+msgstr "允許 CD 開機?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
-msgstr "允許 OF 開機 ？"
+msgstr "允許 OF 開機?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
-msgstr "預設 OS ?"
+msgstr "預設 OS?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
-msgstr "核心"
+msgstr "影像"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
-msgstr "Root"
+msgstr ""
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
-msgstr "附加參數"
+msgstr "附加"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
-msgstr "顯示模式"
+msgstr "視訊模式"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
-msgstr "Initrd"
+msgstr ""
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "網路 profile"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "標籤"
 
-#: 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 "預設開機"
+msgstr "預設"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
-msgstr "Initrd 大小"
+msgstr "Initrd-大小"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
-msgstr "NoVideo"
+msgstr ""
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
-msgstr "標籤不可以空白"
+msgstr "標籤空白不被允許"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
-msgstr "您需要指定一個核心開機檔案"
+msgstr "您需要指定一個核心影像"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "您需要指定一個 root 分割區"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
-msgstr "這個標籤已經用過了"
+msgstr "這個標籤已經被用過了"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "您要新增哪一類的項目?"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
-msgstr "Linux"
+msgstr ""
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "其他作業系統 (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "其他作業系統 (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "其他作業系統 (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can create additional entries or change the existing ones."
 msgstr ""
-"下面還有一些其他的選項，您可以選擇新增或\n"
-"修改既有的選項。"
+"到此為止有這些選項於您的開機選單.\n"
+"您可以建立多的選項或修改既有的選項."
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
-msgstr "存取 X 發生錯誤"
+msgstr "存取 X 程式"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "存取 rpm 工具程式"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
-msgstr "允許「su」"
+msgstr "允許 \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
-msgstr "存取系統面的設定檔"
+msgstr "存取管理權限的的檔案"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "存取網路工具"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
-msgstr "存取彙整工具"
+msgstr "存取編譯工具"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "( %s 已經加入)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
-msgstr "輸入的密碼太簡單了"
+msgstr "這密碼太簡單了"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
-msgstr "請輸入使用者帳號"
+msgstr "請輸入使用者名稱"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "使用者帳號只能含有小寫英文字母、數字、 `-' 或 `_'"
+msgstr "使用者名稱只能含有小寫英文字母, 數字, `-' 與 `_'"
 
-#: any.pm:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "這個使用者名稱太長了"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
-msgstr "這個使用者已經存在了"
+msgstr "這個使用者早就已經被加入過了"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "新增使用者"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
-"輸入一位使用者帳號\n"
+"輸入一位使用者\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 "完成"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "接受使用者"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
-msgstr "使用者名稱"
+msgstr "真實名稱"
 
-#: 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 "使用者帳號"
+msgid "Login name"
+msgstr "登入名稱"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
-msgstr "Shell 程式"
+msgstr "命令殼"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "圖示"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "自動登入"
 
-#: any.pm:604
+#: any.pm:665
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
-msgstr ""
-"現在能夠設定於開機後自動以某個使用者身份登入系統。\n"
-"您要使用這個功能嗎？"
+msgstr "我能夠設定您的電腦自動以某個使用者身份登入系統."
 
-#: any.pm:605 help.pm:52
-#, fuzzy, c-format
+#: any.pm:666 help.pm:51
+#, c-format
 msgid "Do you want to use this feature?"
-msgstr "您要使用 aboot 嗎 ?"
+msgstr "您想要使用這個功能嗎?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
-msgstr "請選取預設的使用者："
+msgstr "選取預設的使用者:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
-msgstr "選取您想使用的視窗管理程式："
+msgstr "選取您想使用的視窗管理員:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
-msgstr "請選擇要使用那個語系。"
+msgstr "請選擇要使用那個語系."
+
+#: any.pm:681
+#, c-format
+msgid "Language choice"
+msgstr "語言選擇"
 
-#: any.pm:640
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
-msgstr "您可以選擇在安裝完成以後使用其他的語言"
+msgstr ""
+"Mandrakelinux 能支援多種語言. 選擇您想安裝的語言.\n"
+"他們將可使用於您的安裝完成與您重新開始您的系統之後."
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "預設使用 Unicode"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "所有語言"
 
-#: 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 "國家/地區"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
-msgstr "請選擇您的國家或地區。"
+msgstr "請選擇您的國家."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
-msgstr "以下是所有的國家/地區"
+msgstr "以下是全部可用的所有的國家清單"
 
-#: 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 "更多"
+msgid "Other Countries"
+msgstr "其他國家"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "輸入方式:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "無"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "不分享"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "允許所有使用者"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1210,131 +1283,242 @@ msgid ""
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
-"您要允許使用者能夠開放出他們自己目錄內的檔案分享嗎？\n"
-"若是開放後，您將可以在 konqueror 或者是 nautilus 內\n"
-"選 \"Share\"這個分享項目。\n"
+"您要允許使用者能夠分享他們自己的目錄嗎?\n"
+"若是要開放將允許使用者能在 konqueror 或者是 nautilus 內\n"
+"點選 \"Share\"\n"
+"\n"
+"\"Custom\" 允許每一個使用者粒度.\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 ""
+msgstr "NFS: 傳統 Unix 檔案分享系統, 跟著少的 Mac 與 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 ""
+msgstr "SMB: 一個 Windows, Mac OS X 與許多先進的 Linux 系統用的檔案分享系統."
 
-#: any.pm:860
-#, fuzzy, c-format
+#: any.pm:939
+#, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
-msgstr "您能夠分享出 NFS 或者是 Samba 資源。您打算用那個"
+msgstr "您能夠用 NFS 或者是 SMB 匯出. 請選擇您想要用那一個."
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "啟動 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 "關閉"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
-"每個使用者的分享都是使用『fileshare』該群組的設定。\n"
-"您可以執行『userdrake』程式在該群組內加入使用者即可。"
+"每個使用者的分享都是使用 \"fileshare\" 群組.\n"
+"您可以執行 userdrake 在該群組內加入使用者."
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "本機密碼檔"
+msgid "Local file"
+msgstr "本地端檔案"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
-msgstr "使用 LDAP"
+msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, c-format
 msgid "NIS"
-msgstr "使用 NIS"
+msgstr ""
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, c-format
 msgid "Windows Domain"
 msgstr "Windows 網域"
 
-#: authentication.pm:12
+#: authentication.pm:20
 #, c-format
-msgid "Active Directory"
+msgid "Active Directory with SFU"
 msgstr ""
 
-#: authentication.pm:38
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr ""
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "本地端檔案:"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, c-format
+msgid "Windows Domain:"
+msgstr "Windows 網域:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr ""
+
+#: 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:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "LDAP 認證"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
-msgstr "LDAP 的 dn 欄位"
+msgstr ""
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
-msgstr "LDAP 伺服主機"
+msgstr "LDAP 伺服器"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "簡單"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr ""
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr "安全性佈置 (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "認證方式"
+msgstr "Active Directory 認證"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "網域"
 
-#: 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 "伺服器平台"
+msgstr "伺服器"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
+msgstr "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 "需要輸入密碼"
+msgstr "使用者密碼"
+
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "加密"
 
-#: authentication.pm:62
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "NIS 認證"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
-msgstr "NIS 域名"
+msgstr "NIS 網域"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
-msgstr "NIS 伺服主機"
+msgstr "NIS 伺服器"
 
-#: authentication.pm:69
-#, fuzzy, c-format
+#: authentication.pm:111
+#, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
 "run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
@@ -1349,39 +1533,48 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 msgstr ""
-"要能夠在 W2K PDC 下正常使用，您需要使用管理者全現在 Windows 主機那邊於提示字"
-"元下執行 C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\"everyone /"
-"all，然後重新啟動你的 W2K 主機。\n"
-"您另外還需要網域管理者帳號密碼，以便於能夠加入 Windows(TM) 網域內。\n"
-"要開始加入網域前，請先確認你網路有正確啟動，要不然 DrakX 程式需要等到後面網路"
-"設定正確後才能夠進行這些步驟。\n"
-"若是你發現安裝程式設定好後，你往後開機發現無法正常使用網域認證的話，請事後執"
-"行 'smbpasswd -j DOMAIN -U USER%PASSWORD' 指令，其中的 DOMAIN 為你的Windows "
-"網域名稱，USER 與 PASSWORD 為管理者的帳號與密碼。\n"
-"最後使用 'wbinfo -t' 測試確認認證功能是否可以正常工作。"
+"要能夠在 W2K PDC 下正常使用, 您或許需要使用管理者權限在 Windows 主機那邊執行:"
+"C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add然後"
+"重新啟動伺服器.\n"
+"您另外還需要網域管理者帳號密碼以便於能夠加入機器到 Windows(TM) 網域內.\n"
+"如果網路沒有被啟用, DrakX 程式會於網路設定步驟後企圖加入網域若是這樣設定失敗"
+"且網域認證莫名其妙不能作用的話, 執行'smbpasswd -j DOMAIN -U USER%%PASSWORD' "
+"指令, 其中的 DOMAIN 為你的Windows(tm)網域名稱, USER 與 PASSWORD 為管理者的帳"
+"號與密碼.\n"
+"最後使用 'wbinfo -t' 測試確認認證功能是否可以正常工作."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
-msgstr "Windows PDC 認證"
+msgstr "Windows 網域認證"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
-msgstr "網域管理帳號"
+msgstr "網域管理使用者名稱"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "網域管理密碼"
 
-#: 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 "預設 Idmap"
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr "沒有 NIS 網域無法使用廣播 (broadcast)"
 
 #. -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"
@@ -1390,85 +1583,80 @@ msgid ""
 "wait for default boot.\n"
 "\n"
 msgstr ""
-"Welcome to the operating system chooser!\n"
+"歡迎來到作業系統選擇器!\n"
 "\n"
-"Choose an operating system from the list above or\n"
-"wait for default boot.\n"
+"由上面的清單選擇一個作業系統或\n"
+"等待預設開機.\n"
 "\n"
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SLILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
-msgstr "圖形介面 LILO 程式"
+msgstr "LILO 圖形介面菜單"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
-msgstr "文字選單 LILO 程式"
+msgstr "LILO 文字菜單"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
-msgstr "Grub 開機程式"
+msgstr ""
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
-msgstr "Yaboot"
+msgstr ""
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot 沒有足夠的空間"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "您不能把開機管理程式安裝在 %s 分割區上\n"
+msgstr "您不能把開機載入器安裝在 %s 分割區上\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
-msgstr ""
+msgstr "您的開機載入器設定必須要更新因為分割區已經被重新編號"
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
-msgstr ""
+msgstr "開機載入器不能被正確的安裝. 你必須以 rescue 開機且選擇 \"%s\""
 
-#: bootloader.pm:1222
-#, fuzzy, c-format
+#: bootloader.pm:1327
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "安裝開機程式"
+msgstr "重新安裝開機載入器"
 
 #: common.pm:125
 #, c-format
 msgid "KB"
-msgstr "KB"
+msgstr ""
 
 #: common.pm:125
 #, c-format
 msgid "MB"
-msgstr "MB"
+msgstr ""
 
 #: common.pm:125
 #, c-format
 msgid "GB"
-msgstr "GB"
+msgstr ""
 
 #: common.pm:133
 #, c-format
 msgid "TB"
-msgstr "TB"
+msgstr ""
 
 #: common.pm:141
 #, c-format
@@ -1493,88 +1681,91 @@ msgstr "在尚未進行分割前無法提供畫面捕捉功能"
 #: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "在安裝 %s 後就能夠提供畫面捕捉功能"
+msgstr "在安裝於 %s 後就能夠提供畫面捕捉功能"
 
 #: common.pm:269
 #, c-format
 msgid "kdesu missing"
-msgstr "kdesu 程式不見了"
+msgstr "kdesu 遺失"
 
 #: common.pm:272
 #, c-format
 msgid "consolehelper missing"
-msgstr "consolehelper 程式遺失"
+msgstr "consolehelper 遺失"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, c-format
 msgid "France"
 msgstr "法國"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: 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 "比利時"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: 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 "德國"
 
-#: 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 "希臘"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: 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 "瑞典"
 
-#: 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 "荷蘭"
 
-#: 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 "義大利"
 
-#: 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 "澳洲"
 
-#: 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 "美國"
 
-#: 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"
@@ -1583,307 +1774,306 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "新增"
 
-#: 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 "卸載"
 
-#: 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 "掛載"
 
-#: 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 "掛載點"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "請輸入 WevDAV 主機 URL"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
-msgstr "URL 格式必須為 http:// 或是 https:// 類型"
+msgstr "URL 格式必須為 http:// 或是 https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
-msgstr "主機： "
+msgstr "伺服器:"
 
-#: 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 "掛載點： "
+msgstr "掛載點:"
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
-msgstr "選項： %s"
-
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "請詳細閱讀!"
+msgstr "選項: %s"
 
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "請您先備份您的資料"
 
-#: 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 "
 "enough)\n"
 "at the beginning of the disk"
 msgstr ""
-"如果你打算使用 aboot 程式的話，請注意您至少需要在於磁碟最前端保留一塊可用的空"
-"間 (2048 磁區就足夠了)。"
+"如果你打算使用 aboot 程式的話, 請注意您至少需要在於磁碟最前端保留一塊可用的空"
+"間 (2048 扇區就足夠了)"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
-msgstr "精靈"
+msgstr "巫師"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "選擇動作"
 
-#: diskdrake/hd_gtk.pm:193
-#, fuzzy, c-format
+#: diskdrake/hd_gtk.pm:192
+#, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
-"您有一個很大的 fat 分割區 (Microsoft 的\n"
-"Dos/Windows 作業系統用的格式)，建議您重\n"
-"設這個分割區的大小 (點選這個分割區，然\n"
-"後按 \"改變大小\" )"
+"您有一個很大的 Microsoft Windows 分割區.\n"
+"建議您先重新改變這個分割區的大小\n"
+"(點選它, 然後按 \"重新改變大小\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "請點選一個分割區"
 
-#: 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 "詳細資訊"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "找不到硬碟裝置"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
-msgstr "Ext2"
+msgstr ""
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
-msgstr "Journalised FS"
+msgstr ""
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
-msgstr "Swap"
+msgstr ""
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
-msgstr "SunOS"
+msgstr ""
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
-msgstr "HFS"
+msgstr ""
 
-#: diskdrake/hd_gtk.pm:326
-#, fuzzy, c-format
+#: diskdrake/hd_gtk.pm:325
+#, c-format
 msgid "Windows"
-msgstr "Windows 網域"
+msgstr "視窗"
 
-#: 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 "其他"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
-msgstr "Empty"
+msgstr "空白"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
-msgstr "檔案系統格式："
+msgstr "檔案系統格式:"
 
-#: 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 "用 ``%s'' 代替"
 
-#: 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 "格式"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
-msgstr "新建"
+msgstr "建立"
 
 #. -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 "刪除"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "要先 ``Unmount''"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "選擇另一個分割區"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
-msgstr "選擇分割區"
+msgstr "選擇一個分割區"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "離開"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "復原"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "切換到一般模式"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "切換到專家模式"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
-msgstr "不管如何都要繼續嗎 ?"
+msgstr "不管如何都要繼續嗎?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "不儲存就離開"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
-msgstr "放棄寫入硬碟分割表就離開？"
+msgstr "放棄寫入硬碟分割表就離開?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
-msgstr "您想要儲存 /etc/fstab 檔案的修改嗎？"
+msgstr "您想要儲存 /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 "您須要重新開機以使用更動過的硬碟分割表"
+msgstr "您須要重新開機以使更動過的硬碟分割表生效"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "全部清除"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "自動分配"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "更多"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
 msgstr "硬碟資訊"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
-msgstr "主分割區數目已經滿了"
+msgstr "主分割區數目已經全被用了"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
-msgstr "程式無法再新增任何分割區了"
+msgstr "我無法再新增任何分割區了"
 
-#: 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 "
 "partition"
-msgstr "需要有更多的分割區的話，請刪除一個主分割區以建立延伸分割區"
+msgstr "需要有更多的分割區的話, 請刪除一個主分割區以建立延伸分割區"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "寫入硬碟分割表"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "回存硬碟分割表"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "搶救硬碟分割表"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
-msgstr "載入硬碟分割表"
+msgstr "重新載入硬碟分割表"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
-msgstr "抽取式裝置自動掛載"
+msgstr "可移除式裝置自動掛載"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1892,117 +2082,117 @@ msgstr ""
 "備份的硬碟分割表有不一樣的大小\n"
 "還要繼續?"
 
-#: 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 "警告"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
-"插入軟碟片\n"
-"所有在這片軟碟中的資料都將被清除"
+"插入一個軟碟片\n"
+"所有在這片軟碟中的資料都將遺失"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "正在試圖救回硬碟分割表"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "詳細資訊"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
-msgstr "變更大小"
+msgstr "重新變更大小"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "移動"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "格式化"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
-msgstr "加入磁碟陣列"
+msgstr "加入到磁碟陣列"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
-msgstr "加入磁碟陣列"
+msgstr "加入到 LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "由磁碟陣列中移除"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
-msgstr "由磁碟陣列中移除"
+msgstr "由 LVM 中移除"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
-msgstr "變更磁碟陣列設定"
+msgstr "變更磁碟陣列"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "作為 loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "建立新的分割區"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
-msgstr "開始的磁區： "
+msgstr "開始的磁區:"
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
-msgstr "大小 (MB)： "
+msgstr "大小 (MB):"
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
-msgstr "檔案系統格式： "
+msgstr "檔案系統格式:"
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
-msgstr "設定值： "
+msgstr "偏好設定:"
 
-#: diskdrake/interactive.pm:481
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:486
+#, c-format
 msgid "Logical volume name "
-msgstr "本機密碼檔"
+msgstr "邏輯容量名稱"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2010,243 +2200,238 @@ msgid ""
 "First remove a primary partition and create an extended partition."
 msgstr ""
 "您無法建立新的分割區\n"
-"(因為系統已經沒有可供使用的主分割區供配置了)。\n"
-"您需要移除一個主分割區，以便於配置延伸分割區劃分使用。"
+"(因為你達到主分割區的最大值).\n"
+"您需要先移除一個主分割區然後建立一個延伸分割區."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
-msgstr "移除繞回裝置 (loopback) 檔案？"
+msgstr "移除 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 "改變分割區 %s 的格式以後，所有在這個分割區上的資料都會被清除"
+msgstr "改變分割區 %s 的格式以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "改變分割區格式"
 
-#: 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 "您要用那一種檔案系統？"
+msgstr "您要用那一種檔案系統?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "由 ext2 正在切換到 ext3"
 
-#: diskdrake/interactive.pm:608
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:614
+#, c-format
 msgid "Where do you want to mount the loopback file %s?"
-msgstr "您要把 loopback 檔案 %s 掛載在那裡 ?"
+msgstr "您要把 loopback 檔案 %s 掛載在那裡?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "您要把這個裝置 %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"
 "Remove the loopback first"
 msgstr ""
-"因為這個分割區被用作 loop back 使用，所以無法解除\n"
-"這個掛載點；請先取消 loopback 的設定。"
+"因為這個分割區被用作 loop back 使用, 所以無法解除\n"
+"這個掛載點. 請先取消 loopback 的設定"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
-msgstr "您要把這個裝置 %s 掛載在那裡 ?"
+msgstr "您要將 %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 "正在重設大小"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "正在計算 fat 分割區的邊界"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
-msgstr "這個分割區無法調整大小"
+msgstr "這個分割區無法重新調整大小"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "所有在這個分割區上的資料都應該先經過備份"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "在改變分割區 %s 的大小以後，所有在這個分割區上的資料都會被清除"
+msgstr "在改變分割區 %s 的大小以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "選取新的大小"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
-msgstr "新大小 (MB)： "
+msgstr "新大小 (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"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
-msgstr "您要移動到那個磁碟機 ?"
+msgstr "您要將它移動到那個磁碟機?"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
-msgstr "磁區"
+msgstr "扇區"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
-msgstr "您要移動到那個磁區？"
+msgstr "您要將它移動到那個扇區?"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "正在移動"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "正在移動分割區..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "選取一存在的磁碟陣列加入到"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "新的"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
-msgstr "選取要加入的磁碟陣列"
+msgstr "選取一個已經存在的 LVM 以加入"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
-msgstr "LVM 名稱？"
+msgstr "LVM 名稱?"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
-msgstr "這個分割區不能用來作為 loopback 裝置"
+msgstr "這個分割區不能用來作為 loopback"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
-msgstr "Loopback"
+msgstr ""
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
-msgstr "Loopback 檔案名稱： "
+msgstr "Loopback 檔案名稱:"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
-msgstr "輸入檔案名稱"
+msgstr "輸入一個檔案名稱"
 
-#: diskdrake/interactive.pm:888
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:891
+#, c-format
 msgid "File is already used by another loopback, choose another one"
-msgstr "檔案已被用來作為其他的 loopback，請選擇其他檔案"
+msgstr "檔案已被用來作為其他的 loopback, 請選擇其他檔案"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
-msgstr "檔案已經存在了，要使用這個檔案嗎?"
+msgstr "檔案已經存在了. 要使用它嗎?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "掛載參數"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
-msgstr ""
+msgstr "各種的"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
-msgstr "裝置設備"
+msgstr "裝置"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "階層"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "組塊大小"
+msgid "chunk size in KiB"
+msgstr "組塊大小以 Kib 計量"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
-msgstr "請小心，這個動作非常危險。"
+msgstr "請小心: 這個工作很危險."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
-msgstr "以那種方式分割？"
+msgstr "以那種形式分割?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "這個 %s 套件需要安裝上，您要安裝該套件嗎？"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "您需要重新開機以便於讓異動的設定生效"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "正在準備將要寫入磁碟 %s 的硬碟分割表!"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "在對分割區 %s 進行格式化的動作以後，所有在這個分割區上的資料都會被清除"
+msgstr "在對分割區 %s 進行格式化的動作以後, 所有在這個分割區上的資料都會遺失"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "將檔案搬移到新的分割區"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "隱藏檔案"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2255,53 +2440,53 @@ msgstr ""
 "%s 目錄已經包含了資料了\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "正在將檔案搬移到新的分割區"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "正在複製 %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
-msgstr "該分割區 %s 目前被認知為為 %s"
+msgstr "該分割區 %s 目前被認知為 %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
-msgstr "裝置： "
+msgstr "裝置:"
 
-#: diskdrake/interactive.pm:1156
-#, fuzzy, c-format
+#: diskdrake/interactive.pm:1157
+#, c-format
 msgid "Devfs name: "
-msgstr "主機名稱："
+msgstr "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 "DOS 底下的磁碟代號： %s (猜測值，僅供參考)\n"
+msgstr "DOS 磁碟代號: %s (只是一個猜測)\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 "格式： "
+msgstr "格式:"
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "名稱: "
@@ -2309,22 +2494,22 @@ msgstr "名稱: "
 #: diskdrake/interactive.pm:1174
 #, c-format
 msgid "Start: sector %s\n"
-msgstr "開始: 第 %s 磁區\n"
+msgstr "開始: %s 扇區\n"
 
 #: diskdrake/interactive.pm:1175
 #, c-format
 msgid "Size: %s"
-msgstr "大小： %s"
+msgstr "大小: %s"
 
 #: diskdrake/interactive.pm:1177
 #, c-format
 msgid ", %s sectors"
-msgstr "，第 %s 磁區"
+msgstr ", %s 扇區"
 
 #: diskdrake/interactive.pm:1179
 #, c-format
 msgid "Cylinder %d to %d\n"
-msgstr "第 %d 磁柱到第 %d 磁柱\n"
+msgstr "%d 磁柱到第 %d 磁柱\n"
 
 #: diskdrake/interactive.pm:1180
 #, c-format
@@ -2348,8 +2533,8 @@ msgstr "已掛載\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "磁碟陣列 (RAID) md%s\n"
+msgid "RAID %s\n"
+msgstr "磁碟陣列 %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2357,7 +2542,7 @@ msgid ""
 "Loopback file(s):\n"
 "   %s\n"
 msgstr ""
-"繞回裝置 (loopback) 檔案:\n"
+"loopback 檔案:\n"
 "   %s\n"
 
 #: diskdrake/interactive.pm:1187
@@ -2376,21 +2561,21 @@ msgstr "階層 %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "組塊大小 %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "組塊大小 %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
 msgid "RAID-disks %s\n"
-msgstr "RAID 磁碟 %s\n"
+msgstr "磁碟陣列-磁碟 %s\n"
 
 #: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Loopback file name: %s"
-msgstr "Loopback 檔案名稱： %s"
+msgstr "Loopback 檔案名稱:  %s"
 
 #: diskdrake/interactive.pm:1196
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Chances are, this partition is\n"
@@ -2398,9 +2583,9 @@ msgid ""
 "probably leave it alone.\n"
 msgstr ""
 "\n"
-"Chances are,這個分割區看起來似乎\n"
-"是透過驅動程式產生出來的。所以\n"
-"您應該不要去異動這個分割區資料。\n"
+"可能是這樣的, 這個分割區\n"
+"是透過驅動程式產生出來的\n"
+"您應該不要去異動這個分割區資料.\n"
 
 #: diskdrake/interactive.pm:1199
 #, c-format
@@ -2411,8 +2596,8 @@ msgid ""
 "dual-booting your system.\n"
 msgstr ""
 "\n"
-"這是一個用來作為多重開機\n"
-"使用的特殊分割區。\n"
+"這個特殊分割區用來作為 \n"
+"雙重開機使用的.\n"
 
 #: diskdrake/interactive.pm:1218
 #, c-format
@@ -2422,65 +2607,65 @@ msgstr ""
 #: diskdrake/interactive.pm:1219
 #, c-format
 msgid "Size: %s\n"
-msgstr "大小： %s\n"
+msgstr "大小: %s\n"
 
 #: diskdrake/interactive.pm:1220
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "硬碟資訊： %s 磁柱, %s 讀寫頭, %s 磁區\n"
+msgstr "幾何: %s 磁柱, %s 讀寫頭, %s 扇區\n"
 
 #: diskdrake/interactive.pm:1221
 #, c-format
 msgid "Info: "
-msgstr "資訊： "
+msgstr "資訊:"
 
 #: diskdrake/interactive.pm:1222
 #, c-format
 msgid "LVM-disks %s\n"
-msgstr "LVM 磁碟 %s\n"
+msgstr "LVM-磁碟 %s\n"
 
 #: diskdrake/interactive.pm:1223
 #, c-format
 msgid "Partition table type: %s\n"
-msgstr "硬碟分割表形式： %s\n"
+msgstr "硬碟分割表形式: %s\n"
 
 #: diskdrake/interactive.pm:1224
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "位在通道 %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "檔案系統加密金鑰"
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "選擇您檔案系統所使用的加密金鑰"
 
-#: 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 "這個密碼太簡單了 (一定至少要有 %d 個字元才行)"
+msgstr "這個加密金鑰太簡單了 (一定至少要有 %d 個字元才行)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "輸入的加密金鑰不符合"
 
-#: 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 "加密金鑰"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "再次輸入加密金鑰"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "改變分割區格式"
@@ -2488,7 +2673,7 @@ msgstr "改變分割區格式"
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
 msgid "Can't login using username %s (bad password?)"
-msgstr "無法使用 %s 帳號登入系統 (密碼錯誤？)"
+msgstr "無法使用 %s 使用者名稱登入系統 (密碼錯誤?)"
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
 #, c-format
@@ -2498,7 +2683,7 @@ msgstr "需要 Domain 認證"
 #: diskdrake/smbnfs_gtk.pm:168
 #, c-format
 msgid "Which username"
-msgstr "那個使用者帳號"
+msgstr "那個使用者名稱"
 
 #: diskdrake/smbnfs_gtk.pm:168
 #, c-format
@@ -2509,9 +2694,9 @@ msgstr "另外一個"
 #, c-format
 msgid ""
 "Please enter your username, password and domain name to access this host."
-msgstr "請輸入你的使用者名稱、密碼以及網域名稱，以便於能夠連線存取。"
+msgstr "請輸入你的使用者名稱, 密碼以及網域名稱, 以便於能夠連線存取這個主機"
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "使用者名稱"
@@ -2522,50 +2707,95 @@ msgid "Search servers"
 msgstr "搜尋伺服器"
 
 #: diskdrake/smbnfs_gtk.pm:210
-#, fuzzy, c-format
+#, c-format
 msgid "Search new servers"
-msgstr "搜尋伺服器"
+msgstr "搜尋新的伺服器"
 
-#: 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 "這個 %s 套件需要安裝上，您要安裝該套件嗎？"
+msgstr "這個套件 %s 需要安裝上, 您要安裝它嗎?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
-msgstr "錯誤! %s 套件未安裝或者是遺失"
+msgstr "必要的 %s 套件遺失"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "正在安裝套件..."
 
-#: do_pkgs.pm:217
-#, fuzzy, c-format
+#: do_pkgs.pm:216
+#, c-format
 msgid "Removing packages..."
-msgstr "正在移除 %s"
+msgstr "正在移除套件..."
+
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "正在掛載分割區 %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "正在將 %s 分割區掛載於 %s 目錄時失敗"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "檢查 %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "卸下 %s 的掛載時發生錯誤: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "正在啟用 swap 分割區 %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "正在格式化分割區 %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "建立並格式化檔案 %s"
 
-#: fs.pm:416
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "不知道要如何將 %s 格式化為 %s 格式"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "以 %s 格式化 %s 失敗"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2573,7 +2803,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2581,17 +2811,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
-msgstr ""
+msgstr "以唯讀方式掛載檔案系統."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2601,66 +2831,30 @@ msgid ""
 "(unless overridden by subsequent options, as in the option line\n"
 "user,exec,dev,suid )."
 msgstr ""
+"允許一般使用者掛載檔案系統.\n"
+"掛載的使用者名稱會被寫入 mtab 以至於他可以再次卸載檔案系統.\n"
+"這個選項意旨 noexec, nosuid, and nodev 選項\n"
+"(除非被以下選項制伏, 像是選項行 user,exec,dev,suid 選項)."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
-msgstr ""
+msgstr "給寫入權限給一般使用者"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
-msgstr ""
-
-#: 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 格式化 %s 失敗"
+msgstr "給唯讀權限給一般使用者"
 
-#: fs.pm:655
+#: fs/type.pm:364
 #, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "不知道要如何將 %s 格式化為 %s 格式"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "正在格式化分割區 %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "建立並格式化檔案 %s"
-
-#: fs.pm:726 fs.pm:775
-#, fuzzy, c-format
-msgid "Mounting partition %s"
-msgstr "正在格式化分割區 %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "將 %s 分割區掛載於 %s 目錄時發生錯誤"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "檢查 %s"
-
-#: fs.pm:792 partition_table.pm:639
-#, c-format
-msgid "error unmounting %s: %s"
-msgstr "卸下 %s 的掛載時發生錯誤： %s"
-
-#: fs.pm:824
-#, fuzzy, c-format
-msgid "Enabling swap partition %s"
-msgstr "正在格式化分割區 %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "小於 16MB 的分割區不能使用 JFS 格式"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr ""
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "小於 32MB 的分割區不能使用 ReiserFS 格式"
 
 #: fsedit.pm:25
 #, c-format
@@ -2670,9 +2864,9 @@ msgstr ""
 #: fsedit.pm:30
 #, c-format
 msgid "server"
-msgstr ""
+msgstr "伺服器"
 
-#: 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"
@@ -2683,205 +2877,189 @@ msgid ""
 "Do you agree to lose all the partitions?\n"
 msgstr ""
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "小於 16MB 的分割區不能設成 JFS 格式"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "小於 32MB 的分割區不能設成 ReiserFS 格式"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
-msgstr "指定的掛載點需以 / 開頭"
+msgstr "掛載點必需以 / 開頭"
 
-#: fsedit.pm:545
-#, fuzzy, c-format
+#: fsedit.pm:386
+#, c-format
 msgid "Mount points should contain only alphanumerical characters"
-msgstr "列印機的名稱應該只有包含英文字母、數字與底線這類字元"
+msgstr "掛載點應該只有包含英文字母與數字與底線這類字元"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "已經有分割區分配到掛載點 %s 了\n"
 
-#: fsedit.pm:548
-#, fuzzy, c-format
+#: fsedit.pm:389
+#, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"你已經選擇了一塊 software RAID 的分割區當作為 根分割區 (/) 的掛載點\n"
-"您要另外劃分一個不是在 software RAID 的分割區作為 /boot 的掛載點使用，\n"
-"如此開機管理程式才能夠正常啟動您的系統。"
+"你已經選擇了一塊軟體磁碟陣列的分割區當作為根分割區 (/) 的掛載點.\n"
+"沒有 /boot 分割區, 開機載入器不可能處理這種情況.\n"
+"請確定會增加一個 /boot 分割區"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "您不能使用 LVM Logical Volume 來最為 %s 的掛載點"
 
-#: fsedit.pm:553
-#, fuzzy, c-format
+#: fsedit.pm:394
+#, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
 "The bootloader is not able to handle this without a /boot partition.\n"
 "Please be sure to add a /boot partition"
 msgstr ""
-"你已經選擇了一塊 software RAID 的分割區當作為 根分割區 (/) 的掛載點\n"
-"您要另外劃分一個不是在 software RAID 的分割區作為 /boot 的掛載點使用，\n"
-"如此開機管理程式才能夠正常啟動您的系統。"
+"你已經選擇了一塊 LVM Logical Volume 當作為根分割區 (/) 的掛載點.\n"
+"沒有 /boot 分割區, 開機載入器不可能處理這種情況.\n"
+"請確定會增加一個 /boot 分割區"
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "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 "這個目錄應該放在 / 檔案系統才對"
+msgstr "這個目錄應該放在根檔案系統 (/) 才對"
 
-#: 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 "
 "point\n"
 msgstr ""
-"您需要一個真正的分割區 (ext2/ext3, reiserfs, xfs 或是 jfs) 來放這個掛載點\n"
+"您需要一個真正的檔案系統 (ext2/ext3, reiserfs, xfs 或是 jfs) 來放這個掛載點\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
-msgstr "您不能使用編密過的檔案系統來最為 %s 的掛載點"
+msgstr "您不能使用加密過的檔案系統來最為 %s 的掛載點"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "沒有足夠的空間能夠自動配置"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "沒有做任何動作"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr "正在開啟 %s 以寫入檔案時發生錯誤： %s"
+msgstr "正在開啟 %s 以寫入 %s 時發生錯誤"
 
-#: harddrake/data.pm:55
-#, fuzzy, c-format
+#: harddrake/data.pm:61
+#, c-format
 msgid "Floppy"
-msgstr "開機片"
+msgstr "軟片"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
-#, fuzzy, c-format
+#: harddrake/data.pm:81
+#, c-format
 msgid "Disk"
-msgstr "丹麥"
+msgstr "軟片"
 
-#: harddrake/data.pm:84
-#, fuzzy, c-format
+#: harddrake/data.pm:90
+#, c-format
 msgid "CDROM"
-msgstr "於 CDROM 裝置"
+msgstr ""
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
-msgstr ""
+msgstr "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 "磁帶"
 
-#: harddrake/data.pm:123
-#, fuzzy, c-format
+#: harddrake/data.pm:129
+#, c-format
 msgid "Videocard"
-msgstr "顯示模式"
+msgstr "顯示卡"
 
-#: harddrake/data.pm:133
-#, fuzzy, c-format
+#: harddrake/data.pm:139
+#, c-format
 msgid "Tvcard"
 msgstr "電視卡"
 
-#: harddrake/data.pm:142
-#, fuzzy, c-format
+#: harddrake/data.pm:148
+#, c-format
 msgid "Other MultiMedia devices"
-msgstr "其他裝置"
+msgstr "其他多媒體裝置"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "音效卡"
 
-#: 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 ""
+msgstr "處理器"
 
-#: harddrake/data.pm:183
-#, fuzzy, c-format
+#: harddrake/data.pm:191
+#, c-format
 msgid "ISDN adapters"
-msgstr "內部 ISDN 介面卡"
+msgstr "ISDN 介面卡"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
-msgstr "Ethernetcard"
+msgstr "乙太網路介面卡"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
-#, fuzzy, c-format
+#: harddrake/data.pm:219 network/netconnect.pm:484
+#, c-format
 msgid "Modem"
-msgstr "型號"
+msgstr "數據機"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
-msgstr ""
+msgstr "ADSL 介面卡"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
-msgstr ""
+msgstr "AGP 控制器"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
-msgstr ""
+msgstr "橋樑與系統控制器"
 
-#: 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 "列印機"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "滑鼠"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2890,83 +3068,107 @@ msgstr ""
 #: harddrake/data.pm:281
 #, c-format
 msgid "(E)IDE/ATA controllers"
-msgstr ""
+msgstr "(E)IDE/ATA 控制器"
 
 #: harddrake/data.pm:290
 #, c-format
 msgid "SATA controllers"
-msgstr ""
+msgstr "SATA 控制器"
 
 #: harddrake/data.pm:299
 #, c-format
 msgid "Firewire controllers"
-msgstr ""
+msgstr "Firewire 控制器"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "PCMCIA 控制器"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
-msgstr ""
+msgstr "SCSI 控制器"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
-msgstr ""
+msgstr "USB 控制器"
 
-#: harddrake/data.pm:326
-#, fuzzy, c-format
+#: harddrake/data.pm:339
+#, c-format
 msgid "USB ports"
-msgstr "，USB 列印機"
+msgstr "USB 埠"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
+msgstr "SMBus 控制器"
+
+#: harddrake/data.pm:357
+#, c-format
+msgid "UPS"
 msgstr ""
 
-#: harddrake/data.pm:344
+#: 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 "鍵盤"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "滑鼠"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
-msgstr "選取您的掃描器"
+msgstr "掃描器"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
-msgstr "未知|一般"
+msgstr "未知/其他"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr ""
 
-#: 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 "請稍待... 正在套用該設定"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
-msgstr "不使用另外可供選擇的驅動程式"
+msgstr "無另外可供選擇的驅動程式"
 
-#: 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 "
 "currently uses \"%s\""
-msgstr "目前的OSS/ALSA 驅動程式都能夠支援你的音效卡 (%s)，模組為 \"%s\""
+msgstr ""
+"目前沒有另外可供選擇的 OSS/ALSA 驅動程式支援你的音效卡 (%s)\n"
+"正在使用 \"%s\""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
-msgstr "音效組態"
+msgstr "音效設定"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
-msgstr "您可以選擇使用 OSS 或者 ALSA 的音效卡驅動程式項目工您的音效卡使用 (%s)"
+msgstr "您可以選擇使用另外的 (OSS 或者 ALSA) 的驅動程式給您的音效卡 (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -2974,8 +3176,11 @@ msgid ""
 "Your card currently use the %s\"%s\" driver (default driver for your card is "
 "\"%s\")"
 msgstr ""
+"\n"
+"\n"
+"您的卡現在正在使用 %s\"%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 "
@@ -2995,64 +3200,65 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: 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 "驅動程式："
+msgstr "驅動程式:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "疑難排解"
 
-#: 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 ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
-msgstr "無已知的驅動程式"
+msgstr "無開放原始碼的驅動程式"
 
-#: harddrake/sound.pm:235
-#, fuzzy, c-format
+#: harddrake/sound.pm:255
+#, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
-msgstr "目前的OSS/ALSA 驅動程式都能夠支援你的音效卡 (%s)，模組為 \"%s\""
+msgstr "您的音效卡 (%s) 沒有自由的驅動程式, 但是有專利的驅動程式於 \"%s\"."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "無已知的驅動程式"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr "尚未有任何提供您使用的音效卡驅動程式 (%s)"
+msgstr "您使用的音效卡尚未有已知的驅動程式 (%s)"
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "未知的驅動程式"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "錯誤: 你的音效卡驅動程式 \"%s\" 沒有列出"
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr ""
 
-#: 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"
@@ -3076,17 +3282,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
-msgstr "選擇任何驅動程式"
+msgstr "讓我選擇任何驅動程式"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
-msgstr ""
+msgstr "正在選擇任意的驅動程式"
 
-#: 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 "
@@ -3109,12 +3316,12 @@ msgstr "未知|一般"
 #: harddrake/v4l.pm:105
 #, c-format
 msgid "Unknown|CPH05X (bt878) [many vendors]"
-msgstr "未知|CPH05X (bt878)"
+msgstr "未知|CPH05X (bt878) [許多賣主]"
 
 #: harddrake/v4l.pm:106
 #, c-format
 msgid "Unknown|CPH06X (bt878) [many vendors]"
-msgstr "未知|CPH06X (bt878) [many vendors]"
+msgstr "未知|CPH06X (bt878) [許多賣主]"
 
 #: harddrake/v4l.pm:309
 #, c-format
@@ -3124,24 +3331,25 @@ msgid ""
 "If your card is misdetected, you can force the right tuner and card types "
 "here. Just select your tv card parameters if needed."
 msgstr ""
-"目前 GNU/Linux 核心的 bttv 模組能夠正確的偵測處理目前大部分的 TV 卡.\n"
-"若是無法正確偵測出來 TV 卡的話, 您可以在這邊強制正確的調頻與卡型.若需要則選"
-"擇 TV 卡參數."
+"對於目前大部分的 TV 卡, GNU/Linux 核心的 bttv 模組能夠正確的偵測\n"
+"處理參數.\n"
+"若是無法正確偵測出來您的 TV 卡的話, 您可以在這邊強制正確的調頻與卡型. 若需要"
+"的話請選擇 TV 卡參數."
 
 #: harddrake/v4l.pm:312
 #, c-format
 msgid "Card model:"
-msgstr "介面卡模組："
+msgstr "卡模型:"
 
 #: harddrake/v4l.pm:313
 #, c-format
 msgid "Tuner type:"
-msgstr "Tuner 類型："
+msgstr "調頻類型:"
 
 #: harddrake/v4l.pm:314
 #, c-format
 msgid "Number of capture buffers:"
-msgstr "擷取緩衝的數量："
+msgstr "擷取緩衝的數量:"
 
 #: harddrake/v4l.pm:314
 #, c-format
@@ -3151,80 +3359,78 @@ msgstr ""
 #: harddrake/v4l.pm:316
 #, c-format
 msgid "PLL setting:"
-msgstr "PLL 設定："
+msgstr "PLL 設定:"
 
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "Radio support:"
-msgstr "Radio 支援："
+msgstr "Radio 支援:"
 
 #: harddrake/v4l.pm:317
 #, c-format
 msgid "enable radio support"
-msgstr "開啟 radio 支援"
+msgstr "啟用 radio 支援"
 
 #: help.pm:11
-#, fuzzy, c-format
+#, 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 ""
-"在進行下面動作前，您已經仔細的閱讀下面相關版權條款。\n"
-"這包含整個「Mandrake-Linux-Distriubtion」版權內容，而若是您不同意內文所提及的"
-"相關版權條款宣告，您可以點選『拒絕』按鈕放棄，安裝程式將會立即結束。若是您接"
-"受的話，可以點選『接受』按鈕以便於繼續進行下面的安裝。 "
+"在繼續之前, 您應該仔細的閱讀下面相關版權條款.\n"
+"這包含整個 Mandrakelinux distriubtion 版權內容. 若是您同意裡面的\n"
+"全部條款, 點選\"%s\" 按鈕. 否則點選 \"%s\" 按鈕將會重新開機."
 
-#: 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 "接受"
 
 #: help.pm:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
-"「GNU/Linux」是一個多使用者的系統, 簡單說每個使用者都有其獨立的\n"
+"GNU/Linux 是一個多使用者的系統, 簡單說每個使用者都有其獨立的\n"
 "喜好設定, 他們的檔案等等. 您可以閱讀 ``Starter Guide 初學者導覽''\n"
-"以便於學習有關多使用者系統. 不同於系統管理者 \"root\" \n"
+"以便於學習有關多使用者系統. 不同於系統管理者 \"root\"\n"
 "此時你新增的使用者將不被授權於改變除了他們的檔案\n"
 "與設定, 以保護系統免於非故意的或惡意的\n"
 "對系統造成衝擊的改變. 您需要建立至少\n"
@@ -3256,25 +3462,30 @@ msgstr ""
 "電腦開機時可以自動登入系統的使用者. 若\n"
 "你對那個特色有興趣 (且不太關心本地端\n"
 "安全性), 選擇希望的使用者與視窗管理員, 然後點選 \"%s\".\n"
-"若你對這個特色有沒有興趣, 反選取 \"%s\" 盒子."
+"若你對這個特色有沒有興趣, 不選取 \"%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 "使用者名稱"
+
+#: 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 "下一步"
 
-#: 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 "進階"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3307,21 +3518,20 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"目前所列出來的是程式偵測到目前的分割區狀態。\n"
-"怎麼劃分分割區來使用，您可以簡單選擇精靈模式讓安裝程式幫您\n"
-"自動決定怎麼劃分，一般來說都能夠得到不錯的分配方式。\n"
-"如果您手動處理分割區劃分的話，記得您至少要定義出一塊當作 /\n"
-"分割區來使用。\n"
-"目前偵測到您的硬碟上有多個 Windows 分割區，請選擇您希望要縮小 Windows\n"
-"的分割區，以便於把空間挪出來安裝 Mandrakelinux 作業系統。\n"
+"目前所列出來的是硬碟機上偵測到已經存在的的 Linux 分割區.\n"
+"您可以保留巫師模式做的選擇, 因為他們對一般安裝是不錯的.\n"
+"如果您做任何改變的話, 您至少要定義出一塊當作根分割區 (\"/\").\n"
+"別選擇一個太小的分割區, 否則您將無法安裝足夠的軟體.\n"
+"如果您想儲存您的資料到一個分離的分割區, 你需要建立一個\"/home\" 分割區\n"
+"(只在您有多於一個 Linux 分割區情況下才可能).\n"
 "\n"
-"下列每個分割區都列出了: \"名稱\", \"容量\"。\n"
+"下列每個分割區都列出了: \"名稱\", \"容量\".\n"
 "\n"
-"\"名稱\" 都是有統一的命名方式: \"硬碟類型\"，\"硬碟編號\"，\n"
-"\"分割區編號\" (比方，\"hda1\")。\n"
+"\"名稱\" 都是有統一的命名方式: \"硬碟類型\", \"硬碟編號\", \n"
+"\"分割區編號\" (例如, \"hda1\").\n"
 "\n"
-"\"硬碟類型\" 部份，IDE 硬碟使用 \"hd\"，SCSI 則是 \"sd\"。\n"
-"\"硬碟編號\" 部份，伴隨在 \"hd\" 或者是 \"sd\" 後面，比方\n"
+"\"硬碟類型\" 部份, IDE 硬碟使用 \"hd\", SCSI 則是 \"sd\".\n"
+"\"硬碟編號\" 部份, 伴隨在 \"hd\" 或者是 \"sd\" 後面:\n"
 "\n"
 " * \"a\" 這是指 \"primary IDE controller 上第一台 (master) 硬碟\",\n"
 "\n"
@@ -3329,41 +3539,49 @@ msgstr ""
 "\n"
 " * \"c\" 這是指 \"secondary IDE controller 上第一台 (master) 硬碟\",\n"
 "\n"
-" * \"d\" 這是指 \"secondary IDE controller 上第二台 (slave) 硬碟\"。\n"
+" * \"d\" 這是指 \"secondary IDE controller 上第二台 (slave) 硬碟\".\n"
 "\n"
-"以 SCSI 硬碟來說，\"a\" 就是指 \"SCSI IDE 編號最小的那一台\", \"b\"\n"
-"就是指 \"SCSI IDE 編號為二的那一台硬碟\"，然後依此類推下去....."
+"以 SCSI 硬碟來說, \"a\" 就是指 \"SCSI ID 編號最小的那一台\", \"b\"\n"
+"就是指 \"SCSI ID 編號為第二小的那一台硬碟\", 然後依此類推下去."
 
-#: help.pm:86
-#, fuzzy, c-format
+#: help.pm:85
+#, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
-"Mandrakelinux 安裝片包含數張光碟片。DrakeX\n"
-"知道是否一個所選擇的套件是位於另一張光碟, 所以他會彈出\n"
-"現在的光碟且要求您放入所要求的正確光碟片."
+"Mandrakelinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"
+"DrakeX 會彈出現在的光碟且要求您放入所要求的正確光碟片.\n"
+"若您沒有要求的光碟在手上的話, 就按下 \"%s\", 對應的套件不會被安裝."
 
-#: 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"
@@ -3373,9 +3591,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"
@@ -3385,217 +3613,200 @@ 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"
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
+msgstr ""
+"現在是指定那個程式您想要裝在您的系統上. Mandrake Linux 有上千個套件,\n"
+"為了簡單管理, 相似性質的應用程式已經被分類到群組裡.\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"
+"Mandrakelinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
+"所以一個 ``工作站''安裝也能安裝``伺服器''範疇安裝的應用程式.\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 ""
+" * \"%s\": 如果您計畫用您的機器當作一個工作站, 選擇一個或\n"
+"更多的群組於工作站範疇.\n"
+"\n"
+" * \"%s\": 如果您計畫用您的機器來程式設計, 選擇適當\n"
+"的群組於那個範疇. 特別的 \"LSB\" 群組將設定您的系統使之盡量符合\n"
+"Linux Standard Bases 規範.\n"
+"\n"
+"   選擇 \"LSB\" 群組除了預設的 \"2.6\" 也將安裝 \"2.4\" 核心系列,\n"
+"這是確保系統的 100%%-LSB compliance. 可是, 如果您不選擇 \"LSB\"\n"
+"群組您仍然將有一個幾乎 100%% LSB-compliant 的系統.\n"
+"\n"
+" * \"%s\": 如果您的機器是要用作伺服器, 選擇那一個\n"
+"更常用的服務您想裝在系統上.\n"
+"\n"
+" * \"%s\": 這是您選擇您的偏好的圖形環境的地方.\n"
+"如果您像要有圖形介面可用, 至少一個要被選擇.\n"
+"\n"
+"移動滑鼠游標到一個群組上方將顯示一段關於該群組簡短的解釋文字\n"
+"text about that group.\n"
+"\n"
+"你能選取 \"%s\" 方塊盒, 若您對所提供的套件熟悉或您想要有對於什麼\n"
+"將被安裝有全部控制, 這將會有用\n"
+"\n"
+"若您用 \"%s\" 模式開始安裝, 你可以取消選擇全部群組且防止安裝任何新套件.\n"
+"這對修復或更新一個已經存在的系統很有用.\n"
+"\n"
+"如果當您執行一個一般正常安裝, 您取消選擇全部群組 (相反於一個升級),\n"
+"一個對話方塊將會跳出建議不同的選項給最小安裝:\n"
+"\n"
+" * \"%s\": 安裝最少的套件來擁有可工作的圖形桌面.\n"
+"\n"
+" * \"%s\": 安裝系統基礎加上基本的工具與其文件\n"
+"這種安裝適合於設定起來一個伺服器.\n"
+"\n"
+" * \"%s\": 將安裝絕對最少套件必要於使一個 Linux 系統工作.\n"
+"用這個安裝您將只擁有一個命令列介面. 全部安裝大小大約 65 megabytes."
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
-msgstr "工作站平台"
+msgstr "工作站"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
-msgstr "程式開發平台"
+msgstr "程式開發"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
-msgstr "圖形介面環境"
+msgstr "圖形環境"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
 #, c-format
-msgid "With X"
-msgstr "包含 X 環境"
+msgid "Individual package selection"
+msgstr "選取單一套件"
 
-#: help.pm:137
+#: help.pm:146 help.pm:588
 #, c-format
-msgid "With basic documentation"
-msgstr "包含基本的說明文件 (建議)"
+msgid "Upgrade"
+msgstr "升級"
 
-#: help.pm:137
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
-msgid "Truly minimal install"
-msgstr "最小安裝"
+msgid "With X"
+msgstr "包含 X 環境"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
+#: help.pm:146
 #, c-format
-msgid "Individual package selection"
-msgstr "選取單一套件"
+msgid "With basic documentation"
+msgstr "包含基本的說明文件"
 
-#: help.pm:137 help.pm:602
+#: help.pm:146
 #, c-format
-msgid "Upgrade"
-msgstr "升級"
+msgid "Truly minimal install"
+msgstr "真的最小安裝"
 
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 
-#: 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 "否"
 
-#: 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 "是的"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
-msgstr ""
+msgstr "自動相依性"
 
-#: help.pm:175
-#, fuzzy, 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 ""
-"你現在將設定您的網際網路/網路的連線. 若是您希望\n"
-"連接您的電腦到網際網路或區域網路, 點選 \"%s\".\n"
-"Mandrakelinux 將嘗試自動偵測網路裝置與數據機. 若\n"
-"這偵測失敗, 反選取 \"%s\" 項目. 您亦可選擇不要\n"
-"設定網路或者是希望事後再設定, 請點選 \"%s\"\n"
-"按鈕即可帶您到下一步.\n"
-"\n"
-"當設定您的網路, 可用的選項有:\n"
-"傳統的數據機, ISDN數據機, ADSL 的連線, cable modem, 以及最後\n"
-"簡單的 LAN 連線 (Ethernet 乙太網路).\n"
-"\n"
-"我們將不詳細列出每一個設定選項 - 只要確定您有\n"
-"全部的參數, 如 IP 位址, 預設 gateway, DNS 伺服器等等.\n"
-"由您的網際網路服務提供商或系統管理員.\n"
-"\n"
-"您可以諮詢 ``Starter Guide 初學者指導'' 有關網際網路的連線\n"
-"章節的設定詳細資料, 或是簡單的等待直到系統被\n"
-"安裝好且使用描述於那裡的程式來設定連線."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "使用自動偵測"
-
-#: 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 ""
 
-#: 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 "設定"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
-"接下來您需要選擇你打算於啟動系統時要讓那些服務執行運作。\n"
+"這個對話視窗用來選擇你打算於啟動系統時執行運作的服務.\n"
 "\n"
-"所出現的所有可選擇項目，都是安裝過程中所安裝進去的相關系統服務套件。請仔細詳"
-"細查看決定那些服務要讓它於開機時能夠啟動。\n"
+"DrakX 將列出在現在安裝上可選擇的服務項目. 仔細詳細回顧查看每一個\n"
+"且取消選取那些開機時不會用到的.\n"
 "\n"
-"當你選取該項目時，螢幕旁邊會出現一個簡略說明，告訴您這個服務項目的用途。對"
-"了，若是您對於該項目實在不確定是否要啟用的話，比較安全的作法就是維持原樣不要"
-"動作即可。\n"
+"當你選取該項目時, 會出現一個簡略說明文字. 但是若是您對於該項目\n"
+"實在不確定是否要啟用的話, 比較安全的作法就是維持原樣不要動作即可.\n"
 "\n"
-"請注意一下，如果您這台機器是專門要當作Internet伺服器提供網路上相關服務的話，"
-"建議您詳細思考決定那些服務要開啟關閉，因為某些服務套件啟動後可能會有一些潛在"
-"的安全性風險問題。建議您，只選取要你開放的服務項目即可。"
+"!! 在這階段, 請小心如果您這台機器是要當作伺服器: 您大概不想要\n"
+"開啟那些您不用的服務. 請記得某些服務在伺服器上啟動後可能會有危險.\n"
+"大致上只選那些你真正需要的服務. !!"
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3603,72 +3814,74 @@ 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 ""
 
-#: 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 "硬體時鐘設定為 GMT 時間"
 
-#: help.pm:235
-#, fuzzy, c-format
+#: help.pm:217
+#, c-format
 msgid "Automatic time synchronization"
-msgstr "自動透過 NTP 服務校時"
+msgstr "自動時間同步"
 
-#: 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 ""
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3677,235 +3890,237 @@ 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: help.pm:324
-#, fuzzy, c-format
+#: help.pm:308
+#, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
-"最後的時候，你應該會看到詢問您是否要在開機完成後\n"
-"直接進入圖形登入介面。一般我們建議，若是您的電腦\n"
-"是用來當作伺服器使用的話，這個項目可以選擇『否』，\n"
-"因為一般 Server 伺服器並不跑 X 環境執行相關GUI圖形\n"
-"介面軟體程式。"
+"選項\n"
+"\n"
+"   這個步驟允許您選擇是否想要您的機器開機時自動跳到圖形介.\n"
+"顯然地, 如果您的機器是當作一個伺服器或您不能成功地設定顯示,\n"
+"您想核對選取 \"%s\"."
 
-#: help.pm:332
-#, fuzzy, c-format
+#: help.pm:316
+#, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"於這裡, 您需要決定那裡你想要安裝 Mandrakelinux\n"
-"作業系統於硬碟. 如果您的硬碟是全新尚未使用或\n"
+"您需要決定那裡你想要安裝 Mandrakelinux\n"
+"作業系統於那個硬碟. 如果您的硬碟是全新尚未使用或\n"
 "已經存在的作業系統正在使用全部可被利用的空間, 您將\n"
 "必須進行分割硬碟的動作. 基本上, 分割硬碟的動作包含\n"
 "邏輯上劃分它以建立需要的空間來安裝您的新\n"
-"Mandrakelinux 系統\n"
+"Mandrakelinux 系統.\n"
 "\n"
 "因為分割硬碟的動作程序通常是無法回復的\n"
-"且若已經有一存在的作業系統安裝於磁碟上,\n"
-"則能導致資料遺失, 若您是一位不熟練的使用者,\n"
+"且能導致資料遺失, 若您是一位不熟練的使用者,\n"
 "割硬碟的動作是脅迫恫嚇與充滿著緊張壓力的. 幸運的是\n"
-"DrakX 包含精靈模式以簡化次程序. 於繼續此步驟前,\n"
+"DrakX 包含巫師模式以簡化這程序. 於繼續此步驟前,\n"
 "先詳細閱讀其他部份與全部, 慢慢來.\n"
 "\n"
 "根據您的硬碟設定值, 有數個選項可用:\n"
 "\n"
-" * \"%s\": 該項目將會執行自動劃分您空白的磁碟.\n"
+" * \"%s\". 該項目將會執行自動劃分您空白的磁碟.\n"
 "若您使用此選項, 將沒有進一步的提示.\n"
 "\n"
-" * \"%s\": 精靈模式已經偵測一個或更多存在的 Linux 硬碟\n"
+" * \"%s\". 巫師模式已經偵測一個或更多已經存在的 Linux 硬碟\n"
 "分割. 若您想要使用他們, 選此選項. 您將會\n"
 "被要求選擇關於每一個分割的掛載點.\n"
 "就有的掛載點預設為被選擇, 且大部分最好保留\n"
 "他們.\n"
 "\n"
-" * \"%s\": 若您硬碟有安裝 Microsoft Windows 且佔據\n"
+" * \"%s\". 若您硬碟有安裝 Microsoft Windows 且佔據\n"
 "全部可用剩餘可用的空間, 您將必須建立自由空間給\n"
-"Linux. 為了達到目的, 您可以刪除 Microsoft Windows 分割與資料\n"
-"(見 ``Erase entire disk 消除整個磁碟'' 解決方案) 或是\n"
-"重新調整 Microsoft Windows FAT 分割區大小. 重新調整分割\n"
-"可以被執行於不遺失任何資料, 若您已經 defragment\n"
-"(不連續碎片重新整理) Windows分割且它用 FAT 格式. 資料備份\n"
-"是被強烈建議的. 若您想要使用 Mandrakelinux and Microsoft\n"
-"Windows 於同一台電腦, 使用此選項是被強烈建議的.\n"
+"GNU/Linux. 為了達到目的, 您可以刪除 Microsoft Windows 分割與資料\n"
+"(見 ``Erase entire disk (消除整個磁碟)'' 解決方案) 或是\n"
+"重新調整 Microsoft Windows FAT 或 NTFS 分割區大小.\n"
+"若您已經 defragment(不連續碎片重新整理) Windows 分割\n"
+"且它用 FAT 格式.重新調整分割可以被執行於不遺失任何資料\n"
+"資料備份是被強烈建議的. 若您想要使用 Mandrakelinux and Microsoft\n"
+"Windows 於同一台電腦, 使用此選項是被建議的.\n"
 "\n"
 "   選擇此選項前, 請了解當使用這個過程項目後, Microsoft Windows\n"
 "分割可用的剩餘空間將會比之前減少. 您將有較少的自由空間於\n"
 " Microsoft Windows 來存您的資料與安裝新軟體.\n"
 "\n"
-" * \"%s\": 如果您想要刪除全部現存於您的硬碟上資料與\n"
+" * \"%s\". 如果您想要刪除全部現存於您的硬碟上資料與\n"
 "分割且以您的新 Mandrakelinux 系統替換他們,\n"
 "選此選項. 但是小心使用, 你將無法於你確認之後\n"
 "逆反你的決定.\n"
 "\n"
 "   !! 若你選此選項, 全部於你的磁碟上的資料將會被刪除. !!\n"
 "\n"
-" * \"%s\": 此選項簡單的消除一切於磁碟中的資料且開始新鮮,\n"
-"從頭開始分割一切. 全部於你的磁碟上的資料將會遺失.\n"
+" * \"%s\". 當硬碟完全被 Microsoft Windows 佔據時出現此選項.\n"
+"選擇此選項將會簡單地消除一切於磁碟中的資料且從新開始,\n"
+"從頭開始分割一切.\n"
 "\n"
 "   !! 若你選此選項, 全部於你的磁碟上的資料將會遺失. !!\n"
 "\n"
-" * \"%s\": 選這個選項若您想要手動分割您的硬碟.\n"
+" * \"%s\". 選這個選項若您想要手動分割您的硬碟.\n"
 "請小心使用 -- 它是強力的但是危險的選擇且您可能非常\n"
-"容易遺失您的全部資料. 這為何此選項事實上只於若\n"
+"容易遺失您的全部資料. 這是為何此選項事實上只於\n"
 "您曾經做過類似於此且有些許經驗的時候被建議.\n"
 "更多指令於如何使用 DiskDrake 工具, 指向\n"
-" ``Starte Guide 初學者指導'' 的\n"
-"``Managing Your Partitions 管理您的分割'' 部份."
+"``Starter Guide (初學者指導)''的\n"
+"``Managing Your Partitions (管理您的分割)'' 部份."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "使用未用到的空間"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "使用已經存在的分割區"
 
-#: 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 "使用 Windows 分割區所剩餘的可用空間"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "刪除所有磁碟內容"
 
-#: help.pm:389
-#, fuzzy, c-format
+#: help.pm:374
+#, c-format
 msgid "Remove Windows"
-msgstr "移除 Windows(TM)"
+msgstr "移除 Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "自訂磁碟分割"
 
-#: help.pm:392
-#, fuzzy, c-format
+#: help.pm:377
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -3913,177 +4128,172 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
-msgstr ""
-"當整個安裝步驟到這裡的時候，那就代表您已經完成了『GNU/Linux』系統的安裝步驟，"
-"您可以點選『確定』重新啟動電腦。\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"
-"＊『進階』按鈕項目(專家模式才會出現)，將會顯示兩個可用的項目讓您選擇:\n"
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
+"/dev/fd0\"."
+msgstr ""
+"整個安裝步驟到這裡代表您安裝已經完成了且 GNU/Linux 系統準備好被使用.\n"
+"只要點選 \"%s\" 來重新啟動系統. 別忘了移除安裝媒體 (光碟或軟片).\n"
+"於您的電腦完成硬體測試後您第一個見到的是開機載入器選單,\n"
+"給您開始那個作業系統的選擇\n"
+" \"%s\" 按鈕顯示另兩個按鈕到:\n"
 "\n"
-" ＊ 『產生自動安裝磁片』：這將會建立一張能夠自動安裝的磁片，\n"
-"整個自動化安裝的步驟，將會依照您的操作過程來進行。\n"
+"* \"%s\": 使您建立一個安裝軟片, 一張不需要操作手的幫助\n"
+"就能夠自動執行全部安裝的軟片, 類似於您剛剛設定的安裝一樣.\n"
 "\n"
-"  請注意這邊，當您點選這個項目後，可以看到還有兩個參數項目可供選擇:\n"
+"   注意按下那個按鈕後有兩個不同的選項可供選擇:\n"
 "\n"
-"   ＊『重播』：這是半自動安裝方式，磁碟分割項目將會維持手動方式操作。\n"
+"    * \"%s\". 這是半自動安裝方式, 磁碟分割項目將是唯一維持手動方式操作.\n"
 "\n"
-"   ＊『自動化』：這是全自動的安裝方式，包含磁碟等危險動作都會自動處理。\n"
+"    * \"%s\". 這是全自動的安裝方式: 硬碟將完全被重新寫入, 全部資料遺失.\n"
 "\n"
-"  這裡的功能，對於您需要大量安裝很多Linux系統在一大群機器上的話來說這是相當有"
-"幫助的。關於這裡相關進一步資料，您可以參考網頁上自動安裝章節的相關說明。\n"
+"   這功能對於需要大量安裝很多相似機器上的話來說這是相當實用.\n"
+"可以參考我們網頁上自動安裝章節的更多資訊.\n"
 "\n"
-" ＊ 『儲存套件選擇』(*)：這個項目就是將您先前操作選擇所要安裝的套件清單項目都"
-"紀錄起來存放到磁片內，以便於您可以在事後還需要安裝Mandrakelinux 時，可以直接"
-"載入先前所選擇要安裝的套件清單，不需要再一次重新選擇了。\n"
-"若是您要使用這張磁片紀錄的套件清單進行安裝的話，開機時出現『Mandrake Logo』"
-"時，按下 F1 按件，然後輸入「linux defcfg=\"floppy\"」 即可。\n"
+" * \"%s\"(*): 儲存一個於這安裝時選擇的套件清單.\n"
+"要用這些選擇於另一個安裝, 插入軟片且開始安裝. 於提示時按下 F1 按鍵,\n"
+"然後輸入 >>linux defcfg=\"floppy\"<< 按下 [Enter] 鍵.\n"
 "\n"
-"(＊) 要使用『儲存套件選擇』功能，您需要一張已經使用DOS/Windows等格式化好的 "
-"FAT 格式磁片以便於使用。(GNU/Linux 環境下，可以用 mformat a: 製作一張空白磁"
-"片。)"
+"(*) 您需要一個 FAT-formatted 軟片. 要建立一張於於GNU/Linux 環境下,\n"
+"鍵入 \"mformat a:\", 或 \"fdformat /dev/fd0\" 然後 \"mkfs.vfat /dev/fd0\"."
 
-#: help.pm:418
-#, fuzzy, c-format
+#: help.pm:409
+#, c-format
 msgid "Generate auto-install floppy"
-msgstr "製作自動安裝磁片"
+msgstr "產生自動安裝軟片"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "重播"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "自動化"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
-msgstr "儲存所選取的檔案"
+msgstr "儲存套件選擇"
 
-#: help.pm:421
-#, fuzzy, c-format
+#: help.pm:412
+#, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"任何新建立的分割區都必須格式化後才能夠來使用。(格式化包含建立檔案系統)。\n"
-"\n"
-"當然，這時候您也可以選擇格式化這些已經存在的分割區，那原本裡面的資料都將會消"
-"失。若是要使用此項目，請選擇要格式化的分割區。請注意一下，並不是所有先前已經"
-"存在的分割區都得重新格式化，通常您也許會將系統劃分出許多分割區當作不同的用"
-"途，比方把 「\\」、「usr」、「/var」與「/home」獨立劃分一個分割區使用。那這個"
-"情況，使用者「/home」分割區上面存放許多的資料，那您就選擇不需要重新格式化。\n"
+"如果您選擇去重新使用某些 GNU/Linux 分割, 您或許想要重新格式化他們\n"
+"且抹去任何他們包含的資料. 要的話, 請選擇那些分割.\n"
+"請注意一下, 並不是所有先前已經存在的分割區都得重新格式化,\n"
+"您必須重新格式化包含作業系統的分割 (例如 \"/\", \"/usr\" or \"/var\")\n"
+"但是您不需要重新格式化包含您想保留資料的分割 (通常是 \"/home\").\n"
 "\n"
-"當您要選擇要格式化的分割區時，請小心選擇，因為選錯的話，您的資料將會一去無"
-"回，再也無法救回來了，因此您要特別小心選擇。\n"
+"請小心選擇分割. 當格式化完成時, 全部在選擇分割上得資料將被刪除且\n"
+"您將不行重新恢復它.\n"
+"當您準備好要格式化此分割, 點選 \"%s\".\n"
 "\n"
-"當您選擇好後，請點選『%s』，安裝程式會進行格式化的動作。\n"
-"\n"
-"若是您點選了『%s』，那將會會到先前的操作步驟，繼續選擇要安裝的分割區，假設您"
-"點選了『%s』的項目後，將會提供是否要進行壞軌掃描動作的選項。"
+"若您想選擇另一個分割給您的新的 Mandrakelinux 作業系統安裝, 點選了\"%s\".\n"
+"若您想選擇要被檢查磁碟上壞的區塊的分割, 點選.\"%s\"."
 
-#: 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 "上一步"
 
-#: help.pm:447
-#, fuzzy, c-format
+#: help.pm:434
+#, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
-"這時候您已經完成Mandrake-Linux的安裝了，接下來安裝程式將會安排您進行後續的套"
-"件更新安裝。每一版 Linux 安裝套件發行後，若是遇到有相關套件有任何的安全性問題"
-"或者是臭蟲時，Linux 廠商都會發佈安全公告並釋放出相關更新套件提供給使用者安裝"
-"更新。為了確保您系統的安全，安裝程式能夠讓您在安裝好基本系統後，現在就立即透"
-"過網路連線取得更新套件進行安裝。若是您打算要安裝更新套件的話，請選擇「%s」，"
-"取消的話請選擇「%s」。\n"
+"此時您安裝 Mandrakelinux 時, 或許自從初始釋出的某些套件將有更新.\n"
+"臭蟲或許已經修正了, 安全性問題解決了. 為了允許您從這些更新中\n"
+"獲得利益, 您現在可以由網際網路下載他們. 如果您有可用的網際網路連線,\n"
+"選取 \"%s\", 或是, 如果您想稍後安裝更新套件, 選取 \"%s\".\n"
 "\n"
-"當你選擇「%s」時，系統將會顯示可供更新的站台清單資訊讓您選擇，請您選擇一個離"
-"您比較靠近的站台。接下來安裝程式會連線到該站台取回相關更新資訊，到時候請選擇"
-"你要更新的項目，點選「%s」取得要安裝更新的套件，或者是選擇「%s」放棄套件的更"
-"新。"
+"選擇 \"%s\" 將顯示一張更新可以被擷取的網站位置清單. 您應該選擇一個\n"
+"跟您近的. 一個套件選擇樹將出現: 審查選擇, 按下 \"%s\" 來擷取且安裝\n"
+"被選擇的套件, 或 \"%s\" 以中斷放棄."
 
-#: 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 "安裝"
 
-#: help.pm:460
-#, fuzzy, c-format
+#: help.pm:447
+#, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
-"接下來，準備選擇系統安全等級的項目。一般來說，若是機器環境越暴露於環境下，裡"
-"面所儲存的資料就比較有安全性的問題考量。相對來說，系統所使用的安裝等級也就應"
-"該越高，以便於資料保存會比較安全。請閱讀參考手冊內關於 MSEC 章節的內容，以便"
-"於取得更多這方面的相關資訊。\n"
-"若是您不知道該如何選擇的話，使用預設值就可以了。"
+"到這裡時, DrakX 將允許您選擇您想要的安全性等級給您的機器.\n"
+"根據拇指規則, 若是機器將要有包含重要的資料, 或是直接暴露在網際網路,\n"
+"安全性等級應該設定較高. 權衡之下, 較高的安全性等級換得不容易使用.\n"
+"\n"
+"如果您不知道選什麼, 保留預設選項. 您將能在稍後用 draksec 工具改變它,\n"
+"draksec 是 Mandrakelinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "
+"\"%s\" 欄位. 安全性訊息將被寄到\n"
+"那個位址."
 
-#: help.pm:472
-#, fuzzy, c-format
+#: help.pm:458
+#, c-format
 msgid "Security Administrator"
-msgstr "安全性管理者:"
+msgstr "安全性管理員:"
 
-#: help.pm:475
-#, fuzzy, c-format
+#: help.pm:461
+#, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrakelinux system. If partitions have already been\n"
@@ -4156,74 +4366,78 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在這個階段，您需要選擇要用來安裝『Mandrake-Linux』系統的分割區。您可以重新劃"
-"分新的分割區來使用，或者是使用原本已經劃分好的就有分割區。\n"
+"在這個階段, 您需要選擇要用來安裝 Mandrakelinux 系統的分割區.\n"
+"如果分割區已經被定義了, 不管是從舊有的 GNU/Linux 安裝或是\n"
+"另一個處理分割區的工具, 您可以使用原本已經劃分好的分割區.\n"
+"否則硬碟分割必須要被定義.\n"
 "\n"
-"要建立新分割區，您需要先選擇一台硬碟進行操作。比方選取「hda」、「hdb」這類 "
-"IDE 硬碟裝置，或者是「sda」.. 等 SCSI 硬碟裝置。\n"
+"要建立分割區, 您需要先選擇一台硬碟. 您可以選擇要操作的分割區, 按 ``hda''\n"
+"為第一台 IDE 磁碟, ``hdb'' 為第二台, ``sda'' 為第一台 SCSI 磁碟等等.\n"
 "\n"
-"進行分割的動作，在您選好一台硬碟裝置後，您有這些項目可以使用:\n"
+"要進行分割的動作於選好的硬碟上, 您有這些項目可以使用:\n"
 "\n"
-" *『清除全部』：這個項目將會把所選取的硬碟上所有分割區都清除掉。\n"
+" * \"%s\": 這個選項刪除在所選的影碟上的全部分割區\n"
 "\n"
-" *『自動配置』：這個項目將會自動找尋所選取的硬碟剩餘可用的空間，自動劃分出"
-"「Ext2」與「swap」分割區進行安裝使用。\n"
+" * \"%s\": 這個選項使您自動建立 ext3 與 swap 分割區於您的硬碟上的空白空間\n"
 "\n"
-" *『更多』：提供進階的選項設定:\n"
+"\"%s\": 給多加的功能的使用:\n"
 "\n"
-" *『儲存至磁片』：把目前分割表劃分狀態儲存到磁片內，以便於在某些環境下可以用"
-"來急救復原。建議你若是不熟悉磁碟劃分，可以多利用這個項目。\n"
+" * \"%s\": 儲存分割表到軟片. 必要時對於分割表拯救有用. 強烈建議執行此步驟.\n"
 "\n"
-" *『載入軟碟中的設定值』：這個項目能夠回存先前儲存在磁片的硬碟的分割表劃分狀"
-"態\n"
+" * \"%s\": 允許您回存一個之前從軟片儲存的分割表\n"
 "\n"
-" *『救援分割區』：如果您的分割區毀損了，也許您可以使用這個項目進行急救的動"
-"作。不過請小心使用這個項目，以避免產生更多的更多錯誤。\n"
+" * \"%s\": 如果您的分割表受損, 您可以試著用這個選項救回它.\n"
+"請小心且記得這並非總是有效.\n"
 "\n"
-" *『復原分割區』：取消剛剛的磁碟分割的劃分操作的變更。\n"
+" * \"%s\": 丟棄全部改變且重新載入原始硬碟的分割表.\n"
 "\n"
-" *『重讀分割區』：要放棄剛剛對磁碟任何劃分動作，並回到最原本狀態，讓程式重新"
-"讀取您最原本的狀態。\n"
+" * \"%s\": 不選取這個選項將強制使用者手動掛載與卸載可移除式媒體例如軟片與\n"
+"CD-ROMs.\n"
 "\n"
-" *『可移除裝置自動掛載』：若是您希望能夠自動的掛入磁碟片與光碟片的話，請選取"
-"該項目。\n"
+" * \"%s\": 如果您想用巫師來分割您的硬碟, 使用這個選項. 如果您沒有對於\n"
+"操作分割的好的了解, 這是被建議的.\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
+"\n"
+" * \"%s\": 用這個選項來取消您的變更.\n"
+"\n"
+" * \"%s\": 允許多加的動作於分割 (類型, 選項, 格式)且給更多的關於硬碟的資訊.\n"
 "\n"
-" *『精靈』：如果您希望由程式幫您自動分配磁碟分割的話，可以使用該項目。一般建"
-"議給初學者來使用。\n"
+" * \"%s\": 當您完成分割您的硬碟, 這將儲存您的變更回磁碟.\n"
 "\n"
-" *『切換至一般/專家模式』：提供更多額外的分割區資訊項目 (類型、選項、格式化) "
-"等。\n"
+"當定義一個分割的大小時, 您可以好好的用鍵盤上的方向鍵來設定分割大小.\n"
 "\n"
-" *『完成』：當您完成磁碟劃分動作時，請選擇這個項目，以便於把目前分割的結果寫"
-"入到硬碟更新。\n"
+"注意: 您可以用鍵盤達成任何選項. 用 [Tab] 鍵與上或下方向鍵瀏覽分割.\n"
 "\n"
-"請注意：這邊您可以多利用 [Tab] 與 [Up/Down] 鍵來往返磁碟分割畫面操作。\n"
+"當一個分個被選擇時, 您可以使用:\n"
 "\n"
-"當選取好一個分割區時，您可以使用:\n"
+" * Ctrl-c 來建立一個新的分割 (當空白分割被選擇時)\n"
 "\n"
-" * Ctrl-c：建立一個新分割區 (當空的分割區被選取時使用);\n"
+" * Ctrl-d 來刪除一個分割\n"
 "\n"
-" * Ctrl-d：刪除該分割區;\n"
+" * Ctrl-m 來設定掛載點\n"
 "\n"
-" * Ctrl-m：設定該分割區的掛載點。\n"
+"要得到關於不同可用的檔案系統的資訊, 請從 ``Reference Manual (參考手冊)''\n"
+"閱讀 ext2FS 章節.\n"
 "\n"
-"如果您是使用 PowerPC 的機器，您需要建議一個大約 1MB 的 HFS分割區作為yaboot開"
-"機程式使用，以便於能夠讓 yaboot 開機程式能夠啟動 Linux 系統。當然，一般我們建"
-"議，您可以讓這塊保留的分割區有大一點的空間，比方保留一塊「20M」的分割區，那您"
-"就能夠在該分割區上放置許多份的開機核心相關檔案來使用。"
+"如果您正在安裝於一個 PPC 機器, 您將想要建立一個小的 HFS\n"
+"``bootstrap'' 分割至少 1MB 以用於 yaboot 開機載入器. 如果您選擇使分割大一"
+"些,\n"
+"像 50MB, 您或許發現它是一個好用的貯存一個備用核心與 ramdisk\n"
+"影像給緊急使用開機的好地方."
 
-#: help.pm:544
-#, fuzzy, c-format
+#: help.pm:530
+#, c-format
 msgid "Removable media auto-mounting"
-msgstr "抽取式裝置自動掛載"
+msgstr "可移除式媒體自動掛載"
 
-#: help.pm:544
-#, fuzzy, c-format
+#: help.pm:530
+#, c-format
 msgid "Toggle between normal/expert mode"
-msgstr "切換到一般模式"
+msgstr "切換一般/專家模式"
 
-#: help.pm:547
-#, fuzzy, c-format
+#: help.pm:533
+#, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
@@ -4255,112 +4469,120 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"目前偵測到您的硬碟上有多個 Windows 分割區，請選擇您希望要縮小Windows的分割"
-"區，以便於把空間挪出來安裝「Mandrakelinux」作業系統。\n"
+"多於一個 Microsoft 分割區已經在您的硬碟上被偵測到. 請選擇您希望要重新調整 大"
+"小的分割以便安裝您的新的 Mandrakelinux 作業系統.\n"
 "\n"
-"每個分割區都列出了像是:『Linux 名稱』,『Windows 名稱』,『容量』。\n"
+"每個分割區都列出了像是: \"Linux 名稱\", \"Windows 名稱\", \"容量\".\n"
 "\n"
-"『Linux 名稱』是有結構性的:『硬碟型態』,『硬碟編號』,『分割區編號』(比方像"
-"是: hda )。\n"
+"\"Linux 名稱\" 是有結構性的: \"硬碟型態\", \"硬碟編號\", \"分割區編號\"\n"
+"(比方像是: \"hda1\" ).\n"
 "\n"
-"『硬碟型態』就是，若您使用的是 IDE 硬碟，會顯示「hd」, 若是SCSI硬碟的話，就是"
-"顯示「sd」。\n"
+"\"硬碟型態\" 就是, 若您使用的是 IDE 硬碟, 會顯示 \"hd\", 若是SCSI硬碟的話,\n"
+"就是 \"sd\".\n"
 "\n"
-"『硬碟編號』就是在「hd」或者是「sd」後面的字母。以 IDE 硬碟裝置來說其意義"
-"為:\n"
+"\"硬碟編號\" 就是在 \"hd\" 或者是 \"sd\" 後面的字母. 以 IDE 硬碟裝置來說:\n"
 "\n"
-" ＊「a」這是指「primary IDE controller 上第一台 (master) 硬碟」，\n"
+" * \"a\"這是指 \"primary IDE controller 上第一台 (master) 硬碟\";\n"
 "\n"
-" ＊「b」這是指「primmary IDE controller 上第二台 (slave) 硬碟」，\n"
+" * \"b\"這是指\"primmary IDE controller 上第二台 (slave) 硬碟\";\n"
 "\n"
-" ＊「c」這是指「secondary IDE controller 上第一台 (master) 硬碟」，\n"
+" * \"c\"這是指\"secondary IDE controller 上第一台 (master) 硬碟\";\n"
 "\n"
-" ＊「d」這是指「secondary IDE controller 上第二台 (slave) 硬碟」。\n"
+" * \"d\"這是指\"secondary IDE controller 上第二台 (slave) 硬碟\".\n"
 "\n"
-"以 SCSI 硬碟來說，「a」就是指「SCSI IDE 編號最小的那一台」, 「b」就是指"
-"「SCSI IDE」編號為二的那一台硬碟」，然後依此類推下去.....\n"
+"以 SCSI 硬碟來說, \"a\" 是指 \"SCSI ID 編號最小的那一台硬碟\", \"b\" 是指"
+"\"SCSI ID 編號為第二小的那一台硬碟\", 然後依此類推下去.....\n"
 "\n"
-"「Windows 名稱」就是在 Windows 下的磁碟機代號名稱，比方像是「C:\\」。"
+"\"Windows 名稱\" 是在 Windows 下的磁碟機代號名稱 (第一個磁碟或分割稱為\n"
+"\"C:\")."
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
-#, fuzzy, c-format
+#: help.pm:591
+#, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"正常情況來說，「DrakX」能夠正確的依照您選擇的語系，自動偵測您系統的鍵盤,所以"
-"您不會會看到這個步驟的設定。但是，若是您有特殊的環境需求，這邊就能夠讓您選"
-"擇。\n"
+"根據您所選的語言 (), DrakX 將會自動選擇一個特別的鍵盤設定型態. 檢查所選擇的\n"
+"符合您或選擇另一個鍵盤布局\n"
+"\n"
+"您或許沒有精確對應於您的語言的鍵盤: 例如, 如果您是一個說英文的瑞士本國人,\n"
+"您或許有瑞士鍵盤. 或如果您說英文且在魁北克 (Quebec), 您或許發現您自己在一個\n"
+"您本國語言與國家鍵盤組合不對稱的情況. 不管是那種情形, 這個安裝步驟將允許您\n"
+"從一個清單中選擇適合的鍵盤\n"
 "\n"
-"請點選「更多」按鈕，以便於選擇您所需要使用的鍵盤項目。"
+"點選 \"%s\" 按鈕以顯示一個支援的鍵盤清單.\n"
+"\n"
+"如果您根據一個非拉丁語系字母選擇一個鍵盤布局, 下一步對話視窗將允許您選擇\n"
+"鍵捆綁以便切換於拉丁與非拉丁鍵盤布局之中."
 
-#: help.pm:624
-#, fuzzy, c-format
+#: help.pm:609
+#, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4369,102 +4591,150 @@ 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 ""
-"請選取您安裝過程所要使用的語系。點選『進階』按鈕可以讓您\n"
-"選取其他語系，該選取的語系將會一同安裝到系統內。\n"
-"當你選擇安裝所需要的語系項目後，系統將會安裝上給系統文件、\n"
-"應用程式所使用的相關語系資料，這意味著當您切換到該語系環境時，\n"
-"就能夠使用該語系定義的環境、顯示、輸入進行一般系統操作使用。\n"
+"第一步驟是選擇您偏好的語言.\n"
+"\n"
+"您的偏好語言選擇將一般來說影響安裝, 文件, 與系統. 先選擇您在的區域, 然後\n"
+"您說的語言.\n"
+"\n"
+"點選 \"%s\" 按鍵將允許您選擇其他語言來安裝在您的工作站上, 因此, 安裝特殊語"
+"言\n"
+"檔案給系統文件與應用程式. 例如, 如果西班牙使用者會用您的機器, 在樹狀檢視中\n"
+"選擇英文當預設語言且在進階部份選擇 \"%s\".\n"
+"\n"
+"關於 UTF-8 (unicode) 支援: Unicode 是一個新的字元編碼以含蓋全部存在的語言.\n"
+"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrakelinux 的\n"
+" UTF-8 使用將根據使用者的選擇:\n"
+"\n"
+" * 如果您選擇一個有強烈舊式編碼的語言 (latin1 語言, 俄羅斯, 日本, 中國,\n"
+"韓國, 泰國, 希臘, 土耳其, 大多的 iso-8859-2 語言)\n"
+"\n"
+" * 其他語言將使用 unicode 為預設;\n"
+"\n"
+" * 如果兩個或兩個以上的語言被需要, 且那些語言不用相同的編碼, 則 unicode 將被"
+"用於\n"
+"整個系統;\n"
 "\n"
-"當您選擇好了之後，請點選『確定』按鈕繼續。"
+" * 最後, unicode 也可以被強制使用遍布系統, 藉由使用者的選擇 \"%s\" 選項\n"
+"來要求之.\n"
+"\n"
+"記得您不被限制於選擇一個單一的附加語言. 您可以選擇數個, 或甚至藉由選擇\n"
+" \"%s\" 方塊安裝他們全部. 選擇支援對語言來說是指翻譯, 字型, 拼字檢查等等,\n"
+"將也會被安裝給那個語言.\n"
+"為了切換於不同的安裝於您系統上的語言之間, 您可以用 \"root\" 發射\n"
+"\"localedrake\" 命令來改變用於整個系統上的語言. 用一般使用者執行命令\n"
+"將只會改變對於那個特別使用者的語言設定."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr ""
 
-#: help.pm:663
-#, fuzzy, c-format
+#: help.pm:650
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
-"預設的情況，『DrakX』程式會預設您系統只有兩個按鈕式的滑鼠，並自動選擇模擬三鍵"
-"的功能。此外，『DrakX』也能夠很自動化的偵測到您系統使用的滑鼠是屬於序列、"
-"「PS/2」或者是「USB」規格的滑鼠類型。\n"
+"通常 DrakX 沒有偵測滑鼠按鍵數量的問題. 如果有的話, 它假設您有兩鍵的滑鼠\n"
+"且將設定它模擬三鍵. 第三鍵按鍵於兩鍵滑鼠可以由同時按下左鍵與右鍵來模擬.\n"
+"DrakX 將會自動知道您的滑鼠是否使用 PS/2, 序列埠 或 USB 介面.\n"
+"\n"
+" 如果您有一個無滾輪的三鍵滑鼠, 您可以選擇 \"%s\" 滑鼠. DrakX 將會設定您的\n"
+"滑鼠以至於您可以用它模擬滾輪: 為了要使用它, 按下中間鍵且上下移動您的滑鼠指"
+"標.\n"
+"\n"
+"如果由於某些原因您想指定一個不同的滑鼠類型, 從提供的清單中選它.\n"
+"\n"
+"您可以選擇 \"%s\" 項目來選擇一個 ``generic (一般)'' 滑鼠型態, 適用於幾乎全"
+"部\n"
+"的滑鼠.\n"
 "\n"
-"如果預設的項目不是你所預期的，您可以由下面清單列表選擇您所要使用的滑鼠類"
-"型。\n"
+"如果您選擇一個不同於預設值的滑鼠, 一個測試螢幕將會顯示. 使用案件與滾輪來\n"
+"校驗設定值是正確的且滑鼠正確工作. 如果滑鼠不能工作, 按下空白鍵或 [Return] "
+"鍵\n"
+"以取消測試且您將回到滑鼠清單.\n"
 "\n"
-"當你選擇非安裝程式預設的滑鼠項目時，等等會有一個滑鼠測試的畫面，您可以在該處"
-"測試滑鼠是否可以正常使用，以便於確認您選擇的項目正確無誤。若是您選擇的項目無"
-"法正常工作，使用鍵盤按下空白鍵或者是「Enter鍵」，然後選擇『取消』回到滑鼠選擇"
-"項目即可。"
+"某些情況下, 滾輪滑鼠不能被自動偵測, 所以您將需要從清單中選擇您的滑鼠.\n"
+"確定選擇一個對應於您的滑鼠連接的埠的一項. 選擇一個滑鼠且按下 \"%s\" 鍵後,\n"
+"一個滑鼠影像將顯示在螢幕上.\n"
+" 捲動滑鼠滾輪以確定它正確被激活. 當您滾動\n"
+"滑鼠滾輪, 您將看見螢幕上滾動滾輪移動.\n"
+" 測試按鍵且檢查滑鼠指標當您移動\n"
+"您的滑鼠時在螢幕上移動."
 
-#: help.pm:691
-#, fuzzy, c-format
+#: help.pm:681
+#, c-format
 msgid "with Wheel emulation"
-msgstr "按鍵模擬"
+msgstr "滾輪模擬"
+
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "通用 | 任何 PS/2 & USB 滑鼠"
 
-#: help.pm:694
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"請選擇正確的連接埠名稱。比方，MS Windows 所稱呼的「COM1」，\n"
-"在 GNU/Linux 環境是稱呼為「ttyS0」。"
+"請選擇正確的連接埠名稱. 比方, Windows 所稱呼的 \"COM1\"\n"
+"在 GNU/Linux 環境是稱呼為 \"ttyS0\"."
 
-#: help.pm:698
-#, fuzzy, c-format
+#: help.pm:688
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4473,289 +4743,149 @@ 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 ""
-"這邊是關於 GNU/Linux 系統安全設定: 你需要設定系統管理員root的密碼。root 是系"
-"統的管理者，有最高的系統權限，具備此權限的人，能夠完全的控管設定系統的所有運"
-"作。比方像是建立帳號，更新系統套件，管理整個檔案系統等等。\n"
-"建議您設定 root 系統管理者的密碼時，該密碼不要過於簡單，以免容易遭到他人推敲"
-"出來後惡意破壞您的系統。這邊設定密碼時，若是密碼過於簡單或者是有規則性的話，"
-"程式將會警告您需要重新再輸入一遍。\n"
+"這是最重要的 GNU/Linux 系統安全性決定點: 你一定要輸入 \"root\" 密碼.\n"
+"\"root\" 是系統管理員且是被授權做更新, 增加使用者, 變更整個系統設定等等\n"
+"的人. 簡而言之, \"root\"能做任何事! 那就是為什麼您必須要選擇一個困難猜測\n"
+"的密碼. DrakX 將告訴您您的密碼是否太簡單. 就像您所見的一樣, 您並不被強制輸"
+"入\n"
+"一個密碼, 但是我們強烈建議如此. GNU/Linux 就像其他任何作業系統一般易於受\n"
+"操作手錯誤影響. 因為 \"root\" 可以克服全部限制且藉由不小心存取分割, 可以\n"
+"不經意地抹除全部分割上的資料, 困難變成 \"root\" 是重要的.\n"
 "\n"
-"密碼可以包含一般可見的英文字母字元，包含英文字母字元、空白、數字等，可包含大"
-"小寫混合的輸入。此外，密碼長度建議至少有8個字元或者更多。再來就是不要把系統管"
-"理員的密碼寫在紙上或者是紀錄於電腦上，因為可能有被竊取、偷窺等的情況發生。\n"
+"密碼應該是一組字母與數字字元且至少 8 個字元長. 絕不寫下 \"root\" 密碼 - \n"
+"它使得太容易妥協您的系統(安全性).\n"
 "\n"
-"當然，密碼也不用取的太長，因為太長可能容易忘記，甚至是輸入時容易有錯誤。\n"
+"一個警告: 別把密碼設定太長或太複雜, 因為您必須能記住它!\n"
 "\n"
-"您在輸入密碼時，螢幕上不會顯示出你實際敲入的內容。另外就是您需要輸入兩次以便"
-"於確定所輸入的密碼沒有打錯。\n"
+"您在輸入密碼時, 螢幕上不會顯示出你實際敲入的內容. 另外就是您需要輸入兩次\n"
+"以便於確定所輸入的密碼沒有打錯. 如果您不小心做出兩次同樣的輸入錯誤,\n"
+"您將必須使用這個 ``錯誤'' 密碼於第一次您試著以 \"root\" 連入.\n"
 "\n"
-"在專家模式安裝的環境，您下面還可以選擇是否要使用 NIS、LDAP等的伺服器連結作為"
-"帳號認證的方式。\n"
+"如果您想要一個認證伺服器來控制存取您的電腦, 點選 \"%s\" 按鍵.\n"
 "\n"
-"關於 LDAP、NIS 認證的方式，若是你知道您所在網路有使用這類認證方式的話，您也許"
-"n\"需要向網路管理者詢問相關資訊以便於能夠設定使用。\n"
+"若是你知道您所在網路有使用 LDAP, NIS, 或 PDC Windows 網域認證服務,\n"
+"選適合的一個給 \"%s\". 如果您不知道選那一個, 向網路管理者詢問相關資訊.\n"
 "\n"
-"若是認證方式就是單純該電腦上的帳號方式，選擇使用本地端密碼檔案項目即可。"
+"如果您遇到記住密碼的問題, 或如果您的電腦將永遠不連上網際網路且您絕對相信\n"
+"任何使用您的電腦的人, 您可以選擇有 \"%s\"."
 
-#: help.pm:733
-#, fuzzy, c-format
+#: help.pm:722
+#, c-format
 msgid "authentication"
-msgstr "認證方式"
+msgstr "認證"
 
 #. -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 "沒有密碼"
 
-#: help.pm:736
-#, fuzzy, 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 ""
-"LILO 與 GRUB 都是 GNU/Linux 的開機啟動程式。一般來說，這個設定階段是全自動"
-"的。事實上，DrakX 會分析系統磁碟開機磁區上面的內容，來決定一些事情:\n"
-"\n"
-" * 若是有找到 Windows 的開機磁區，程式將會使用GRUB/LILO程式加以取代，如此，您"
-"就可以使用 GRUB 或者是 LILO 開機程式來啟動 Linux 系統，甚至是可以啟動另外一個"
-"作業系統(比方像是 Windows 等)。\n"
-"\n"
-" * 如果在開機磁區上已經找到了 GRUB 或者是 LILO 開機程式，程式將會使用新的設定"
-"值覆蓋，如果安裝程式有無法自動處理的情況，它會顯示出下面的選項。\n"
-"\n"
-" * \"要使用那個開機管理程式\": 您有三各項目可以選擇:\n"
-"\n"
-"    * 「GRUB」: 如果您比較喜歡使用 GRUB (這是文字模式的開機選單)。\n"
-"\n"
-"    * 「圖形選單 LILO 介面」: 如果您希望使用圖形化的 LILO 開機選單。\n"
-"\n"
-"    * 「文字選單 LILO 介面」: 如果您希望使用文字模式的 LILO 開機選單。\n"
-"\n"
-" * \"開機裝置\" 這個地方，一般來說可以不用更改，比方像是一般\n"
-"安裝在第一台硬碟 (/dev/hda) 上，您也可以變更選擇，比方像是\n"
-"安裝到第二台硬碟 (/dev/hdb)，甚至是安裝到軟碟 (/dev/fd0)\n"
-"都是可行的。\n"
-"\n"
-" * \"在啟動作業系統前先延遲的時間\": 當啟動電腦時，會先暫停一會時間然後讓使用"
-"者選擇要啟動那個項目進行開機。\n"
-"\n"
-"!! 請注意，如果您選取『取消』打算不安裝開機啟動程式的話，您得確定您有辦法能夠"
-"在下次重新啟動電腦後能夠進入 Mandrakelinux 系統環境。因此，當你要選擇取消這個"
-"安裝項目前，請三思!!!\n"
-"\n"
-"您可以點選『進階』按鈕，您將有更多給專家等級使用者所使用的進階選項。\n"
-"\n"
-"Mandrakelinux 安裝程式將會把開機管理程式安裝到系統內，如此您就能夠透過這個開"
-"機管理程式啟動您電腦的 GNU/Linux 環境，甚至是其他已經安裝於統的作業系統環"
-"境。\n"
-"\n"
-"當安裝程式偵測到您系統已經有安裝了其他作業系統，啟動該作業系統的項目將會自動"
-"的加入開機選單內，並包含手動新增開機項目與修改開機項目的內容設定。\n"
-"您可以在顯示出可供選擇開機項目上快速點兩次變更內容甚至是刪除該啟動項目;使用"
-"『新增』來建立開機項目內容; 然後點選『完成』以便於繼續進行下面的安裝項目。"
-
-#: help.pm:768
-#, fuzzy, c-format
-msgid "GRUB"
-msgstr "GB"
-
-#: 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
+#: help.pm:725
 #, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, fuzzy, c-format
-msgid "Delay before booting the default image"
-msgstr "在啟動作業系統前先延遲的時間"
-
-#: help.pm:771
-#, fuzzy, 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 ""
-"LILO (the LInux LOader) 與 GRUB 這類都是 Linux 的開機核心載入程式，這類程式本"
-"身除了能夠用來載入 Linux 核心進入 Linux 系統，也具備能夠用來啟動其他作業系"
-"統，比方像是 DOS、Windows 等。我們將會偵測您目前電腦上已經安裝好的作業系統，"
-"並設定好這類開機程式能夠讓您於開機時選擇要啟動你希望要進入的作業系統環境。若"
-"是你系統有安裝某個作業系統，但是這邊並沒有偵測出來的話，您可以於這邊用手動的"
-"方式來新增一個啟動項目。\n"
-"\n"
-"目前偵測列出的項目部份，若是你打算刪除其中幾個啟動的項目的話，那您將會失去能"
-"夠使用該項目進行的開機功能。這個情況下，當你刪除其中一個啟動項目後，後續你也"
-"許就需要使用該作業系統的開機片才能夠進入這個作業系統了!"
-
-#: 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 "新增"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "修改"
-
-#: 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
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "移除清單"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
-#, fuzzy, c-format
+#: help.pm:742
+#, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
-"這裡將要選擇所要使用的列印服務系統項目，Mandrakelinux 這邊提供了三種供您選擇"
-"的項目。\n"
+"現在要選擇您的電腦要使用的列印系統. 其他作業系統或許只有提供您一種選擇,\n"
+"但是 Mandrakelinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
+"態.\n"
+"\n"
+" * \"%s\" - 是 ``print, don't queue (列印, 不排隊)'' 之縮寫字, 是當您有一個\n"
+"直接連線的列印機, 您不想因為卡紙而驚慌, 且您沒有網路列印機. (\"%s\"\n"
+"只將會處理非常簡單的網路條件且當用於網路時有些慢) 如果這是您第一次 GNU/"
+"Linux\n"
+"經驗, 建議您使用\"pdq\".\n"
 "\n"
-" *『%s』- pdq 其實就是「print, don't queue」的縮寫。一般這個列印服務程式能夠"
-"在列印機是直接連結到本機電腦上很快速的列印，另外在小型簡單，而且速度不快的網"
-"路上來使用也相當便利。這個項目，包含下面可供選擇的列印系統，都可以事後使用 "
-"PrinterDrake 程式，然後使用專家模式就可以變更設定。\n"
+" * \"%s\" 是 ``Common Unix Printing System (通用 Unix 列印系統)'', 這是一套\n"
+"對於直接列印到本地端列印機上, 或者是到地球另一端都相當出色的選擇. 它的設定\n"
+"是相當簡單且可以當成古老的 lpd 列印系統的伺服器端或者是用戶端使用, 所以它是\n"
+"相容於需要列印服務比較舊的作業系統. 相當強力, 基本設定幾乎跟 \"pdq\" 一樣\n"
+"簡單. 如果您希望能夠模擬 \"lpd\" 伺服器, 確定您開啟 \"cups-lpd\" daemon.\n"
+"\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理列印機.\n"
 "\n"
-" *『%s』 - 「Common Unix Printing System」，這是一套個相當好的列印服務系統，"
-"對於直接連線安裝在本機上，或者是一般網路使用上都相當不錯。這個服務程式相當簡"
-"單，也能夠用使用 lpd 的 Server 端或者是 Client 端都能夠相容使用。這個程式提供"
-"許多功能機制，使用設定上也能夠像是「pdq」程式的簡單。如果您希望能夠讓 CUPS 能"
-"夠模擬「lpd」服務程式功能的話，您需要開啟「cups-lpd」這個服務程式。另外，它提"
-"供了圖形的介面能夠讓使用者選擇要列印的列印機，包含相關列印參數的調整。"
+"如果您現在做出決定, 且您之後發現不喜歡您的列印系統, 您可以藉由從\n"
+"Mandrakelinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr ""
 
-#: 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
-#, fuzzy, c-format
+#: help.pm:765
+#, c-format
+msgid "Expert"
+msgstr "專家"
+
+#: help.pm:768
+#, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
 "also scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
@@ -4774,241 +4904,84 @@ msgid ""
 "which parameters need to be passed to the hardware, you'll need to manually\n"
 "configure the driver."
 msgstr ""
-"DrakX 程式目前正在偵測您系統上的 IDE 裝置。此外，它也會順便掃描系統所安裝的 "
-"SCSI 介面卡。當偵測到 SCSI 卡時，DrakX 程式將會自動安裝適當的SCSI 驅動程式驅"
-"動該 SCSI 設備。\n"
+"DrakX 將要偵測您電腦上的 IDE 裝置. 它也會順便掃描您系統上的 PCI\n"
+"SCSI 介面卡. 當偵測到 SCSI 卡時, DrakX 將會自動安裝適當的驅動程式\n"
 "\n"
-"因為安裝程式也許無法完全的偵測出您的系統是否還有更多的硬體裝置，所以DrakX程式"
-"會詢問您的系統是否有「PCI SCSI」介面卡存在。當你選擇『是的』的時候您將可以手"
-"動選擇您系統所安裝的SCSI介面卡的項目。若是沒有的話，選擇『否』就可以了。若是"
-"您實在無法確定有那些硬體項目存在，您可以選取『檢視硬體資訊』並點選『確定』回"
-"到原本畫面。\n"
+"因為也許無法完全的偵測出您的系統是否還有更多的硬體裝置, 所以 DrakX或許會失敗"
+"偵測您的硬碟. 若是這樣, 您必須手動指定您的硬體.\n"
 "\n"
-"當您使用手動方式指定您系統的介面卡時，DrakX程式會詢問您是否要對這個驅動程式額"
-"外輸入其他參數。您應該要允許 DrakX 能夠先自動偵測該週邊裝置狀態，除非真的無法"
-"偵測時才手動指定參數傳達給該驅動程式。\n"
+"如果您必須手動方式指定您的 PCI SCSI 適配器時, DrakX 會詢問您是否要對這個\n"
+"驅動程式設定選項參數. 您應該要允許 DrakX 能夠先自動偵測硬體卡特別的選項參數\n"
+"以需要初始化適配器. 通常, DrakX 將會沒有問題通過這個步驟.\n"
 "\n"
-"請注意的是，若是您要手動指定傳入的參數，建議您請參考使用手冊的第三章 "
-"(\"Collecting Information on Your hardware\") 以便於獲得更多相關資訊。"
+"若是 DrakX 無法偵測選項以自動決定那個參數需要被送到硬體, 您必須手動設定\n"
+"驅動程式."
 
-#: help.pm:847
-#, fuzzy, 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 ""
-"您可以在 yaboot 內新增額外的項目，像是用來啟動其他作業系統項目、核心項目或者"
-"是警急開機核心檔案等。\n"
-"\n"
-"針對要新增一個啟動其他作業系統項目來看，至少要包含一個 \"標籤\" 與根分割區所"
-"在位置的項目。\n"
-"\n"
-"針對 Linux 來說，至少包含像是:\n"
-"\n"
-" * 標籤: 就是 Label，這個項目就是一個可以讓您在開機提示訊息時輸入該名稱，即可"
-"使用該作業系統開機。\n"
-"\n"
-" * 核心: 就是 Image，這個項目是指向到要使用該核心檔案開機的檔案名稱。一般來"
-"說，就是使用 vmlinuz 或者是 vmlinuz-2.4.8 等這類名稱。\n"
-"\n"
-" * / 分割區: 指向該 Linux 系統所在的 / 根分割區位置。\n"
-"\n"
-" * 附加參數: 這邊可以輸入一些額外要傳給核心的參數。在 Apple 頻果電腦硬體週邊"
-"裝置上，這裡可以指定一些參數以便於初始話顯示卡裝置，或者是啟動在鍵盤上的滑鼠"
-"裝置。下面是一些可用的參數指定，比方像是:\n"
-"\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: 這個參數是用來能夠在核心載入時，預先載入可用的模組裝置檔案，以便於"
-"能夠在掛入系統 / 分割區時就已經能夠存取 / 所在裝置。一般來說，當您系統安裝在 "
-"RAID、SCSI 裝置上時，系統需要在核心載入時順便掛入驅動這些硬體裝置的驅動程式，"
-"以便於下面才能夠正常存取這些裝置。使用該項目時，系統會於開機時載入一個所謂的"
-"initrd-image 檔案進行後續動作。\n"
-"\n"
-" * Initrd-size: 當您要使用 initrd-image 時，系統會預先配置一塊ramdisk以便於載"
-"入 initrd-image 檔案來使用。該項目預設數值為4096 KBytes。若是您需要配置一個很"
-"大的 ramdisk 使用，這邊可以手動指定。\n"
-"\n"
-" * / 可讀寫: 一般來說，核心載入系統後，預設掛入 / 根分割區時，是使用read-"
-"only 唯讀模式，以便於可以在開機時偵測系統硬碟情況，呼叫 fsck 程式進行檢測動"
-"作。若是你有其他需要的話，你才需要把這個項目開啟，要不然建議您不用選取這個項"
-"目。\n"
-"\n"
-" * NoVideo: 一般是給 Apple 顯示卡硬體裝置解決一些問題使用的。當然您可以把這個"
-"項目選擇於 \"novideo\" 模式，讓系統使用原本顯示方式。\n"
-"\n"
-" * 預設: 選擇用來預設開機的標籤項目。依照安裝方式的不同，開機時您可能會看到選"
-"單模式，這時候您可以用方向鍵選擇你要啟動的項目。或者是你看到的是單純的 boot: "
-"提示訊息，此時您可以按下 [Tab] 按鍵可以獲得能夠選擇輸入的開機項目標籤。"
-
-#: help.pm:894
-#, fuzzy, 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 是專門用來給 NewWorld MacIntosh 硬體電腦使用的開機程式。它能夠用來啟"
-"動 GNU/Linux, MacOS 或者是 MacOSX 這些作業系統。一般來說，程式將會偵測系統目"
-"前安裝了那些作業系統，然後您就可以很方便的使用 Yaboot 程式來啟動所需要使用的"
-"作業系統環境。若這邊並沒有偵測到您目前系統有安裝的作業系統環境，您可以在這個"
-"螢幕上使用手動方式新增所需要的項目。請注意一下您下面所選擇使用的相關參數。\n"
-"\n"
-"Yaboot 的主要參數包含:\n"
-"\n"
-" * Init Messages: 用於出現開機提示字元時，預先顯示的一段文字內容。\n"
-"\n"
-" * Boot Device: 指定您要用來放置用來啟動 GNU/Linux 所需要的開機裝置。\n"
-"\n"
-" * Open Firemare Delay: 與 LILO 不同的地方就是，Yaboot 有兩個可用的delay參數"
-"可以使用。第一個 delay 參數就是用來指定您可以在多少時間內(秒為單位)選擇使用 "
-"CD, OF boot, MacOS 或者是 Linux 來進行開機動作。\n"
-"\n"
-" * Kernel Boot Timeout: 這個 timeout 類似於 LILO 的 delay 參數，也就是當選擇"
-"了一個項目後，要停多久時間才真正進行下面開機的動作。一般預設時間是0.1 秒。\n"
-"\n"
-" * Enable CD Boot?: 設定該項目，來開起關閉允許選擇 \"C\" 項目用 CD 開機。\n"
-"\n"
-" * Enable OF Boot?: 設定該項目，來開起關閉允許選擇 \"N\" 開啟 Open Firemare "
-"Delay 的功能。\n"
-" * Default OS: 作為預設開機的選擇項目。"
-
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 
-#: 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 "音效卡"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5018,77 +4991,78 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "鍵盤"
-
-#: 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 "時區"
 
-#: help.pm:991
-#, fuzzy, c-format
-msgid "Graphical Interface"
-msgstr "開機時啟動 X 環境"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "電視卡"
 
-#: help.pm:991
-#, fuzzy, c-format
+#: help.pm:855
+#, c-format
 msgid "ISDN card"
-msgstr "內部 ISDN 介面卡"
+msgstr "ISDN 卡"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "圖形介面"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "代理伺服器"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "防火牆"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
-msgstr "啟動引導"
+msgstr "開機載入器"
 
-#: 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 "Server 程式"
+msgstr "服務"
 
-#: help.pm:994
-#, fuzzy, c-format
+#: help.pm:858
+#, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"選擇您希望用來安裝 Mandrakelinux 系統的硬碟。當你選擇好後，該顆硬碟上面所有的"
-"資料將會被清除而無法挽救，請小心操作這個項目。"
+"選擇您想要抹除的硬碟來安裝新的 Mandrakelinux 分割. 小心,\n"
+"磁碟上全部資料將遺失且將無法挽回!"
 
-#: help.pm:999
-#, fuzzy, c-format
+#: help.pm:863
+#, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
@@ -5098,28 +5072,111 @@ msgid ""
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
 "present on this hard drive."
 msgstr ""
-"如果您真的確定要清除這個硬碟上面所有的分割區與資料的話，點選『確定』按鈕。當"
-"您選擇這個項目後，就真的沒有辦法救回該顆硬碟上的資料了。\n"
+"您如果想要刪除在這個硬碟上的全部資料與分割, 點選 \"%s\".\n"
+"小心, 點選 \"%s\" 之後, 您將無法挽回任何在這個硬碟上的資料與分割, 包含\n"
+"Windows 資料.\n"
 "\n"
-"您可以點選『取消』按鈕放棄這個選擇。"
+"點選 \"%s\" 以不遺失在這個硬碟上的資料與分割放棄這個動作."
+
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "下一步 ->"
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- 上一步"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
-"找不到目前您核心內某個驅動程式模組檔案 (%s)，也許當初你用來開機提供的的磁片有"
-"問題，像是使用舊版的 Mandrake 開機映像檔案，而不是該 Mandrake版本提供的開機映"
-"像檔案。請重新製作以便於進行下面動作)"
+"無法存取對應您的核心的核心模組 (檔案 %s 遺失), 這一般表示您的開機軟片不同步"
+"於\n"
+"安裝媒體 (請建立一個更新的開機軟片)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "您也必須要格式化 %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 ""
+"下列安裝媒體已經被找到.\n"
+"如果您想略過他們, 您現在可以不選擇他們."
+
+#: 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 ""
+"下列媒體已經被發現且將被用於安裝: %s.\n"
+"\n"
+"\n"
+"您有補充安裝媒體要設定嗎?"
+
+#: 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 "網路 (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "網路 (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "沒有裝置被找到"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr ""
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr ""
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr ""
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr ""
+
+#. -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"
@@ -5132,18 +5189,17 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
-"您已經選擇安裝了下面的套件: %s\n"
+"您已經選擇了下面的伺服器: %s\n"
 "\n"
 "\n"
-"這些套件安裝好後預設是啟動的，因為這些套件某些層面來說是比較不安全的，所以很"
-"有可能他人會經由這些套件的漏洞危害您的系統。因此建議你安裝好系統後，一定要先"
-"確定這些套件是否已經有更新的版本，若是有的話請記得\n"
-"一定要更新。\n"
+"這些伺服器安裝好後預設是活躍的. 他們沒有任何已知的安全性問題,\n"
+"但是某些新的安全性問題或許會被找到. 在那情況下, 確定您一定要儘快更新.\n"
 "\n"
 "\n"
-"您確定真的要安裝這些套件項目嗎？\n"
+"您確定真的要安裝這些伺服器嗎?\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"
@@ -5152,48 +5208,51 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "請在 %s 中插入已經格式化(FAT格式)磁碟片"
+msgstr "請在 %s 磁碟中插入 FAT 已經格式化軟片"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
-msgstr "這張並不是 FAT 格式化的磁碟片"
+msgstr "這張軟片並不是 FAT 格式化的"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
-msgstr ""
-"要使用所儲存的套件選擇，在開機安裝啟動 LILO 程式的時候，於 boot 輸入:linux "
-"defcfg=floopy 即可。"
+msgstr "要使用所儲存的套件選擇, 在開機安裝的時候輸入 ``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 時發生錯誤"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "%s (連接埠 %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
-"發生了一個錯誤 - 找不到任何可用的裝置可以用來建立新的檔案系統，請檢查您的硬體"
-"狀況以找出問題的"
+"發生了一個錯誤 - 找不到任何有效的裝置可以用來建立新的檔案系統, 請檢查您的硬體"
+"以找出問題的原因"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "系統安裝"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
-msgstr "系統整合"
+msgstr "系統設定"
 
 #: install_interactive.pm:22
 #, c-format
@@ -5201,7 +5260,7 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"系統某些硬體需要額外的驅動程式以便於能夠驅動工作。\n"
+"某些在您電腦上的硬體需要 ``版權專有'' 的驅動程式以便於能夠工作.\n"
 "您可以在這裡找到一些相關的資訊: %s"
 
 #: install_interactive.pm:62
@@ -5211,9 +5270,9 @@ msgid ""
 "For this, create a partition (or click on an existing one).\n"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
-"您一定得要指定一個分割區來放根目錄，要進行這個工作\n"
-"的話，請建立一個分割區 (或選一個已經存在的分割區)，\n"
-"接著選 \"掛載點\" 這個操作，把掛載點設成 `/'。"
+"您一定得要指定一個分割區來放根目錄.\n"
+"要進行這個的話, 建立一個分割區 (或點選一個已經存在的).\n"
+"接著選動作 ``掛載點'' 且把它設成 `/'"
 
 #: install_interactive.pm:67
 #, c-format
@@ -5222,11 +5281,11 @@ msgid ""
 "\n"
 "Continue anyway?"
 msgstr ""
-"您沒有設定置換分割區，\n"
+"您沒有設定置換分割區(swap).\n"
 "\n"
-"不管如何都要繼續 ?"
+"不管如何都要繼續?"
 
-#: 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 "您必須有一個掛載於 /boot/efi 的 FAT 分割區"
@@ -5254,7 +5313,7 @@ msgstr "使用 Windows 分割區作為 loopback"
 #: install_interactive.pm:117
 #, c-format
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "您希望要用那個分割區給 Linux4Win 來使用呢？"
+msgstr "您希望要用那個分割區給 Linux4Win 來使用呢?"
 
 #: install_interactive.pm:119
 #, c-format
@@ -5264,36 +5323,36 @@ msgstr "選取大小"
 #: install_interactive.pm:120
 #, c-format
 msgid "Root partition size in MB: "
-msgstr "根目錄分割區的大小 (MB)： "
+msgstr "根分割區的大小 MB:"
 
 #: install_interactive.pm:121
 #, c-format
 msgid "Swap partition size in MB: "
-msgstr "置換分割區的大小 (MB)： "
+msgstr "置換分割區 (swap) 的大小 MB:"
 
 #: install_interactive.pm:130
-#, fuzzy, c-format
+#, c-format
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
-msgstr "沒有可用的 FAT 分割區能夠調整大小，或者是該分割區沒足夠空間"
+msgstr "沒有可用的 FAT 分割區能當成 loopback 使用 (或者是沒足夠空間剩餘)"
 
 #: install_interactive.pm:139
 #, c-format
 msgid "Which partition do you want to resize?"
-msgstr "您要從新設定那個分割區的大小 ?"
+msgstr "您要從新調整那個分割區的大小?"
 
 #: install_interactive.pm:153
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
-"無法調整該 FAT 分割區的大小，發生了下面的錯誤:\n"
-"%s"
+"FAT 重新調整大小無法處理您的分割區,\n"
+" 發生了下面的錯誤: %s"
 
 #: install_interactive.pm:156
-#, fuzzy, c-format
+#, c-format
 msgid "Computing the size of the Windows partition"
-msgstr "使用 Windows 分割區所剩餘的可用空間"
+msgstr "計算 Windows 分割區大小"
 
 #: install_interactive.pm:163
 #, c-format
@@ -5301,10 +5360,13 @@ msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
 "Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
 "installation."
-msgstr "您的 Windows 分割區檔案系統有嚴重的斷離情況，請先重組動作再進行"
+msgstr ""
+"您的 Windows 分割區太支離破碎. 請先重新開機您的電腦到 Windows, 執行  "
+"``defrag'' 工具程式, 然後重新開始 Mandrakelinux 安裝."
 
-#: install_interactive.pm:164
-#, fuzzy, c-format
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
+#, c-format
 msgid ""
 "WARNING!\n"
 "\n"
@@ -5319,92 +5381,93 @@ msgid ""
 msgstr ""
 "警告!\n"
 "\n"
-"DrakX 現在要重定您 Windows 分割區的大小，請小心!! \n"
-"這個動作是很危險的，請先離開安裝程式，在 Windows \n"
-"底下執行 scandisk 跟 defrag 以後再來安裝 Linux，而且\n"
-"最好先將 Windows 分割區底下的資料做好備份。確定都\n"
-"沒問題以後，才按『確定』鈕。"
+"DrakX 現在將要重新調整大小您的 Windows 分割區. 請小心: 這個動作是很危險的.\n"
+"如果您不曾如此做過, 您先必須離開安裝, 在 Windows 命令提示底下執行\n"
+"\"chkdsk c:\" (注意, 執行圖形化程式 \"scandisk\" 不夠, 確定在命令提示下\n"
+"使用 \"chkdsk\" !), 選擇性執行 defrag, 然後重新開始安裝.\n"
+"您應該也備份您的資料. 當您確定時, 按下 Ok 確定."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "您要保留多少空間給 windows 使用"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "分割區 %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
-msgstr "正在計算 Windows 檔案系統的邊界"
+msgstr "正在重新調整 Windows 分割區大小"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
-msgstr "FAT 重定大小失敗： %s"
+msgstr "FAT 重新調整大小失敗: %s"
 
-#: install_interactive.pm:206
-#, fuzzy, c-format
+#: install_interactive.pm:208
+#, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
-msgstr "沒有可用的 FAT 分割區能夠調整大小，或者是該分割區沒足夠空間"
+msgstr "沒有 FAT 分割區能夠調整大小 (或者是沒足夠空間剩下)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "移除 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 "你系統上有多個硬碟可供安裝 Linux 系統，您打算要準備那一個供安裝使用？"
+msgstr "你有多於一個硬碟, 您打算那一個安裝 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 "所有在 %s 磁碟上的分割區跟資料都會被清除掉"
+msgstr "所有在 %s 磁碟上的已經存在的分割區跟他們的資料都將會遺失"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
-msgstr "使用 fdisk 程式"
+msgstr "使用 fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
 msgstr ""
-"您目前要對 %s 分割區進行劃分動作。\n"
-"當您完成時，別忘了輸入 'w' 寫入您的變更"
+"您現在可以對 %s 分割區進行劃分動作.\n"
+"當您完成時, 別忘了使用 'w' 儲存"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "找不到任何可用的安裝空間"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX 分割精靈找到了下面可用的解決方案："
+msgstr "DrakX 分割巫師找到了下列解決方案:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
-msgstr "硬碟分割失敗： %s"
+msgstr "硬碟分割失敗: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
-msgstr "啟動網路連線"
+msgstr "帶起網路"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
-msgstr "關閉網路連線"
+msgstr "關閉網路"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -5422,7 +5485,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 "
@@ -5444,7 +5507,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"
@@ -5452,14 +5515,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"
@@ -5489,10 +5552,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"
@@ -5503,11 +5566,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"
@@ -5523,10 +5586,10 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5538,7 +5601,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: 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"
@@ -5599,8 +5663,8 @@ msgstr ""
 "respective authors and are protected by intellectual property and \n"
 "copyright laws applicable to software programs.\n"
 
-#: install_messages.pm:128
-#, fuzzy, c-format
+#: install_messages.pm:131
+#, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5617,41 +5681,45 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
-"恭喜!! 系統已經完成安裝，請取出開機光碟或磁片，\n"
-"接著按 Enter 鍵重新開機。\n"
+"恭喜!! 系統已經完成安裝.\n"
+"請取出開機媒體且按下 return 以重新開機.\n"
+"\n"
 "\n"
+"要獲得這個 Mandrakelinux 釋出版本可用的修正相關資訊,\n"
+"諮詢可用的勘誤表: \n"
 "\n"
-"要獲得 Mandrakelinux 的相關資訊或程式修正訊息的話，\n"
-"請參考 Mandrake 公司的網頁以及程式勘誤表: \n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"關於設定系統的資訊，您可以在 Mandrakelinux 使用\n"
-"手冊 (Official Mandrakelinux User's Guide) 裡面找到。"
+"關於設定您的系統的資訊可以在正式 Mandrakelinux 使用者指南\n"
+"(Official Mandrakelinux User's Guide) 的安裝後章節 (post install chapter )\n"
+"裡面找到."
 
-#: 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 "重複的掛載點 %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 ""
-"有一部分重要的套件無法安裝到系統。\n"
-"可能是您的 cdrom 硬體有問題，或者是 CD 安裝片毀損了\n"
+"有某些重要的套件沒有被適當安裝.\n"
+"可能是您的 cdrom 磁碟或者是 cdrom 光碟有缺陷.\n"
+"確認 cdrom 在一個已經安裝的電腦上使用 \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "沒有可用的軟碟機"
@@ -5661,7 +5729,7 @@ msgstr "沒有可用的軟碟機"
 msgid "Entering step `%s'\n"
 msgstr "進入步驟 `%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"
@@ -5669,469 +5737,479 @@ msgid ""
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系統資源似乎太低 (實體記憶體太少等)，\n"
-"這可能導致在安裝過程中會發生不可預期的錯誤\n"
-"導致安裝失敗。建議您，若是接下來的確無法正常\n"
-"安裝的話，請改用文字模式的方式安裝較佳。\n"
-"也就是開機時出現 boot: 訊息時，請輸入 text \n"
-"進行文字安裝即可。"
+"您的系統資源太低. 您可能有某些問題在安裝 Mandrakelinux 過程中\n"
+"若是那發生的話, 您或許可以改用文字模式的方式安裝替代.\n"
+"要如此的話, CDROM 開機時按下 `F1', 然後輸入 `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 "依群組選取要安裝的套件"
+msgstr "套件群組選擇"
 
-#: 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 "總共大小： %d / %d MB"
+msgstr "總共大小: %d / %d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
-msgstr "毀損的套件"
+msgstr "壞掉的套件"
 
-#: install_steps_gtk.pm:342
-#, fuzzy, c-format
+#: install_steps_gtk.pm:311
+#, c-format
 msgid "Version: "
-msgstr "版本編號： %s\n"
+msgstr "版本:"
 
-#: install_steps_gtk.pm:343
-#, fuzzy, c-format
+#: install_steps_gtk.pm:312
+#, c-format
 msgid "Size: "
-msgstr "大小： %s"
+msgstr "大小:"
 
-#: install_steps_gtk.pm:343
-#, fuzzy, c-format
+#: install_steps_gtk.pm:312
+#, c-format
 msgid "%d KB\n"
-msgstr "大小： %d KB\n"
+msgstr ""
 
-#: install_steps_gtk.pm:344
-#, fuzzy, c-format
+#: install_steps_gtk.pm:313
+#, c-format
 msgid "Importance: "
-msgstr "重要性： %s\n"
+msgstr "重要性:"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
-msgstr "您不可以切換這個套件的狀態"
+msgstr "您不可以選擇/取消選擇這個套件"
 
-#: install_steps_gtk.pm:381
-#, fuzzy, c-format
+#: install_steps_gtk.pm:350
+#, c-format
 msgid "due to missing %s"
-msgstr "kdesu 程式不見了"
+msgstr "因為遺失 %s"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於 %s 未被滿足"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在嘗試促進 %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %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"
-msgstr "因為硬碟空間不足，您不可以選取這個套件。"
+msgstr "您不可以選取這個套件因為剩餘空間不足以安裝它."
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "下列的套件將會被安裝上"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "下列的套件將會被移除"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
-msgstr "這是一個必要的套件，您不可以選擇不要安裝這個套件"
+msgstr "這是一個必要的套件, 您不可以選擇不要安裝這個套件"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
-msgstr "這個套件已經安裝在系統上了，您不可以不選這個套件"
+msgstr "您不可以不選這個套件. 它已經被安裝上了."
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"這個套件一定要更新才行，\n"
+"這個套件一定要更新才行.\n"
 "您確定您不要選它嗎?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
-msgstr "這個套件一定要更新才行，您不可以不選這個套件"
+msgstr "您不可以不選這個套件. 它一定要更新才行."
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "顯示自動選取的套件"
+msgstr "自動顯示被選取的套件"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "由軟碟載入/儲存"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "正在更新套件的選擇"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "最小安裝"
 
-#: 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 "選擇您想要安裝的套件"
 
-#: 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 "正在安裝"
 
-#: install_steps_gtk.pm:477
-#, fuzzy, c-format
-msgid "No details"
-msgstr "詳細資訊"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "正在估計"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "剩餘時間"
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
-msgstr "正在準備安裝工作..."
+msgstr "請稍後, 正在準備安裝..."
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "沒有詳細資訊"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
-msgstr "%d 個套件"
+msgstr "%d 套件"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安裝 %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 "拒絕"
 
-#: 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 ""
-"換片了!\n"
-"\n"
-"請更換命名為 \"%s\" 的安裝片，然後按下確定繼續。\n"
-"若是您並沒有這張安裝片，請點選取消略過這一片的安裝的動作。"
+"更換 Cd-Rom!\n"
+"請插入 Cd-Rom 標籤為 \"%s\" 於您的磁碟, 完成時按下 Ok 確定.\n"
+"若是您並沒有它, 請點選 Cancel 取消以略過這一片 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 "排列套件時發生錯誤："
+msgstr "排列套件時發生錯誤:"
 
-#: 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 "無論如何都要繼續嗎 ?"
+msgstr "無論如何都要繼續嗎?"
 
-#: 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 "安裝套件時發生錯誤："
+msgstr "安裝套件時發生錯誤:"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
-#, fuzzy, c-format
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
+#, c-format
 msgid "not configured"
-msgstr "重新設定"
+msgstr "未被設定"
 
-#: install_steps_interactive.pm:81
-#, fuzzy, c-format
+#: install_steps_interactive.pm:86
+#, c-format
 msgid "Do you want to recover your system?"
-msgstr "您要使用 aboot 嗎 ?"
+msgstr "您想要恢復您的系統嗎?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "版權協議"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "發行紀錄"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
-msgstr "請選取鍵盤排列的格式是那一種。"
+msgstr "請選取鍵盤排列的格式."
 
-#: 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 "以下是所有的國家/地區"
+msgstr "以下是所有可用的的鍵盤"
 
-#: install_steps_interactive.pm:143
-#, fuzzy, c-format
+#: install_steps_interactive.pm:153
+#, c-format
 msgid "Install/Upgrade"
 msgstr "安裝/升級"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "這是安裝或是升級?"
 
-#: install_steps_interactive.pm:150
-#, fuzzy, c-format
+#: install_steps_interactive.pm:160
+#, c-format
 msgid "Upgrade %s"
-msgstr "升級"
+msgstr "升級 %s"
 
-#: install_steps_interactive.pm:160
-#, fuzzy, c-format
+#: install_steps_interactive.pm:170
+#, c-format
 msgid "Encryption key for %s"
-msgstr "加密金鑰"
+msgstr "加密金鑰於 %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
-msgstr "請選取滑鼠的形式。"
+msgstr "請選取您的滑鼠的形式."
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "滑鼠連接埠"
 
-#: 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 "請選取您滑鼠連接的序列埠。"
+msgstr "請選取您滑鼠連接的序列埠."
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "按鍵模擬"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
-msgstr "兩鍵模擬"
+msgstr "第二鍵模擬"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "第三鍵模擬"
 
-#: 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 "正在設定 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 "設定 IDE 裝置"
+msgstr "正在設定 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 "找不到可用的分割區"
+msgstr "沒有可用的分割區"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
-msgstr "正在掃描分割區所屬的掛載點"
+msgstr "正在掃描分割區以尋找掛載點"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "選取掛載點"
 
-#: 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 "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
-"沒有足夠的可用空間安裝開機管理程式! 安裝還是會繼續，但是您需要使用開機片才能"
-"夠正確啟動系統。"
+"沒有足夠的可用空間安裝 bootstrap! 安裝還是會繼續, 但是您需要在 DiskDrake\n"
+"建立 bootstrap 分割以開機您的系統"
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "選擇要格式化的分割區"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
-msgstr "檢查壞掉的磁區?"
+msgstr "檢查壞掉的區塊?"
 
-#: 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, "
 "you can lose data)"
-msgstr ""
-"無法檢查該 %s 檔案系統，您要修復該錯誤嗎？(請注意，修復可能導致遺失資料)"
+msgstr "無法檢查檔案系統 %s. 您要修復該錯誤嗎? (請注意, 您可能遺失資料)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "沒有足夠的虛擬記憶體可以用來完成安裝作業，請增加置換空間"
+msgstr "沒有足夠的置換空間 (swap) 可以用來完成安裝, 請增加一些"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "正在搜尋可以安裝的套件並且建立 rpm 資料庫..."
+msgstr "正在搜尋可以用的套件並且建立 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 "正在搜尋可以安裝的套件"
+msgstr "正在搜尋可以用的套件..."
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "正在搜尋已經安裝過的套件..."
+msgstr "正在查看已經安裝過的套件..."
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "正在搜尋需要升級的套件"
+msgstr "正在搜尋要升級的套件..."
+
+#: 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 "連結到 Mirror Linux Web Site 查詢可用的映射站台"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "您的系統沒有足夠的空間可以用來安裝或升級了 (%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"
 "The format is the same as auto_install generated floppies."
 msgstr ""
-"請選擇在載入或者是儲存所選擇的套件到磁片內。\n"
-"該磁片格式就是自動安裝時所製作產生的磁片格式。"
+"請選擇載入或者是儲存套件選擇到軟片.\n"
+"該格式等同於 auto_install 產生的軟片."
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
-msgstr "載入軟碟中的設定值"
+msgstr "由軟片載入"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
-msgstr "儲存設定到磁片"
+msgstr "儲存到軟片"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "套件選取"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
-msgstr "正在載入軟碟中的設定值"
+msgstr "正在由軟片載入"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
-msgstr "請插入一張包含軟體選取清單紀錄的磁片"
+msgstr "插入一張包含套件選擇的軟片"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
-msgstr "所選取紀錄的項目超過可用的磁碟空間"
+msgstr "所選取的大小超過可用的空間"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "安裝類型"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
-"您並未選取任何套件群組\n"
-"請選擇您所需要的最小安裝"
+"您並未選取任何套件群組.\n"
+"請選擇您想要的最小安裝:"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "包含基本的說明文件 (建議)"
+msgstr "包含基本的說明文件 (被建議的!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "真正最小安裝 (無 urpmi 程式 )"
+msgstr "真正最小安裝 (尤其無 urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
-msgstr "所有"
+msgstr "全部"
 
-#: 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"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
-"如果您有下面清單內所列出的 CD 光碟片，請選擇確定。\n"
-"如果都沒有的話，請選擇取消。\n"
-"如果有一些項目您並沒有的話，把該項目取消選取，然後按下確定繼續。"
+"如果您有下面清單內所列出的 CD, 請點選 Ok 確定.\n"
+"如果都沒有的話, 請點選 Cancel 取消.\n"
+"如果有一些項目您並沒有的話, 把該項目取消選取, 然後按下 Ok 確定."
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "標為 \"%s\" 的光碟片"
+msgstr "標籤為 \"%s\" 的 Cd-Rom"
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
-msgstr "正在準備安裝工作"
+msgstr "正在準備安裝"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6140,17 +6218,17 @@ msgstr ""
 "正在安裝 %s 套件\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
-msgstr "安裝後的進一步設定"
+msgstr "安裝後的設定"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "請在 %s 磁碟機內插入一張包含更新模組資料的磁碟片"
+msgstr "請在 %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"
@@ -6160,281 +6238,235 @@ 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 ""
-"在「Linux Distribution」每隔發行一段時間後，\n"
-"廠商都會放出相關的修正套件供使用者安裝更新。\n"
+"您現在有機會下載更新套件. 這些套件在發行版釋放之後已經被更新過了.\n"
+"他們或許有安全性或臭蟲修正.\n"
 "\n"
-"您現在就能夠直接取得目前最新的相關套件修正\n"
-"資訊，不過前提就是您的網路連線設定已經無誤\n"
-"可以正常使用。\n"
+"要下載這些套件, 您將需要有可工作的網際網路連線.\n"
 "\n"
-"那您打算要安裝更新套件嗎？"
-
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
+"您想要安裝更新嗎?"
 
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
-msgstr "向 FTP 映射站台查詢可用的程式套件列表"
+msgstr "聯繫映射站台取得可用的程式套件列表..."
 
-#: install_steps_interactive.pm:792
-#, fuzzy, c-format
+#: install_steps_interactive.pm:857
+#, c-format
 msgid "Unable to contact mirror %s"
-msgstr "無法建立另一行程：%s"
+msgstr "無法聯繫映射站台 %s"
 
-#: install_steps_interactive.pm:792
-#, fuzzy, c-format
+#: install_steps_interactive.pm:857
+#, c-format
 msgid "Would you like to try again?"
-msgstr "您要設定列印機列印項目嗎？"
+msgstr "您要再試一次嗎?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
-msgstr "您的時區為何 ?"
+msgstr "您的時區為何?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
-msgstr "自動透過 NTP 服務校時"
+msgstr "自動時間同步(使用 NTP 服務)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
-msgstr "NTP 伺服主機"
+msgstr "NTP 伺服器"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "總結"
 
-#: 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 "系統"
 
-#: 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 "硬體"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "遠端 CUPS 伺服器"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "無列印機"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
-msgstr "您系統有 ISA 音效卡嗎？"
+msgstr "您有 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 "請在安裝完畢後，執行 \"sndconfig\" 來設定音效卡"
+msgstr "請在安裝完畢後, 執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "沒偵測到任何音效卡。請在安裝後執行 \"harddrake\" 進行設定"
+msgstr "沒偵測到任何音效卡. 請在安裝後嘗試 \"harddrake\" 進行設定"
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介面"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
+#, c-format
 msgid "Network & Internet"
-msgstr "網路介面"
+msgstr "網路 & 網際網路"
 
-#: install_steps_interactive.pm:1020
-#, fuzzy, c-format
-msgid "Proxies"
-msgstr "設定檔："
-
-#: install_steps_interactive.pm:1021
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1086
+#, c-format
 msgid "configured"
-msgstr "重新設定"
+msgstr "已設定"
 
-#: 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 "安全性"
 
-#: install_steps_interactive.pm:1049
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1114
+#, c-format
 msgid "activated"
-msgstr "立即啟動"
+msgstr "被激活"
 
-#: install_steps_interactive.pm:1049
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1114
+#, c-format
 msgid "disabled"
-msgstr "關閉"
+msgstr "被禁用"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
-msgstr "啟動"
+msgstr "重新開機"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1127
+#, c-format
 msgid "%s on %s"
-msgstr "連接埠"
+msgstr ""
 
-#: 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 "服務程式： %d 已經啟動，共有 %d 註冊的項目"
+msgstr "服務: %d 已經啟動 給 %d 註冊的項目"
 
-#: 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 ""
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "設定 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 "這個密碼太短了 (一定至少要有 %d 個字元才行)"
 
-#: 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 "認證方式"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
-msgstr "正在準備開機程式"
+msgstr "正在準備開機載入器..."
 
-#: install_steps_interactive.pm:1198
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1264
+#, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
 "The install will continue, but you'll\n"
 " need to use BootX or some other means to boot your machine"
 msgstr ""
-"您的系統似乎有 OldWorld 或者是其他不認識的項目，\n"
-"這將會導致yaboot 開機啟動程式無法正常運作。\n"
-"安裝還是會繼續下去，不過您也許需要使用 bootX \n"
-"來啟動你的電腦。"
+"您的系統似乎有 OldWorld 或者是其他不認識的機器,\n"
+"這將會導致 yaboot 開機載入器無法正常運作.\n"
+"安裝還是會繼續下去, 不過您將需要使用 bootX 或某些其他方法來開機你的機器."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
-msgstr "您要使用 aboot 嗎 ?"
+msgstr "您要使用 aboot 嗎?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
-"安裝 aboot 時發生錯誤，\n"
-"你要冒著可能毀損第一個分割區的強況強迫再次安裝嗎？"
-
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "正在安裝開機程式"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "開機程式安裝失敗，發生如下之錯誤："
-
-#: 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 ""
-"您也許需要改變您的 Open Firmware 上面的開機裝置設定，\n"
-"以便於開啟開機啟動程式的功能。如果您開機時並沒有開到\n"
-"開機程式的任何訊息，於重新開機時按住 Command-Option-O-F，\n"
-"然後輸入: setenv boot-device %s,\\\\:tbxi\n"
-"然後再輸入: shut-down\n"
-"然後你下一次開機時應該就可以看到開機啟動程式的訊息了。"
+"安裝 aboot 時發生錯誤,\n"
+"你要冒著可能毀損第一個分割區的危險強迫安裝嗎?"
 
-#: 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 "
 "restricted to the administrator."
 msgstr ""
 
-#: 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 "請在 %s 中插入一片空白磁片"
+msgstr "請在 %s 中插入一片空白軟片"
 
-#: install_steps_interactive.pm:1280
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1327
+#, c-format
 msgid "Please insert another floppy for drivers disk"
-msgstr "請在 %s 磁碟機內插入一張可開機磁碟片"
+msgstr "請插入另一張軟片給驅動磁碟"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "正在製作自動安裝磁片"
+msgstr "正在製作自動安裝軟片..."
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"還有些步驟沒有完成，\n"
+"還有些步驟沒有完成.\n"
 "\n"
-"您確定要結束安裝程式？"
+"您確定要結束安裝程式?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
-msgstr "製作自動安裝磁片"
+msgstr "製作自動安裝軟片"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -6443,46 +6475,67 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
-"自動安裝功能，可以完全滿足您希望能夠自動化的在一台\n"
-"電腦上進行系統安裝的動作。\n"
+"auto install 想要的話可以完全自動化, 在那種情況下它將接管硬碟!!\n"
 "\n"
-"這個功能，您就可以進行所謂的自動化進行安裝的機制。\n"
+"(這是要安裝於另一台機器上的).\n"
+"您或許想要重演安裝.\n"
 
 #: install_steps_newt.pm:20
 #, c-format
 msgid "Mandrakelinux Installation %s"
 msgstr "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 "
-msgstr "  <Tab>/<Alt-Tab> 在項目間移動    | <Space> 選取    | <F12> 下個螢幕"
+msgstr "  <Tab>/<Alt-Tab> 在元件間移動  | <Space> 選取 | <F12> 下個螢幕 "
 
 #: interactive.pm:170
 #, c-format
 msgid "Choose a file"
-msgstr "選擇檔案"
+msgstr "選擇一個檔案"
+
+#: 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 "增加"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "修改"
+
+#: 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 "移除"
 
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "基本"
 
-#: 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 "完成"
 
-#: interactive/newt.pm:83
-#, fuzzy, c-format
+#: interactive/newt.pm:92
+#, c-format
 msgid "Do"
-msgstr "向下"
+msgstr "做"
 
 #: interactive/stdio.pm:29 interactive/stdio.pm:148
 #, c-format
 msgid "Bad choice, try again\n"
-msgstr "壞選擇，請再試一遍\n"
+msgstr "壞選擇, 再試一遍\n"
 
 #: interactive/stdio.pm:30 interactive/stdio.pm:149
 #, c-format
@@ -6495,23 +6548,23 @@ msgid ""
 "Entries you'll have to fill:\n"
 "%s"
 msgstr ""
-"該欄位項目您需要輸入:\n"
+"欄位項目您需要輸入:\n"
 "%s"
 
 #: interactive/stdio.pm:70
 #, c-format
 msgid "Your choice? (0/1, default `%s') "
-msgstr "您的選擇? (0/1，預設為 `%s') "
+msgstr "您的選擇? (0/1, 預設為 `%s') "
 
 #: interactive/stdio.pm:94
 #, c-format
 msgid "Button `%s': %s"
-msgstr "按鈕 `%s'： %s"
+msgstr "按鈕 `%s': %s"
 
 #: interactive/stdio.pm:95
 #, c-format
 msgid "Do you want to click on this button?"
-msgstr "您要按這個按鈕嗎？"
+msgstr "您要按這個按鈕嗎?"
 
 #: interactive/stdio.pm:104
 #, c-format
@@ -6521,12 +6574,12 @@ msgstr "您的選擇? (預設為 `%s'%s) "
 #: interactive/stdio.pm:104
 #, c-format
 msgid " enter `void' for void entry"
-msgstr "輸入「void」表示空的項目"
+msgstr " 輸入 `void' 表示空的項目"
 
 #: interactive/stdio.pm:122
 #, c-format
 msgid "=> There are many things to choose from (%s).\n"
-msgstr "%s 上有很多的項目可供選擇。\n"
+msgstr "=> %s 上有很多的事物可供選擇.\n"
 
 #: interactive/stdio.pm:125
 #, c-format
@@ -6535,8 +6588,8 @@ msgid ""
 "or just hit Enter to proceed.\n"
 "Your choice? "
 msgstr ""
-"請選取您要編輯的前10個項目，按下Enter繼續。\n"
-"您目前選擇是？"
+"請選取前 10 個項目中您要編輯的第一個數字, 或者按下 Enter 繼續.\n"
+"您選擇是?"
 
 #: interactive/stdio.pm:138
 #, c-format
@@ -6544,7 +6597,7 @@ msgid ""
 "=> Notice, a label changed:\n"
 "%s"
 msgstr ""
-"=> 請注意，該項目已經變更了:\n"
+"=> 請注意, 一個標籤已經變更了:\n"
 "%s"
 
 #: interactive/stdio.pm:145
@@ -6552,580 +6605,775 @@ msgstr ""
 msgid "Re-submit"
 msgstr "重新送出"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "捷克 (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "德國"
 
-#: 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 "西班牙"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "芬蘭"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "法國"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "挪威"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "波蘭"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "俄羅斯"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "瑞典"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "英式鍵盤"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "美式鍵盤"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "阿爾巴尼亞"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "亞美尼亞 (old)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "亞美尼亞 (typewriter)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "亞美尼亞 (phonetic)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arabic"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "蘇聯共和國 (latin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "比利時"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "孟加拉"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "保加利亞 (phonetic)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "保加利亞"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "巴西 (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "愛沙尼亞"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr ""
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "瑞士 (德國式配置)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "瑞士 (法國式配置)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "捷克 (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "德國 (no dead keys)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr ""
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "丹麥"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvorak (Norwegian)"
-
 #: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Norwegian)"
-msgstr "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr ""
 
 #: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Swedish)"
-msgstr "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
+msgstr "Dvorak (Norwegian)"
 
 #: keyboard.pm:203
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
+msgstr "Dvorak (Swedish)"
+
+#: keyboard.pm:205
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "愛沙尼亞"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "喬治亞 (\"俄國式\" 配置)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "喬治亞 (\"拉丁式\" 配置)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "希臘"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr ""
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr ""
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr ""
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "匈牙利"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "克羅埃西亞"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr ""
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "以色列"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "以色列 (音標)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "伊朗"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "冰島"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "義大利"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr ""
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "日本 106 鍵"
 
-#: keyboard.pm:226
-#, fuzzy, c-format
-msgid "Kannada"
-msgstr "Canada"
+#: keyboard.pm:230
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kannada"
+msgstr ""
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "韓式鍵盤"
 
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "英式鍵盤"
+#: 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 "拉丁美洲"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "老撾國"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "立陶宛 (舊 AZERTY 式)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "立陶宛 (新 AZERTY 式)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
-msgstr "立陶宛 (number row, QWERTY 式)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
+msgstr "立陶宛 \"number row, QWERTY 式\""
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "立陶宛 (phonetic, QWERTY 式)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
+msgstr "立陶宛 \"phonetic, QWERTY 式\""
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "拉托維亞"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr ""
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "馬其頓"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
-msgstr "蒙古語 (緬甸語)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
+msgstr "緬甸語 (Burmese)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
-msgstr "塞爾維亞 (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
+msgstr "蒙古語 (cyrillic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "馬爾他語 (UK)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "馬爾他語 (US)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "荷蘭"
 
-#: keyboard.pm:247
-#, fuzzy, c-format
-msgid "Oriya"
-msgstr "Suriname"
+#: keyboard.pm:255
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Oriya"
+msgstr ""
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "波蘭 (qwerty 式配置)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "波蘭 (qwertz 式配置)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "葡萄牙"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "加拿大 (魁北克)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "羅馬尼亞 (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "羅馬尼亞 (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "俄羅斯 (音標)"
 
-#: keyboard.pm:257
-#, fuzzy, c-format
-msgid "Saami (norwegian)"
-msgstr "Dvorak (Norwegian)"
+#: keyboard.pm:266
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
+msgstr ""
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "斯洛法尼亞"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "斯洛法克 (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "斯洛法克 (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "塞爾維亞 (cyrillic)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syriac"
 
-#: keyboard.pm:266
-#, fuzzy, c-format
-msgid "Syriac (phonetic)"
-msgstr "亞美尼亞 (phonetic)"
+#: keyboard.pm:275
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
+msgstr "利亞語 (phonetic)"
 
-#: keyboard.pm:267
-#, fuzzy, c-format
-msgid "Telugu"
-msgstr "Tokelau"
+#: keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Telugu"
+msgstr ""
 
-#: keyboard.pm:269
-#, fuzzy, c-format
-msgid "Tamil (ISCII-layout)"
-msgstr "坦米爾 (TSCII)"
+#: keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
+msgstr "坦米爾 (ISCII-佈置)"
 
-#: keyboard.pm:270
-#, fuzzy, c-format
-msgid "Tamil (Typewriter-layout)"
-msgstr "亞美尼亞 (typewriter)"
+#: keyboard.pm:279
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
+msgstr "亞美尼亞 (Typewriter-佈置)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "泰式鍵盤"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Tajik 鍵盤"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "土耳其 (傳統式 \"F\" 型)"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "土耳其 (現代式 \"Q\" 型)"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "烏克蘭"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
-msgstr "美式鍵盤 (國際通用型)"
+msgstr "美式鍵盤 (國際型)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, fuzzy, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "塞爾維亞 (cyrillic)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "越南 \"numeric row\" QWERTY 式"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
-msgstr "南斯拉夫 (拉丁式配置)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
+msgstr "南斯拉夫 (拉丁)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "右方 Alt 按鍵"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "同時兩邊 Shift 按鍵"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
-msgstr "Ctrl 與 Shift 組合按鍵"
+msgstr "Control 與 Shift 鍵同時"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock 按鍵"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Shift 與 CapsLock 鍵同時"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
-msgstr "Ctrl 與 Alt 組合按鍵"
+msgstr "Ctrl 與 Alt 鍵同時"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
-msgstr "Alt 與 Shift 組合按鍵"
+msgstr "Alt 與 Shift 鍵同時"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"選單\" 按鍵"
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左邊 \"Windows\" 按鍵"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右邊 \"Windows\" 按鍵"
 
-#: keyboard.pm:299
-#, fuzzy, c-format
+#: keyboard.pm:310
+#, c-format
 msgid "Both Control keys simultaneously"
-msgstr "同時兩邊 Shift 按鍵"
+msgstr "同時兩邊 Control 按鍵"
 
-#: keyboard.pm:300
-#, fuzzy, c-format
+#: keyboard.pm:311
+#, c-format
 msgid "Both Alt keys simultaneously"
-msgstr "同時兩邊 Shift 按鍵"
+msgstr "同時兩邊 Alt 按鍵"
 
-#: keyboard.pm:301
-#, fuzzy, c-format
+#: keyboard.pm:312
+#, c-format
 msgid "Left Shift key"
-msgstr "左邊 \"Windows\" 按鍵"
+msgstr "左邊 Shift 按鍵"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
-msgstr "右方 Shift 按鍵"
+msgstr "右邊 Shift 按鍵"
 
-#: keyboard.pm:303
-#, fuzzy, c-format
+#: keyboard.pm:314
+#, c-format
 msgid "Left Alt key"
-msgstr "右方 Alt 按鍵"
+msgstr "左邊 Alt 按鍵"
 
-#: keyboard.pm:304
-#, fuzzy, c-format
+#: keyboard.pm:315
+#, c-format
 msgid "Left Control key"
-msgstr "遠端列印機"
+msgstr "左邊 Control 按鍵"
 
-#: keyboard.pm:305
-#, fuzzy, c-format
+#: keyboard.pm:316
+#, c-format
 msgid "Right Control key"
-msgstr "右方 Alt 按鍵"
+msgstr "右邊 Control 按鍵"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
-msgstr "請選擇熱鍵，以便於快速的切換不同的鍵盤配置"
+msgstr ""
+"請選擇按鍵或組合鍵, 以便於快速的切換不同的鍵盤配置\n"
+"(eg: 拉丁與非拉丁)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7133,1164 +7381,1188 @@ 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 "Afghanistan"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
-msgstr "United Arab Emirates"
+msgstr "阿拉伯聯合大公國"
+
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
 
-#: lang.pm:172
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua and Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albania"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia and Herzegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Belarus"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr ""
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Central African Republic"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr ""
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: 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 "中國"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr ""
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Cuba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
-msgstr "Christmas Island"
+msgstr "聖誕島"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: 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 "Denmark"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algeria"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Egypt"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
-msgstr "Western Sahara"
+msgstr "西撒哈拉"
 
-#: 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 "西班牙"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: 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 "Falkland Islands (Malvinas)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Greenland"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: lang.pm:254
-#, fuzzy, c-format
+#: lang.pm:268
+#, c-format
 msgid "South Georgia and the South Sandwich Islands"
-msgstr "South Georgia and the South Sandwich Island"
+msgstr ""
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
-msgstr "Guam"
+msgstr "關島"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
-msgstr "中國(香港)"
+msgid "Hong Kong SAR (China)"
+msgstr "香港 SAR (中國)"
 
-#: lang.pm:260
-#, fuzzy, c-format
+#: lang.pm:274
+#, c-format
 msgid "Heard and McDonald Islands"
-msgstr "Heard Island and McDonald Islands"
+msgstr ""
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croatia"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
-msgstr "Hungary"
+msgstr "匈牙利"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "印度尼西亞"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "印度"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
+msgstr "大不列顛印度海洋領土"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Iraq"
 
-#: lang.pm:271
-#, fuzzy, c-format
+#: lang.pm:285
+#, c-format
 msgid "Iran"
-msgstr "Iraq"
+msgstr ""
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Iceland"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "約旦"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "肯亞"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts and Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr ""
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "科威特"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "寮國"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "利比利亞"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "森堡"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Latvia"
 
-#: lang.pm:298
-#, fuzzy, c-format
+#: lang.pm:312
+#, c-format
 msgid "Libya"
-msgstr "利比利亞"
+msgstr "利比亞"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Morocco"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
-msgstr "Mali"
+msgstr "馬里"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldives"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Mexico"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr "尼加拉瓜"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
-msgstr "Nepal"
+msgstr "尼泊爾"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Peru"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "French Polynesia"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre and Miquelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:342
-#, fuzzy, c-format
+#: lang.pm:356
+#, c-format
 msgid "Palestine"
-msgstr "路徑選擇"
+msgstr ""
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Romania"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "蘇俄"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
+msgstr "沙烏地阿拉伯"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Sudan"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard and Jan Mayen Islands"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome and Principe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:368
-#, fuzzy, c-format
+#: lang.pm:382
+#, c-format
 msgid "Syria"
-msgstr "Suriname"
+msgstr ""
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks and Caicos Islands"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "泰國"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "East Timor"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Turkey"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad and Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "台灣"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr ""
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:392
-#, fuzzy, c-format
+#: lang.pm:406
+#, c-format
 msgid "Vatican"
-msgstr "拉托維亞"
+msgstr "梵諦岡"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent and the Grenadines"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virgin Islands (British)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virgin Islands (U.S.)"
 
-#: lang.pm:397
-#, fuzzy, c-format
+#: lang.pm:411
+#, c-format
 msgid "Vietnam"
-msgstr "Viet Nam"
+msgstr ""
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:399
-#, fuzzy, c-format
+#: lang.pm:413
+#, c-format
 msgid "Wallis and Futuna"
-msgstr "Wallis and Futuna Islands"
+msgstr ""
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr ""
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "南非"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
-msgstr "Zambia"
+msgstr "尚比亞"
 
-#: 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 "您應該安裝下列套件: %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 "歡迎來到 %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
-msgstr "%s 被循環掛載\n"
+msgstr "循環掛載 %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
-msgstr "先移除 logical volume\n"
+msgstr "先移除邏輯 volume\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "參數"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr ""
@@ -8298,17 +8570,17 @@ msgstr ""
 #: modules/interactive.pm:22
 #, c-format
 msgid "Module configuration"
-msgstr "手動組態設定"
+msgstr "模組組態設定"
 
 #: modules/interactive.pm:22
 #, c-format
 msgid "You can configure each parameter of the module here."
-msgstr "您可以在這邊輸入該模組的相關參數。"
+msgstr "您可以在這邊輸入該模組的每一個參數."
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "找到 %s %s 介面"
+msgid "Found %s interfaces"
+msgstr "找到 %s 介面"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -8323,7 +8595,7 @@ msgstr "你是否有任何 %s 介面?"
 #: modules/interactive.pm:71
 #, c-format
 msgid "See hardware info"
-msgstr "檢視硬體資訊"
+msgstr "看硬體資訊"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
@@ -8343,8 +8615,8 @@ msgid ""
 "You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
-"您需要為該模組 %s 指定相關參數選項。請注意一下，\n"
-"輸入的記憶體位置敘述，應該使用 0x 開頭，比方像是「0x123」"
+"您現在可以為模組 %s 提供選項.\n"
+"請注意一下, 輸入的記憶體位置應該使用 0x 開頭, 比方像是 '0x123'"
 
 #: modules/interactive.pm:104
 #, c-format
@@ -8353,22 +8625,22 @@ msgid ""
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
-"您現在可以輸入要給 %s 模組使用的參數。\n"
-"參數的格式為 \"name=value name2=value2 ...\"\n"
-"例如「io=0x300 irq=7」"
+"您現在可以為模組 %s 提供選項.\n"
+"選項的格式為 ``name=value name2=value2 ...''\n"
+"例如, ``io=0x300 irq=7''"
 
 #: modules/interactive.pm:106
 #, c-format
 msgid "Module options:"
-msgstr "模組參數："
+msgstr "模組選項:"
 
 #. -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 "我應該試那個 %s 驅動程式呢？"
+msgstr "我應該試那個 %s 驅動程式呢?"
 
-#: 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"
@@ -8379,28 +8651,28 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"雖然大部分時候不需要額外的參數，可是有些時候 %s 的驅動\n"
-"程式需要加上一些參數才能正常運作；您要指定額外的參數給\n"
-"驅動程式，還是讓程式自行偵測硬體設定呢? 有時候自動偵測\n"
-"會讓電腦當機，不過應該不至於造成任何傷害才對。"
+"某些時候, %s 驅動程式需要有附加的資訊以便適當工作,\n"
+"雖然它正常來說可以沒有他們而好好的工作. 您想要指定附加的選項給它嗎\n"
+"或是允許驅動程式偵測您的機器需要取得驅動程式需要的資訊?有時候偵測會讓電腦當"
+"機, 不過應該不至於造成任何傷害才對."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "自動偵測"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
-msgstr "指定參數"
+msgstr "指定選項"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
-"載入 %s 模組失敗，\n"
+"載入 %s 模組失敗.\n"
 "您要用其他參數再試一次嗎?"
 
 #: modules/parameters.pm:49
@@ -8446,21 +8718,21 @@ msgstr "Logitech MouseMan+"
 #: mouse.pm:33
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
-msgstr "一般 PS/2 Wheel 滑鼠"
+msgstr "一般 PS/2 滾輪滑鼠"
 
 #: mouse.pm:34
 #, c-format
 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
-#, fuzzy, c-format
+#: 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 "自動分配 IP"
+msgstr "自動"
 
 #: mouse.pm:39 mouse.pm:73
 #, c-format
@@ -8495,7 +8767,7 @@ msgstr "一般的兩鍵式滑鼠"
 #: mouse.pm:50 mouse.pm:59
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
-msgstr "一般的三鍵式滑鼠"
+msgstr "一般的三鍵式滑鼠有滾輪模擬"
 
 #: mouse.pm:51
 #, c-format
@@ -8523,9 +8795,9 @@ msgid "Logitech MouseMan"
 msgstr "Logitech Bus Mouse"
 
 #: mouse.pm:62
-#, fuzzy, c-format
+#, c-format
 msgid "Logitech MouseMan with Wheel emulation"
-msgstr "Logitech Bus Mouse"
+msgstr "有滾輪模擬的 Logitech MouseMan"
 
 #: mouse.pm:63
 #, c-format
@@ -8538,9 +8810,9 @@ msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
 #: mouse.pm:66
-#, fuzzy, c-format
+#, c-format
 msgid "Logitech CC Series with Wheel emulation"
-msgstr "Logitech CC Series"
+msgstr "有滾輪模擬的 Logitech CC Series"
 
 #: mouse.pm:67
 #, c-format
@@ -8563,14 +8835,14 @@ msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial, old C7 type)"
 
 #: mouse.pm:72
-#, fuzzy, c-format
+#, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
-msgstr "Logitech Mouse (serial, old C7 type)"
+msgstr "有滾輪模擬的 Logitech Mouse (serial, old C7 type)"
 
 #: mouse.pm:74
-#, fuzzy, c-format
+#, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
-msgstr "Kensington Thinking Mouse"
+msgstr "有滾輪模擬的 Kensington Thinking Mouse"
 
 #: mouse.pm:77
 #, c-format
@@ -8588,102 +8860,107 @@ msgid "3 buttons"
 msgstr "三個按鍵"
 
 #: mouse.pm:82
-#, fuzzy, c-format
+#, c-format
 msgid "3 buttons with Wheel emulation"
-msgstr "按鍵模擬"
+msgstr "有滾輪模擬的三個按鍵"
 
 #: mouse.pm:86
-#, fuzzy, c-format
+#, c-format
 msgid "Universal"
-msgstr "後續反安裝設定"
+msgstr "通用"
 
 #: mouse.pm:88
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: 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 "無"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "無滑鼠"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "請測試滑鼠"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
-msgstr "為了讓您的滑鼠能夠使用"
+msgstr "為了激活您的滑鼠"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
-msgstr "移動您的滾輪 !"
+msgstr "移動您的滾輪!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "使用 pppoe"
+msgid "use PPPoE"
+msgstr "使用 PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "使用 pptp"
+msgid "use PPTP"
+msgstr "使用 PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "使用 dhcp"
+msgid "use DHCP"
+msgstr "使用 DHCP"
 
 #: network/adsl.pm:22
 #, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch USB"
+msgid "Alcatel Speedtouch USB"
+msgstr ""
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
-#, fuzzy, c-format
+#, c-format
 msgid " - detected"
-msgstr "偵測到 %s "
+msgstr ""
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
 msgstr ""
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
+msgid "Sagem (using DHCP) USB"
 msgstr ""
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "連線到 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 ""
-"常見撥接式 ADSL 就是使用 pppoe 程式\n"
-"有些連線是使用 pptp 程式，甚至有的是使用\n"
-"dhcp。若是您不清楚的話，請選擇使用 pppoe"
+"最常連線到 ADSL 的方法就是使用 pppoe.\n"
+"有些連線是使用 PPTP, 有些事使用 DHCP.\n"
+"若是您不清楚的話, 選擇 '使用 PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:766
-#, fuzzy, c-format
-msgid "ADSL connection type :"
-msgstr "ADSL 連線"
+#: network/adsl.pm:41 network/netconnect.pm:804
+#, c-format
+msgid "ADSL connection type:"
+msgstr "ADSL 連線型態:"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Web 伺服器"
@@ -8691,17 +8968,17 @@ msgstr "Web 伺服器"
 #: network/drakfirewall.pm:17
 #, c-format
 msgid "Domain Name Server"
-msgstr "DNS 伺服器"
+msgstr "網域名稱伺服器"
 
 #: network/drakfirewall.pm:22
-#, fuzzy, c-format
+#, c-format
 msgid "SSH server"
-msgstr "NIS 伺服主機"
+msgstr "SSH 伺服器"
 
 #: network/drakfirewall.pm:27
 #, c-format
 msgid "FTP server"
-msgstr "NTP 伺服器"
+msgstr "FTP 伺服器"
 
 #: network/drakfirewall.pm:32
 #, c-format
@@ -8714,9 +8991,9 @@ msgid "POP and IMAP Server"
 msgstr "POP 與 IMAP 伺服器"
 
 #: network/drakfirewall.pm:42
-#, fuzzy, c-format
+#, c-format
 msgid "Telnet server"
-msgstr "X 伺服程式"
+msgstr "Telnet 伺服器"
 
 #: network/drakfirewall.pm:48
 #, fuzzy, c-format
@@ -8724,9 +9001,9 @@ msgid "Samba server"
 msgstr "Samba 伺服器"
 
 #: network/drakfirewall.pm:54
-#, fuzzy, c-format
+#, c-format
 msgid "CUPS server"
-msgstr "DNS 伺服器"
+msgstr "CUPS 伺服器"
 
 #: network/drakfirewall.pm:60
 #, c-format
@@ -8752,13 +9029,11 @@ msgid ""
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
-"歡迎來到輕量型防火牆設定程式\n"
-"\n"
-"這是用來設定Mandrake-Linux機器上的個人防火牆的組態，\n"
-"能夠協助您完成簡易的防火牆設定。\n"
+"drakfirewall 設定程式\n"
 "\n"
-"若是您需要很完備強大的防火牆解決方案，您可以參閱\n"
-"『MandrakeSecurity Firewall distribution』產品資訊。"
+"這是用來設定個人防火牆給 Mandrakelinux 機器.\n"
+"若是您需要很致力強大的防火牆解決方案, 請您參閱\n"
+"專門的 MandrakeSecurity Firewall distribution 產品資訊."
 
 #: network/drakfirewall.pm:158
 #, c-format
@@ -8772,7 +9047,7 @@ msgstr ""
 #: network/drakfirewall.pm:175
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
-msgstr "那一種服務您要開放對外連線服務呢？"
+msgstr "那一種服務您要允許網際網路來連線呢?"
 
 #: network/drakfirewall.pm:176
 #, c-format
@@ -8781,9 +9056,9 @@ msgid ""
 "Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Have a look at /etc/services for information."
 msgstr ""
-"您可以輸入 port 相關資訊。\n"
-"比方像是：139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
-"有問題可以先查看系統 /etc/services 檔案內容。"
+"您可以輸入各種的 port.\n"
+"有效的例子為:  139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
+"查看 /etc/services 以取得資訊."
 
 #: network/drakfirewall.pm:182
 #, c-format
@@ -8798,113 +9073,114 @@ msgstr ""
 #: network/drakfirewall.pm:192
 #, c-format
 msgid "Everything (no firewall)"
-msgstr "全部 (但不包含 firewall)"
+msgstr "全部 (沒有 firewall)"
 
 #: network/drakfirewall.pm:194
 #, c-format
 msgid "Other ports"
-msgstr "測試連接埠"
+msgstr "其它埠"
 
-#: 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 "不清楚"
+msgstr "我不清楚"
 
-#: 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
-#, fuzzy, c-format
+#: network/isdn.pm:170 network/netconnect.pm:388
+#, c-format
 msgid "USB"
-msgstr "LSB"
+msgstr ""
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
-#, fuzzy, c-format
+#: 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 "Myanmar"
+msgstr "手動"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
-#, fuzzy, c-format
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
+#, c-format
 msgid "Manual choice"
-msgstr "Myanmar"
+msgstr "手動選擇"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
-msgstr "內部 ISDN 介面卡"
+msgstr "內部 ISDN 卡"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:98
-#, fuzzy, c-format
+#: network/netconnect.pm:99
+#, c-format
 msgid "Managed"
-msgstr "選擇語系"
+msgstr ""
 
-#: network/netconnect.pm:99
-#, fuzzy, c-format
+#: network/netconnect.pm:100
+#, c-format
 msgid "Master"
-msgstr "Mayotte"
+msgstr ""
 
-#: network/netconnect.pm:100
-#, fuzzy, c-format
+#: network/netconnect.pm:101
+#, c-format
 msgid "Repeater"
-msgstr "回存"
+msgstr "重複器"
 
-#: network/netconnect.pm:101
-#, fuzzy, c-format
+#: network/netconnect.pm:102
+#, c-format
 msgid "Secondary"
-msgstr "星期日"
+msgstr "第二的"
 
-#: network/netconnect.pm:102
-#, fuzzy, c-format
+#: network/netconnect.pm:103
+#, c-format
 msgid "Auto"
-msgstr "作者："
+msgstr "自動"
 
-#: 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 "手動組態設定"
 
-#: network/netconnect.pm:106
-#, fuzzy, c-format
+#: network/netconnect.pm:107
+#, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
-msgstr "自動分配 IP"
+msgstr "自動 IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
-msgstr ""
+msgstr "自動 IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
-msgstr "其他的協定"
+msgstr "其他世界的的通訊協定"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
-msgstr "Europe 通訊協定 (EDSS1)"
+msgstr "歐洲人的通訊協定 (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"
@@ -8913,302 +9189,304 @@ msgstr ""
 "其他世界的通訊協定\n"
 "無 D-Channel (leased lines)"
 
-#: network/netconnect.pm:147
-#, fuzzy, c-format
+#: network/netconnect.pm:151
+#, c-format
 msgid "Alcatel speedtouch USB modem"
-msgstr "Alcatel speedtouch USB"
+msgstr ""
 
-#: network/netconnect.pm:148
-#, fuzzy, c-format
+#: network/netconnect.pm:152
+#, c-format
 msgid "Sagem USB modem"
-msgstr "系統模式"
+msgstr ""
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:155
-#, fuzzy, c-format
+#: network/netconnect.pm:159
+#, c-format
 msgid "Manual TCP/IP configuration"
-msgstr "手動組態設定"
+msgstr "手動組態設定 TCP/IP"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:162
-#, fuzzy, c-format
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
+#, c-format
 msgid "Bridged Ethernet LLC"
-msgstr "Etnernet 介面卡"
+msgstr ""
 
-#: network/netconnect.pm:163
-#, fuzzy, c-format
+#: network/netconnect.pm:168
+#, c-format
 msgid "Bridged Ethernet VC"
-msgstr "Etnernet 介面卡"
+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"
+msgid "PPPoA LLC"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
+msgid "PPPoA VC"
 msgstr ""
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Script-based"
 
-#: 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 "Terminal-based"
 
-#: 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
-#, fuzzy, c-format
+#: network/netconnect.pm:180 standalone/drakconnect:474
+#, c-format
 msgid "PAP/CHAP"
-msgstr "CHAP"
+msgstr ""
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
-msgstr "網路設定"
+msgstr "網路 & 網際網路設定"
 
-#: network/netconnect.pm:234
-#, fuzzy, c-format
+#: network/netconnect.pm:242
+#, c-format
 msgid "(detected on port %s)"
-msgstr "於 port %s 偵測到"
+msgstr "(於 port %s 被偵測到)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
-#, fuzzy, c-format
+#: network/netconnect.pm:244
+#, c-format
 msgid "(detected %s)"
-msgstr "偵測到 %s "
+msgstr "(偵測到 %s)"
 
-#: network/netconnect.pm:236
-#, fuzzy, c-format
+#: network/netconnect.pm:244
+#, c-format
 msgid "(detected)"
-msgstr "偵測到 %s "
+msgstr "(被偵測到)"
 
-#: network/netconnect.pm:238
-#, fuzzy, c-format
+#: network/netconnect.pm:246
+#, c-format
 msgid "Modem connection"
-msgstr "一般 modem 連線方式"
+msgstr "Modem 連線"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN 連線"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL 連線"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Cable 連線"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "區域網路連線"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
-#, fuzzy, c-format
+#: network/netconnect.pm:251 network/netconnect.pm:265
+#, c-format
 msgid "Wireless connection"
-msgstr "Cable 連線"
+msgstr "無線網路連線"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "選擇您要設定的連線項目"
 
-#: network/netconnect.pm:270
-#, fuzzy, c-format
+#: network/netconnect.pm:279
+#, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
 "\n"
 "\n"
 "Press \"%s\" to continue."
 msgstr ""
+"我們現在正要設定 %s 連線.\n"
 "\n"
 "\n"
-"準備設定 %s 的連線。\n"
-"\n"
-"\n"
-"按確定繼續。"
+"按 \"%s\" 繼續."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
-msgstr "連線組態"
+msgstr "連線組態設定"
 
-#: 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 "請您填入並且檢查下面欄位紀錄"
+msgstr "請您填入或檢查下面欄位"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
-msgstr "介面卡 IRQ"
+msgstr "卡的 IRQ"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
-msgstr "介面卡 mem (DMA)"
+msgstr "卡的 mem (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
-msgstr "介面卡 IO"
+msgstr "卡的 IO"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
-msgstr "介面卡 IO_0"
+msgstr "卡的 IO_0"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
-msgstr "介面卡 IO_1"
+msgstr "卡的 IO_1"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "您的個人電話號碼"
 
-#: 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 "ISP 的名稱 (網路提供者名稱)"
+msgstr "提供者的名稱 (ex provider.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
-msgstr "ISP 電話號碼"
+msgstr "提供者的電話號碼"
 
-#: network/netconnect.pm:294
-#, fuzzy, c-format
+#: network/netconnect.pm:303
+#, c-format
 msgid "Provider DNS 1 (optional)"
-msgstr "ISP 第一台 dns (可不用輸入)"
+msgstr "提供者 DNS 1 (選擇性輸入)"
 
-#: network/netconnect.pm:295
-#, fuzzy, c-format
+#: network/netconnect.pm:304
+#, c-format
 msgid "Provider DNS 2 (optional)"
-msgstr "ISP 第二台 dns (可不用輸入)"
+msgstr "提供者 DNS 2 (選擇性輸入)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "撥接的模式"
 
-#: 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 "連線速度"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "連線逾時 (以秒為單位)"
 
-#: 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 "登入的帳號 (使用者名稱)"
+msgstr "帳號登入 (使用者名稱)"
 
-#: 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 "帳號的密碼"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
-#, fuzzy, c-format
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
+#, c-format
 msgid "Select the network interface to configure:"
-msgstr "選取網路介面"
+msgstr "選取要設定的網路介面:"
 
-#: 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
-#, fuzzy, c-format
+#: 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 "Xinetd 服務"
+msgstr "網路裝置"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "外接式 ISDN 數據機"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
-#, fuzzy, c-format
-msgid "Select a device !"
-msgstr "選取您的掃描器"
+#: network/netconnect.pm:377 standalone/harddrake2:192
+#, c-format
+msgid "Select a device!"
+msgstr "選取一個裝置!"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "ISDN 設定"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
-msgstr "您的卡屬於那種形式?"
+msgstr "您有那種的卡?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -9218,175 +9496,184 @@ msgid ""
 "card.\n"
 msgstr ""
 "\n"
-"如果你有一個 ISA 卡, 下一個螢幕所顯示的數值應該是正確的\n"
+"如果你有一個 ISA 卡, 下一個螢幕所顯示的數值應該是正確的.\n"
 "\n"
-"如果你有一個 PCMCIA 卡, 那您必須要知道你的卡的\"irq\" 與 \"io\"值\n"
+"如果你有一個 PCMCIA 卡, 那您必須要知道你的卡的\"irq\" 與 \"io\"值.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "繼續"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "放棄"
 
-#: network/netconnect.pm:404
-#, fuzzy, c-format
+#: network/netconnect.pm:407
+#, c-format
 msgid "Which of the following is your ISDN card?"
-msgstr "您的 ISDN 卡為何 ?"
+msgstr "下列何者是您的 ISDN 卡?"
+
+#: 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:419
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "驅動程式"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
-msgstr "您要使用那個通訊協定 ?"
+msgstr "您要使用那個通訊協定?"
 
-#: 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 "通訊協定"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
 "If it isn't listed, choose Unlisted."
 msgstr ""
-"選擇您的 ISP 廠商。\n"
-"如果並沒有包含在清單內，請選擇未列在清單內"
+"選擇您的提供者.\n"
+"如果並沒有包含在清單內, 請選則未列在清單內(Unlisted)."
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
-#, fuzzy, c-format
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
+#, c-format
 msgid "Provider:"
-msgstr "列印機"
+msgstr "提供者:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:462
-#, fuzzy, c-format
+#: network/netconnect.pm:482
+#, c-format
 msgid "Select the modem to configure:"
-msgstr "選取網路介面"
+msgstr "選取要設定的數據機:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, fuzzy, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "抱歉，目前只有支援使用 2.4 的核心版本。"
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
-msgstr "請選取您數據機連接的序列埠。"
+msgstr "請選取您數據機連接的序列埠."
 
-#: network/netconnect.pm:539
-#, fuzzy, c-format
+#: network/netconnect.pm:561
+#, c-format
 msgid "Select your provider:"
-msgstr "選擇印表列印系統"
+msgstr "選擇您的提供者:"
 
-#: network/netconnect.pm:568
-#, fuzzy, c-format
+#: network/netconnect.pm:589
+#, c-format
 msgid "Dialup: account options"
-msgstr "撥號選項"
+msgstr "撥號: 帳號選項"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "連線名稱"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
-msgstr "登入的帳號名稱"
+msgstr "登入的 ID"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
-#, fuzzy, c-format
+#: network/netconnect.pm:609 network/netconnect.pm:642
+#, c-format
 msgid "Dialup: IP parameters"
-msgstr "參數"
+msgstr "撥號: IP 參數"
 
-#: network/netconnect.pm:591
-#, fuzzy, c-format
+#: network/netconnect.pm:612
+#, c-format
 msgid "IP parameters"
-msgstr "參數"
+msgstr "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 "IP 位址"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "網路遮罩"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
-msgstr ""
+msgstr "撥號: DNS 參數"
 
-#: network/netconnect.pm:608
-#, fuzzy, c-format
+#: network/netconnect.pm:629
+#, c-format
 msgid "DNS"
-msgstr "使用 NIS"
+msgstr ""
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: 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 "第一台DNS伺服器 (可不輸入)"
+msgstr "第一台 DNS 伺服器 (選擇性輸入)"
 
-#: 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 "第二台DNS伺服器 (可不輸入)"
+msgstr "第二台 DNS 伺服器 (選擇性輸入)"
 
-#: network/netconnect.pm:612
-#, fuzzy, c-format
+#: network/netconnect.pm:633
+#, c-format
 msgid "Set hostname from IP"
-msgstr "列印機主機名稱或是IP"
+msgstr "由 IP 設定主機名稱"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "閘道"
 
-#: network/netconnect.pm:625
-#, fuzzy, c-format
+#: network/netconnect.pm:646
+#, c-format
 msgid "Gateway IP address"
-msgstr "IP 位址"
+msgstr "閘道 IP 位址"
 
-#: network/netconnect.pm:649
-#, fuzzy, c-format
+#: network/netconnect.pm:677
+#, c-format
 msgid "ADSL configuration"
-msgstr "區域網路設定"
+msgstr "ADSL 設定"
 
-#: network/netconnect.pm:681
-#, fuzzy, c-format
+#: network/netconnect.pm:717
+#, c-format
 msgid "Please choose your ADSL provider"
-msgstr "請選擇您的國家或地區。"
+msgstr "請選擇您的 ADSL 提供者"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9394,32 +9681,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
-#, fuzzy, c-format
+#: network/netconnect.pm:739 network/netconnect.pm:744
+#, c-format
 msgid "Use a floppy"
-msgstr "儲存設定到磁片"
+msgstr "使用一個軟片"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
-#, fuzzy, c-format
+#: network/netconnect.pm:739 network/netconnect.pm:748
+#, c-format
 msgid "Use my Windows partition"
-msgstr "正在計算 Windows 檔案系統的邊界"
+msgstr "使用我的 Windows 分割"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -9428,22 +9715,22 @@ msgid ""
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:800
-#, fuzzy, c-format
-msgid "Encapsulation :"
-msgstr "加密金鑰"
+#: network/netconnect.pm:853
+#, c-format
+msgid "Encapsulation:"
+msgstr "封裝:"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9452,163 +9739,168 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr ""
 
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
-"警告: 這個裝置先前已經被設定最為連線到Internet的項目了。\n"
-"若是您要維持這個裝置的設定，請選擇接受。\n"
-"若是您修改下面欄位，將會凌越原本的設定。"
+"警告: 這個裝置先前已經被設定為連線到網際網路.\n"
+"修改下面欄位將會凌越這個設定.\n"
+"您真的想重新設定這個裝置?"
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
-#, fuzzy, c-format
+#: network/netconnect.pm:912 network/netconnect.pm:1340
+#, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "\n"
 msgstr ""
-"恭喜 ! 網路設定組態已經設定完成了。\n"
-"您的系統已經能夠使用該設定。\n"
+"恭喜 ! 網路與網際網路設定組態已經設定完成了.\n"
 "\n"
 
-#: network/netconnect.pm:871
-#, fuzzy, c-format
+#: network/netconnect.pm:929
+#, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "主機名稱"
+msgstr "Zeroconf 主機名稱解析"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
-#, fuzzy, c-format
+#: network/netconnect.pm:930 network/netconnect.pm:963
+#, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr "正在設定網路裝置 %s"
+msgstr "正在設定網路裝置 %s (驅動程式 %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
-"請輸入這台機器的 IP 設定值.\n"
-"每個項目都應該用小數點間隔的十進位阿拉伯數字來輸入\n"
+"請輸入這台機器的 IP 設定.\n"
+"每個項目都應該用小數點間隔的 IP 位址來輸入\n"
 "(例如 1.2.3.4)."
 
-#: network/netconnect.pm:914
-#, fuzzy, c-format
+#: network/netconnect.pm:971
+#, c-format
 msgid "Assign host name from DHCP address"
-msgstr "請輸入主機名稱或是 IP"
+msgstr "由 DHCP 位址指派主機名稱"
 
-#: network/netconnect.pm:915
-#, fuzzy, c-format
+#: network/netconnect.pm:972
+#, c-format
 msgid "DHCP host name"
-msgstr "主機名稱"
+msgstr "DHCP 主機名稱"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
-msgstr "紀錄網路卡的 ID (對於筆記型電腦相當有用)"
+msgstr "紀錄網路卡的 id (對於筆記型電腦相當有用)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
-#, fuzzy, c-format
+#: network/netconnect.pm:980 standalone/drakconnect:414
+#, c-format
 msgid "Network Hotplugging"
-msgstr "網路設定"
+msgstr "網路熱插拔"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "於開機時啟動"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "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 "IP 位址必須要用類似 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 ""
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
-#, fuzzy, c-format
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr ""
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#, c-format
 msgid "Please enter the wireless parameters for this card:"
-msgstr "請輸入您要儲存的目錄名稱："
+msgstr "請輸入這張卡的無線網路參數:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
-#, fuzzy, c-format
+#: network/netconnect.pm:1033 standalone/drakconnect:380
+#, c-format
 msgid "Operating Mode"
-msgstr "專家模式"
+msgstr "運作模式"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
-msgstr ""
+msgstr "網路名稱 (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
-#, fuzzy, c-format
+#: network/netconnect.pm:1036 standalone/drakconnect:382
+#, c-format
 msgid "Network ID"
-msgstr "網路"
+msgstr "網路 ID"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: 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 ""
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9622,33 +9914,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
-#, fuzzy, c-format
+#: network/netconnect.pm:1070 standalone/drakconnect:397
+#, c-format
 msgid "Fragmentation"
-msgstr "遊戲平台"
+msgstr "破碎片段"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
@@ -9660,12 +9952,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 ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9683,25 +9975,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr "系統偵測不到有任何網路卡的安裝。所以無法設定連結類型。"
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "選取網路介面"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "請選擇您要用來連上 Internet 的網路卡"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9709,185 +9983,207 @@ msgid ""
 "such as ``mybox.mylab.myco.com''.\n"
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
-"請輸入您的主機名稱，\n"
-"您的主機名稱應該是一個合格的主機全名 (FQDN)，\n"
-"類似 ``mybox.mylab.myco.com'' 的格式；假如您有\n"
-"使用閘道器的話，也請在這邊輸入閘道器的 IP 位址。"
+"請輸入您的主機名稱.\n"
+"您的主機名稱應該是一個完全合格的主機全名,\n"
+"類似 ``mybox.mylab.myco.com'' 的格式.\n"
+"使用閘道器的話, 也請在這邊輸入閘道器的 IP 位址."
 
-#: 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 ""
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
-#, fuzzy, c-format
+#: network/netconnect.pm:1169 standalone/drakconnect:997
+#, c-format
 msgid "Host name (optional)"
-msgstr "第一台DNS伺服器 (可不輸入)"
+msgstr "主機名稱 (選擇性輸入)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "主機名稱"
 
-#: network/netconnect.pm:1089
-#, fuzzy, c-format
+#: network/netconnect.pm:1171
+#, c-format
 msgid "DNS server 1"
-msgstr "DNS 伺服器"
+msgstr "DNS 伺服器 1"
 
-#: network/netconnect.pm:1090
-#, fuzzy, c-format
+#: network/netconnect.pm:1172
+#, c-format
 msgid "DNS server 2"
-msgstr "DNS 伺服器"
+msgstr "DNS 伺服器 2"
 
-#: network/netconnect.pm:1091
-#, fuzzy, c-format
+#: network/netconnect.pm:1173
+#, c-format
 msgid "DNS server 3"
-msgstr "DNS 伺服器"
+msgstr "DNS 伺服器 3"
 
-#: network/netconnect.pm:1092
-#, fuzzy, c-format
+#: network/netconnect.pm:1174
+#, c-format
 msgid "Search domain"
-msgstr "NIS 域名"
+msgstr "搜尋網域"
 
-#: 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 "通訊閘 (比方 %s)"
+msgstr "閘道器 (比方 %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
-msgstr "閘道裝置"
+msgstr "閘道器裝置"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "DNS IP 位址必須要用類似 1.2.3.4 的格式來輸入"
+msgstr "DNS 伺服器位址必須要用 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 "Gateway IP 位址必須要用類似 1.2.3.4 的格式來輸入"
+msgstr "Gateway 位址必須要用類似 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
-#, fuzzy, c-format
+#: network/netconnect.pm:1207
+#, c-format
 msgid "Zeroconf Host name"
-msgstr "主機名稱"
+msgstr "Zeroconf 主機名稱"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
-"您已經選擇設定多個能夠連線到 Internet 的方式。\n"
-"請您選擇其中一個要使用的項目。\n"
+"您已經選擇設定多個能夠連線到 Internet 的方式.\n"
+"請您選擇其中一個要使用的項目.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Internet 連線"
 
-#: network/netconnect.pm:1145
-#, fuzzy, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
-msgstr "您要用哪一個 XFree 設定 ?"
+#: network/netconnect.pm:1230
+#, c-format
+msgid "Configuration is complete, do you want to apply settings?"
+msgstr "設定完成, 您想要套用設定值?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
-msgstr "您要在開機時自動啟動該連線嗎？"
+msgstr "您要在開機時自動啟動該連線嗎?"
 
-#: network/netconnect.pm:1172
-#, fuzzy, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
-msgstr "這個 %s 套件需要安裝上，您要安裝該套件嗎？"
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "自動於開機時"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: 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 "您想要如何撥接這個連線?"
+
+#: network/netconnect.pm:1284
+#, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
+msgstr "網路需要被重新啟動. 您想要重新啟動它嗎?"
+
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "網路設定"
 
-#: 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 ""
-"重新啟動網路時發生了下面的錯誤：\n"
+"重新啟動網路時發生了一個問題:\n"
 "\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 "您想要試著連線到 Internet 上面嗎?"
+msgstr "現在您想要試著連線到 Internet 上面嗎?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
-msgstr "正在測試網路連線"
+msgstr "正在測試您的連線..."
 
-#: network/netconnect.pm:1212
-#, fuzzy, c-format
+#: network/netconnect.pm:1324
+#, c-format
 msgid "The system is now connected to the Internet."
-msgstr "系統目前已經連上 Internet 了。"
+msgstr "系統現在連上 Internet 了."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
-msgstr "因為安全因素考量，現在將會切斷連線。"
+msgstr "因為安全因素考量, 它現在將會被切斷連線."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "系統目前看起來似乎並沒有連上 Internet.\n"
-"請重新設定您的連線設定."
+"請嘗試重新設定您的連線."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
 msgstr ""
-"在完成這個項目後，建議您重新啟動您的 X 環境，\n"
-"以避免因為您調整了主機名稱造成 X 啟動上的一些問題。"
+"在完成這個項目後, 我們建議您重新啟動您的 X 環境\n"
+"以避免因為您調整了主機名稱造成 X 的問題."
 
-#: 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 ""
 "設定時發生問題.\n"
-"以 net_monitor 或 mcc 測試您的連線狀態. 若是您發現您的網路連線並不 作用. 您或"
+"以 net_monitor 或 mcc 測試您的連線狀態. 若是您發現您的網路連線並不作用, 您或"
 "許需要重新再進行設定."
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9895,41 +10191,41 @@ msgid ""
 "Click on Ok to keep your configuration, or cancel to reconfigure your "
 "Internet & Network connection.\n"
 msgstr ""
-"因為您是透過網路安裝，所以您的網路組態已經設定過了。\n"
-"您可以點選確定使用原本網路的設定組態，或者是選取取消\n"
-"來重新設定網路連線方式。\n"
+"因為您是透過網路安裝, 所以您的網路組態已經設定過了.\n"
+"您可以點選確定 Ok 保留您的設定組態, 或者是選取取消 cancel\n"
+"來重新設定網路 & 網際網路連線.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
-msgstr "設定要使用的代理伺服器"
+msgstr "代理伺服器設定"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理伺服器"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理伺服器"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理伺服器的設定格式必須為 http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
-msgstr "伺服器的設定格式必須為 http:// 或是 ftp://"
+msgstr "URL 應該是以 'ftp:' 或 'http:' 開頭"
 
 #: network/shorewall.pm:28
 #, c-format
@@ -9942,10 +10238,10 @@ msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
-"警告 ! 偵測到現有已經存在的防火牆組態設定。\n"
-"您應該在安裝之後手動修正一些必要的設定項目。"
+"警告! 偵測到現有已經存在的防火牆組態設定.\n"
+"您應該在安裝之後手動修正某些設定."
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9956,94 +10252,94 @@ msgid ""
 "\t\tippp+ for a isdn connection.\n"
 msgstr ""
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
-msgstr "請插入一張磁片"
+msgstr "插入軟片"
 
-#: network/tools.pm:166
-#, fuzzy, c-format
+#: network/tools.pm:198
+#, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
-msgstr "請在 %s 中插入已經格式化(FAT格式)磁碟片"
+msgstr "插入一張 FAT 格式化的軟片於磁碟 %s 跟著 %s 於 root 目錄下然後按下 %s"
 
-#: network/tools.pm:167
-#, fuzzy, c-format
+#: network/tools.pm:199
+#, c-format
 msgid "Floppy access error, unable to mount device %s"
-msgstr "您要把這個裝置 %s 掛載在那裡 ?"
+msgstr "軟片存取錯誤, 無法掛載裝置 %s"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
-msgstr "掛載失敗："
+msgstr "掛載失敗:"
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "這個平台並不支援延伸分割區"
 
-#: 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"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
-"您的硬碟分割表中有程式無法使用的空白磁區，唯一的解決方法是\n"
-"將主分割區的位置搬移，讓這些空白磁區與延伸分割區相鄰。"
+"您的硬碟分割表中有一個空洞, 我無法使用\n"
+"唯一的解決方法是將您的主分割區的位置搬移, 讓這些空洞與延伸分割區相鄰."
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
-msgstr "試圖從檔案 %s 恢復時發生錯誤： %s"
+msgstr "試圖從檔案 %s 恢復時發生錯誤: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
-msgstr "錯誤的備份檔案"
+msgstr "壞掉的備份檔案"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "寫入檔案 %s 時發生錯誤"
 
-#: partition_table/raw.pm:187
-#, fuzzy, c-format
+#: partition_table/raw.pm:238
+#, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
 "It means writing anything on the disk will end up with random, corrupted "
 "data."
 msgstr ""
-"您的硬碟發生了一個嚴重的錯誤，\n"
-"硬碟讀取寫入檢測失敗了...\n"
-"這意味著您的硬碟有實體的毀損問題，任何存取可能都會發生錯誤。"
+"您的磁碟發生了一個嚴重的錯誤.\n"
+"資料完整性檢測已經失敗了.\n"
+"它意旨寫入任何東西到磁碟將會導致胡亂, 腐敗的資料."
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "必備的"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "重要的"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "極好的"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
-msgstr "好用的"
+msgstr "好的"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
-msgstr "可以一試"
+msgstr "或許"
 
 #: printer/cups.pm:103
 #, c-format
@@ -10055,367 +10351,372 @@ msgstr "(於 %s)"
 msgid "(on this machine)"
 msgstr "(位於這個機器上)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
-msgstr "於其他機器上已設定"
+msgstr "於其他機器上被設定"
 
 #: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "位於 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 " (預設開機)"
 
-#: 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 ""
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "遠端 CUPS"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "未知的型號"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
-msgstr "本機列印機"
+msgstr "本地端列印機"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "遠端列印機"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "遠端的 CUPS 伺服器列印機"
 
-#: 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 "遠端的 lpd 伺服器列印機"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "網路列印機 (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT 伺服器列印機"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "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 "輸入列印機所在 URI 位址"
+msgstr "輸入列印機裝置 URI"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
-msgstr "使用 Pipe 管線方式組成列印工作"
+msgstr "使用 Pipe 管線工作到一個指令"
 
-#: 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 "未知的型號"
 
-#: printer/main.pm:332 standalone/printerdrake:196
-#, fuzzy, c-format
+#: printer/main.pm:346 standalone/printerdrake:202
+#, c-format
 msgid "Configured on this machine"
-msgstr "(位於這個機器上)"
+msgstr "位於這個機器上被設定"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
-#, fuzzy, c-format
+#: printer/main.pm:352 printer/printerdrake.pm:1069
+#, c-format
 msgid " on parallel port #%s"
-msgstr "於並列埠上 \\/*%s"
+msgstr " 於並列埠上 #%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
-msgstr "，USB 列印機  \\/*%s"
+msgstr ", USB 列印機  #%s"
 
-#: printer/main.pm:343
-#, fuzzy, c-format
+#: printer/main.pm:357
+#, c-format
 msgid ", USB printer"
-msgstr "，USB 列印機  \\/*%s"
+msgstr ", USB 列印機"
 
-#: printer/main.pm:348
-#, fuzzy, c-format
+#: printer/main.pm:362
+#, c-format
 msgid ", multi-function device on parallel port #%s"
-msgstr "，位於並列埠多功能裝置 \\/*%s"
+msgstr ", 多功能裝置於並列埠 #%s"
 
-#: printer/main.pm:351
-#, fuzzy, c-format
+#: printer/main.pm:365
+#, c-format
 msgid ", multi-function device on a parallel port"
-msgstr "，位於並列埠多功能裝置 \\/*%s"
+msgstr ", 多功能裝置於一個並列埠"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
-msgstr "，位於 USB 的多功能裝置"
+msgstr ", 多功能裝置於 USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
-msgstr "HP JetDirect 上的多功能裝置"
+msgstr ", 多功能裝置於 HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
-msgstr "，多功能裝置"
+msgstr ", 多功能裝置"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
-msgstr "，列印至 %s"
+msgstr ", 列印至 %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr " 位於 LPD 主機 \"%s\"，列印機 \"%s\""
+msgstr " 位於 LPD 伺服器 \"%s\", 列印機 \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr "，TCP/IP 主機 \"%s\"，連接埠 %s"
+msgstr ", TCP/IP 主機 \"%s\", 連接埠 %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr " 位於 Windows 主機 \"%s\"，分享名稱 \"%s\""
+msgstr " 位於 Windows 伺服器\"%s\", 分享名稱 \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr " 位於 Novell 伺服器 \"%s\"，列印機 \"%s\""
+msgstr " 位於 Novell 伺服器 \"%s\", 列印機 \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
-msgstr "，使用命令 %s"
+msgstr ", 使用指令 %s"
 
-#: printer/main.pm:389
-#, fuzzy, c-format
+#: printer/main.pm:409
+#, c-format
 msgid "Parallel port #%s"
-msgstr "於並列埠上 \\/*%s"
+msgstr "於並列埠 #%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
-#, fuzzy, c-format
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
+#, c-format
 msgid "USB printer #%s"
-msgstr "USB 列印機 \\/*%s"
+msgstr "USB 列印機 #%s"
 
-#: printer/main.pm:394
-#, fuzzy, c-format
+#: printer/main.pm:414
+#, c-format
 msgid "USB printer"
-msgstr "，USB 列印機"
+msgstr "USB 列印機"
 
-#: printer/main.pm:399
-#, fuzzy, c-format
+#: printer/main.pm:419
+#, c-format
 msgid "Multi-function device on parallel port #%s"
-msgstr "，位於並列埠多功能裝置 \\/*%s"
+msgstr "多功能裝置位於並列埠 #%s"
 
-#: printer/main.pm:402
-#, fuzzy, c-format
+#: printer/main.pm:422
+#, c-format
 msgid "Multi-function device on a parallel port"
-msgstr "，位於並列埠多功能裝置 \\/*%s"
+msgstr "多功能裝置位於一個並列埠"
 
-#: printer/main.pm:404
-#, fuzzy, c-format
+#: printer/main.pm:424
+#, c-format
 msgid "Multi-function device on USB"
-msgstr "，位於 USB 的多功能裝置"
+msgstr "多功能裝置位於 USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
-msgstr "HP JetDirect 上的多功能裝置"
+msgstr "多功能裝置位於 HP JetDirect"
 
-#: printer/main.pm:408
-#, fuzzy, c-format
+#: printer/main.pm:428
+#, c-format
 msgid "Multi-function device"
-msgstr "，多功能裝置"
+msgstr "多功能裝置"
 
-#: printer/main.pm:411
-#, fuzzy, c-format
+#: printer/main.pm:432
+#, c-format
 msgid "Prints into %s"
-msgstr "，列印至 %s"
+msgstr "列印至 %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
-msgstr " 位於 LPD 主機 \"%s\"，列印機 \"%s\""
+msgstr "LPD 伺服器 \"%s\", 列印機 \"%s\""
 
-#: printer/main.pm:415
-#, fuzzy, c-format
+#: printer/main.pm:438
+#, c-format
 msgid "TCP/IP host \"%s\", port %s"
-msgstr "，TCP/IP 主機 \"%s\"，連接埠 %s"
+msgstr "TCP/IP 主機 \"%s\", 連接埠 %s"
 
-#: printer/main.pm:419
-#, fuzzy, c-format
+#: printer/main.pm:443
+#, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
-msgstr " 位於 Windows 主機 \"%s\"，分享名稱 \"%s\""
+msgstr "位於 Windows 伺服器 \"%s\", 分享名稱 \"%s\""
 
-#: printer/main.pm:423
-#, fuzzy, c-format
+#: printer/main.pm:448
+#, c-format
 msgid "Novell server \"%s\", printer \"%s\""
-msgstr " 位於 Novell 主機 \"%s\"，列印機 \"%s\""
+msgstr "位於 Novell 伺服器 \"%s\", 列印機 \"%s\""
 
-#: printer/main.pm:425
-#, fuzzy, c-format
+#: printer/main.pm:451
+#, c-format
 msgid "Uses command %s"
-msgstr "，使用命令 %s"
+msgstr "使用指令 %s"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr ""
 
-#: 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 "Raw 列印機 (無驅動程式)"
 
-#: 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 "內部網路IP位址"
+msgstr "本地端網路"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
-msgstr "介面 %s"
+msgstr "介面 \"%s\""
 
-#: printer/main.pm:1090
-#, fuzzy, c-format
+#: printer/main.pm:1151
+#, c-format
 msgid "Network %s"
-msgstr "網路"
+msgstr "網路 %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
-msgstr "主機名稱 %s"
+msgstr "主機 %s"
 
-#: printer/main.pm:1121
-#, fuzzy, c-format
+#: printer/main.pm:1182
+#, c-format
 msgid "%s (Port %s)"
-msgstr "連接埠"
+msgstr "%s (連接埠 %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"
 msgstr ""
 
-#: printer/printerdrake.pm:62
-#, fuzzy, c-format
+#: printer/printerdrake.pm:61
+#, c-format
 msgid "CUPS printer configuration"
-msgstr "OKI Windows 列印機設定"
+msgstr "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 "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr ""
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 
-#: printer/printerdrake.pm:71
-#, fuzzy, c-format
+#: printer/printerdrake.pm:76
+#, c-format
 msgid "Printer sharing on hosts/networks: "
-msgstr "檔案分享"
+msgstr "列印機分享於主機/網路:"
 
-#: printer/printerdrake.pm:73
-#, fuzzy, c-format
+#: printer/printerdrake.pm:78
+#, c-format
 msgid "Custom configuration"
-msgstr "警示設定"
+msgstr "客製化設定"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
-#, fuzzy, c-format
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
+#, c-format
 msgid "No remote machines"
-msgstr "(位於這個機器上)"
+msgstr "沒有遠端機器"
 
-#: printer/printerdrake.pm:88
-#, fuzzy, c-format
+#: printer/printerdrake.pm:94
+#, c-format
 msgid "Additional CUPS servers: "
-msgstr "位於 CUPS 伺服器 \"%s\""
+msgstr "附加的 CUPS 伺服器:"
 
-#: printer/printerdrake.pm:93
-#, fuzzy, c-format
-msgid "None"
-msgstr "完成"
-
-#: 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 "
@@ -10428,29 +10729,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
-#, fuzzy, c-format
+#: printer/printerdrake.pm:109
+#, c-format
 msgid "Japanese text printing mode"
-msgstr "變更列印系統"
+msgstr "日本字列印模式"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
-#, fuzzy, c-format
+#: printer/printerdrake.pm:117
+#, c-format
 msgid "Automatic correction of CUPS configuration"
-msgstr "CPUS 自動化設定"
+msgstr "自動化更正 CPUS 設定"
 
-#: 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 "
@@ -10467,73 +10768,99 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
-#, fuzzy, c-format
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr ""
+
+#: 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 "可用的列印機"
+msgstr "本地端列印機分享"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
 "(s) should be available:"
 msgstr ""
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:156
-#, fuzzy, c-format
+#: printer/printerdrake.pm:182
+#, c-format
 msgid "Remove selected host/network"
-msgstr "移除選取項目"
+msgstr "移除選取主機/網路"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr ""
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr ""
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
-#, fuzzy, c-format
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
+#, c-format
 msgid "Accessing printers on remote CUPS servers"
-msgstr "遠端的 CUPS 伺服器列印機"
+msgstr "存取遠端的 CUPS 伺服器列印機"
 
-#: 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 "
@@ -10541,113 +10868,129 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
-#, fuzzy, c-format
+#: printer/printerdrake.pm:352
+#, c-format
 msgid "Add server"
-msgstr "新增使用者"
+msgstr "新增伺服器"
 
-#: printer/printerdrake.pm:334
-#, fuzzy, c-format
+#: printer/printerdrake.pm:358
+#, c-format
 msgid "Edit selected server"
-msgstr "偵測到 %s "
+msgstr "編輯選擇的伺服器"
 
-#: printer/printerdrake.pm:343
-#, fuzzy, c-format
+#: printer/printerdrake.pm:367
+#, c-format
 msgid "Remove selected server"
-msgstr "移除選取項目"
+msgstr "移除選擇的伺服器"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr ""
 
-#: printer/printerdrake.pm:393
-#, fuzzy, c-format
+#: printer/printerdrake.pm:416
+#, c-format
 msgid "Server IP missing!"
-msgstr "NCP 伺服器名稱沒指定!"
+msgstr "伺服器 IP 遺失!"
 
-#: printer/printerdrake.pm:399
-#, fuzzy, c-format
+#: printer/printerdrake.pm:422
+#, c-format
 msgid "The entered IP is not correct.\n"
-msgstr "該型號正確"
+msgstr "輸入的 IP 位址不正確.\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 "Port 欄位應該為數字"
+msgstr "Port 數字應該為一個整數!"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "連接埠"
 
-#: 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 "開, 遠端伺服器的名稱或 IP 位址:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPS 伺服器名稱或 IP 位址遺失."
+
+#: 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
-#, fuzzy, c-format
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "正在讀取列印機資料..."
+
+#: printer/printerdrake.pm:581
+#, c-format
 msgid "Restarting CUPS..."
-msgstr "重新啟動 XFS 服務"
+msgstr "正在重新啟動 CUPS..."
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "選擇列印機連線"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
-msgstr "列印機的連線方式為何?"
+msgstr "列印機是如何連線的?"
 
-#: printer/printerdrake.pm:505
-#, fuzzy, c-format
+#: printer/printerdrake.pm:609
+#, c-format
 msgid ""
 "\n"
 "Printers on remote CUPS servers do not need to be configured here; these "
 "printers will be automatically detected."
 msgstr ""
 "\n"
-"您的 Printer 位於 CUPS 服務主機上，所以您這邊並不需要設定；\n"
-"這些列印機將能夠自動偵測到。"
+"列印機位於遠端 CUPS 伺服器上並不需要在這裡被設定;\n"
+"這些列印機將能夠自動偵測到."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10655,41 +10998,40 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
-#, fuzzy, c-format
+#: printer/printerdrake.pm:619
+#, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "列印機自動偵測 (本機、TCP/Socket 與 SMB 網路列印機)"
+msgstr "列印機自動偵測 (本地端, TCP/Socket, SMB 列印機, 與裝置 URI )"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "正在檢查您的系統..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "與一台未知的列印機機"
 
-#: printer/printerdrake.pm:563
-#, fuzzy, c-format
+#: printer/printerdrake.pm:667
+#, c-format
 msgid "and %d unknown printers"
-msgstr ""
-"\n"
-"與 %d 台未知的列印機機型為 "
+msgstr "與 %d 未知的列印機"
 
-#: printer/printerdrake.pm:567
-#, fuzzy, c-format
+#: printer/printerdrake.pm:671
+#, c-format
 msgid ""
 "The following printers\n"
 "\n"
 "%s%s\n"
 "are directly connected to your system"
 msgstr ""
+"下列列印機\n"
 "\n"
-"目前有一台未知類型的列印機安裝在您本機上。"
+"%s%s直接連線到您的系統"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -10697,123 +11039,116 @@ msgid ""
 "%s%s\n"
 "are directly connected to your system"
 msgstr ""
-"以下列印機\n"
+"下列列印機\n"
 "\n"
-"%s%s\n"
-"直接連接於您的系統上"
+"%s%s直接連線到您的系統"
 
-#: printer/printerdrake.pm:570
-#, fuzzy, c-format
+#: printer/printerdrake.pm:674
+#, c-format
 msgid ""
 "The following printer\n"
 "\n"
 "%s%s\n"
 "is directly connected to your system"
 msgstr ""
+"下列列印機\n"
 "\n"
-"目前有一台未知類型的列印機安裝在您本機上。"
+"%s%s直接連線到您的系統"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 "\n"
-"目前有一台未知類型的列印機安裝在您本機上。"
+"目前有一台未知類型的列印機直接連線在您系統上"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 "\n"
-"目前有 %d 台未知類型的列印機安裝在您本機上。"
+"目前有 %d 未知類型的列印機直接連線在您系統上"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
-msgstr "您的系統偵測不到有任何本機列印機的安裝"
+msgstr "目前沒有列印機被找到直接連線在您機器上"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr " (請確認相關列印機都已經連結至電腦正確，並且打開電源了)。\n"
+msgstr " (請確認您全部的列印機連線並且打開電源了).\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 "
 "printers in the local network?\n"
-msgstr "您要啟上面提及列印機列印服務，或者是使用內部網路內的列印機嗎？\n"
+msgstr "您要啟用上面提及的列印機列印服務, 或者是本地端網路的列印服務?\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 "您要開啟內部網路的列印機列印服務嗎？\n"
+msgstr "您要啟用本地端網路的列印服務?\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 "您要開啟上面提及的列印機列印服務嗎？\n"
+msgstr "您要啟用上面提及的列印機列印服務?\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 "您要設定這台機器上的列印服務項目嗎？\n"
+msgstr "您確定要設定這台機器上的列印服務嗎?\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 "
 "additional software will be installed."
-msgstr ""
-"NOTE：需要安裝必要的列印機驅動程式套件等檔案，大約共佔用 %d MB 的空間。"
+msgstr "NOTE: 根據列印機模型與列印系統, %d MB 的附加軟體將被安裝."
 
-#: printer/printerdrake.pm:629
-#, fuzzy, c-format
+#: printer/printerdrake.pm:742
+#, c-format
 msgid "Searching for new printers..."
-msgstr "可用的列印機"
+msgstr "正在尋找新的列印機..."
 
-#: printer/printerdrake.pm:713
-#, fuzzy, c-format
-msgid "Configuring printer ..."
-msgstr "正在設定「%s」列印機中 ..."
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "正在設定「%s」列印機中 ..."
+msgid "Found printer on %s..."
+msgstr "在 %s 上找到列印機..."
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
-msgstr "("
+msgstr ""
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr ""
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
-msgstr ")"
+msgstr ""
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr "列印機型號選擇"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
-msgstr "您的列印機屬於那種型號？"
+msgstr "您有的列印機屬於那種型號?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10822,28 +11157,31 @@ msgid ""
 "choose the correct model from the list."
 msgstr ""
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
-msgstr "如果該列印機並未列出，請選擇相容或者是相信的列印機型號。"
+msgstr "如果您的列印機並未列出, 請選擇一個相容(見列印機手冊)或者是相似的."
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
 #, c-format
-msgid "Configuring applications..."
-msgstr "正在設定應用程式..."
+msgid "Configuring printer on %s..."
+msgstr "正在設定列印機於 %s..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "正在設定列印機 \"%s\" 中..."
+
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
-msgstr "新增列印機"
+msgstr "新增一個列印機"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10857,14 +11195,15 @@ msgid ""
 "connection types."
 msgstr ""
 "\n"
-"歡迎來到列印機設定精靈\n"
+"歡迎來到列印機設定巫師\n"
 "\n"
-"設定精靈將會帶領您完成本地端以及遠端列印機的設定。\n"
+"這個巫師允許您安裝本地端或遠端列印機以便被這個機器使用且也被其他於網路中的機"
+"器使用.\n"
 "\n"
-"設定過程中，請依提示選擇相關項目，包含列印機種類、\n"
-"額外參數等。"
+"它詢問您全部必要資訊以便設定列印機且給您全部可用的列印機驅動程式, 驅動程式選"
+"項, 與列印機連線型態存取權限."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10886,21 +11225,21 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 "\n"
-"歡迎來到列印機設定精靈\n"
+"歡迎來到列印機設定巫師\n"
 "\n"
-"接下來設定精靈將會引導您完成列印機的設定，包含位於本機的列印機以及遠端網路印"
-"表機。\n"
+"這個巫師將會幫助您安裝您連線到這台機器上, 直接連接到網路或是到一個遠端 "
+"Windows 機器的列印機.\n"
 "\n"
-"若是您要設定的列印機是直接安裝在你機器上的，請先確認你的線路有安插正確，電源"
-"並且已經開啟，以便於能夠自動偵測你列印機的類型。若是您要使用的是網路列印機，"
-"請確認該列印機的電源也是處於開啟狀態，而且對方機器與網路能夠正確連通。\n"
+"請插入且打開全部連接到這台機器上的列印機使得他們可以被自動偵測. 您的網路列印"
+"機與您的 Windows 機器一定要連線且打開.\n"
 "\n"
-"請注意，自動偵測列印機的功能適用於本機列印機的情況，若是你要使用的是網路印表"
-"機，通常你需要把自動偵測功能關閉。\n"
+"請注意, 自動偵測列印機的功能作用於網路的時間比較只有連接到這台機器的時間還"
+"長. 若你不需要的話, 把作用於網路或 Windows 主機自動偵測功能關閉.\n"
 "\n"
-"當你確認沒問題是，點選「下一步」，或者是點選「取消」放棄設定。"
+"當你準備好時, 點選\"下一步\"(Next), 或者是點選\"取消\"(Cancel) 如果您現在不想"
+"設定列印機."
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10916,15 +11255,15 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 "\n"
-"歡迎來到列印機設定精靈\n"
+"歡迎來到列印機設定巫師\n"
 "\n"
-"接下來設定精靈將會引導您完成列印機的設定，包含位於本機的列印機。\n"
-"若是您要設定的列印機是直接安裝在你機器上的，請先確認你的線路有安插正確，電源"
-"並且已經開啟，以便於能夠自動偵測你列印機的類型。\n"
+"接下來設定巫師將會引導您完成列印機的設定, 包含位於本機的列印機。\n"
+"若是您要設定的列印機是直接安裝在你機器上的, 請先確認你的線路有安插正確, 電源"
+"並且已經開啟, 以便於能夠自動偵測你列印機的類型。\n"
 "\n"
-"當你確認沒問題時，點選「下一步」，或者是點選「取消」放棄設定。"
+"當你確認沒問題時, 點選「下一步」, 或者是點選「取消」放棄設定。"
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10945,20 +11284,20 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 "\n"
-"歡迎來到列印機設定精靈\n"
+"歡迎來到列印機設定巫師\n"
 "\n"
-"接下來設定精靈將會引導您完成列印機的設定，包含位於本機的列印機以及遠端網路印"
+"接下來設定巫師將會引導您完成列印機的設定, 包含位於本機的列印機以及遠端網路印"
 "表機。\n"
-"若是您要設定的列印機是直接安裝在你機器上的，請先確認你的線路有安插正確，電源"
-"並且已經開啟，以便於能夠自動偵測你列印機的類型。若是您要使用的是網路列印機，"
-"請確認該列印機的電源也是處於開啟狀態，而且對方機器與網路能夠正確連通。\n"
+"若是您要設定的列印機是直接安裝在你機器上的, 請先確認你的線路有安插正確, 電源"
+"並且已經開啟, 以便於能夠自動偵測你列印機的類型。若是您要使用的是網路列印機, "
+"請確認該列印機的電源也是處於開啟狀態, 而且對方機器與網路能夠正確連通。\n"
 "\n"
-"請注意，自動偵測列印機的功能適用於本機列印機的情況，若是你要使用的是網路印表"
-"機，通常你需要把自動偵測功能關閉。\n"
+"請注意, 自動偵測列印機的功能適用於本機列印機的情況, 若是你要使用的是網路印表"
+"機, 通常你需要把自動偵測功能關閉。\n"
 "\n"
-"當你確認沒問題是，點選「下一步」，或者是點選「取消」放棄設定。"
+"當你確認沒問題是, 點選「下一步」, 或者是點選「取消」放棄設定。"
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10974,30 +11313,30 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 "\n"
-"歡迎來到列印機設定精靈\n"
+"歡迎來到列印機設定巫師\n"
 "\n"
-"接下來設定精靈將會引導您完成列印機的設定，包含位於本機的列印機。\n"
-"若是您要設定的列印機是直接安裝在你機器上的，請先確認你的線路有安插正確，電源"
-"並且已經開啟，以便於能夠自動偵測你列印機的類型。\n"
+"接下來設定巫師將會引導您完成列印機的設定, 包含位於本機的列印機。\n"
+"若是您要設定的列印機是直接安裝在你機器上的, 請先確認你的線路有安插正確, 電源"
+"並且已經開啟, 以便於能夠自動偵測你列印機的類型。\n"
 "\n"
-"當你確認沒問題時，點選「下一步」，或者是點選「取消」放棄設定。"
+"當你確認沒問題時, 點選「下一步」, 或者是點選「取消」放棄設定。"
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "自動偵測本機列印機"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "自動偵測區域網路列印機"
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "自動偵測位於 Microsoft Windows 機器的列印機"
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11013,74 +11352,74 @@ msgstr ""
 "\n"
 "恭喜！列印機設定已經完成。\n"
 "\n"
-"若是您事後需要新增、刪除、重新命名相關列印機等設定的話，\n"
+"若是您事後需要新增、刪除、重新命名相關列印機等設定的話, \n"
 "請在 Mandrake 控制台內選擇『硬體』再選擇『列印機』項目\n"
 "即可進行設定動作。"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not install the %s packages!"
 msgstr "正在安裝 %s 套件"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "列印機自動偵測"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "正在偵測裝置..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
-msgstr "，網路列印機 \"%s\"，連接埠 %s"
+msgstr ", 網路列印機 \"%s\", 連接埠 %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "，網路列印機 \"%s\"，位於 SMB/Windows 伺服器 \"%s\""
+msgstr ", 網路列印機 \"%s\", 位於 SMB/Windows 伺服器 \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "偵測到 %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
 #, fuzzy, c-format
 msgid "Printer on parallel port #%s"
 msgstr "列印機位於並列埠 \\/*%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
-msgstr "網路列印機 \"%s\"，連接埠 %s"
+msgstr "網路列印機 \"%s\", 連接埠 %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "網路列印機 \"%s\"，位於 SMB/Windows 伺服器 \"%s\""
+msgstr "網路列印機 \"%s\", 位於 SMB/Windows 伺服器 \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "本機列印機"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11089,71 +11428,71 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 "無法找到本地端列印機! 請手動指定列印機的所在裝置名稱。\n"
-"(並列埠：/dev/lp0，/dev/lp1，... 相當於 LPT1:，LPT2:...，\n"
-"第一台 USB 列印機是：/dev/usb/lp0，第二台：/dev/usb/lp1)。"
+"(並列埠：/dev/lp0, /dev/lp1, ... 相當於 LPT1:, LPT2:..., \n"
+"第一台 USB 列印機是：/dev/usb/lp0, 第二台：/dev/usb/lp1)。"
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "您需要選擇或輸入該列印機名稱或裝置項目!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "找不到列印機！"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "本機列印機"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "可用的列印機"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, fuzzy, c-format
 msgid "The following printer was auto-detected. "
 msgstr ""
 "下列的列印機\n"
 "\n"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, fuzzy, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr ""
 "下面所列出的是使用自動偵測所找到的列印機。若是找到的項目\n"
-"並不是你所預期的，那請手動輸入裝置名稱/檔案名稱"
+"並不是你所預期的, 那請手動輸入裝置名稱/檔案名稱"
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, fuzzy, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
-msgstr "請選擇您列印機的連接埠，或者是輸入該裝置的名稱"
+msgstr "請選擇您列印機的連接埠, 或者是輸入該裝置的名稱"
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, fuzzy, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
-msgstr "請選擇您列印機的連接埠，或者是輸入該裝置的名稱"
+msgstr "請選擇您列印機的連接埠, 或者是輸入該裝置的名稱"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
 "device name/file name in the input line"
-msgstr "請選擇您列印機的連接埠，或者是輸入該裝置的名稱"
+msgstr "請選擇您列印機的連接埠, 或者是輸入該裝置的名稱"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -11163,12 +11502,12 @@ msgstr ""
 "列印機的設定將會完全且自動正常工作. 若你的 列印機沒有正確被偵測到或是你喜歡一"
 "個自訂的列印機 設定值, 打開 \"Manual configuration 手動設定\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, fuzzy, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -11178,120 +11517,120 @@ msgid ""
 msgstr ""
 "下面列出的是自動偵測所找到的列印機。相關列印機的組態設定\n"
 "都能夠自動完成而不需要另外設定。若是下面列出所找到的列印機\n"
-"並不是您所預期的，或者是你希望手動方式設定，請選擇『手動設定』。"
+"並不是您所預期的, 或者是你希望手動方式設定, 請選擇『手動設定』。"
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, fuzzy, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "請選取列印機所連接的連接埠。"
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
-msgstr "請選擇您列印機的連接埠，或者是輸入該裝置的名稱"
+msgstr "請選擇您列印機的連接埠, 或者是輸入該裝置的名稱"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "請選取列印機所連接的連接埠。"
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
-" (並列埠：/dev/lp0，/dev/lp1，...... 相當於 LPT1:，LPT2:....\n"
-"第一台 USB 列印機是：/dev/usb/lp0，第二台：/dev/usb/lp1)。"
+" (並列埠：/dev/lp0, /dev/lp1, ...... 相當於 LPT1:, LPT2:....\n"
+"第一台 USB 列印機是：/dev/usb/lp0, 第二台：/dev/usb/lp1)。"
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "您必須選擇/輸入一列印機/裝置!"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, fuzzy, c-format
 msgid "Aborting"
 msgstr "放棄"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "遠端 lpd 列印機選項"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
-"如要使用遠端的 lpd 列印機，您必須要指定用來提供\n"
-"印表服務的遠端列印伺服主機名稱，以及分享出來\n"
+"如要使用遠端的 lpd 列印機, 您必須要指定用來提供\n"
+"印表服務的遠端列印伺服主機名稱, 以及分享出來\n"
 "列印機名稱。"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "遠端主機名稱"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "遠端列印機名稱"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "沒指定遠端主機名稱 !"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "沒指定列印機名稱 !"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, c-format
 msgid "Information"
 msgstr "資訊"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "偵測到的型號：%s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "掃描網路中..."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
-msgstr "，列印機 \"%s\"，位於主機 \"%s\""
+msgstr ", 列印機 \"%s\", 位於主機 \"%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 "列印機 \"%s\"，位於 \"%s\""
+msgstr "列印機 \"%s\", 位於 \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "網路芳鄰 (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 "
@@ -11299,61 +11638,61 @@ msgid ""
 "the print server, as well as the share name for the printer you wish to "
 "access and any applicable user name, password, and workgroup information."
 msgstr ""
-"如要使用網路芳鄰列印機，您必須要提供主機網芳名稱 \n"
-"(注意! 這個名稱與 TCP/IP 的主機名稱可能並不相同)，\n"
+"如要使用網路芳鄰列印機, 您必須要提供主機網芳名稱 \n"
+"(注意! 這個名稱與 TCP/IP 的主機名稱可能並不相同), \n"
 "有時還必須指定列印伺服器的 IP 位址、分享出來的印表\n"
-"機名稱、適當的使用者帳號與密碼，以及工作群組的資訊。"
+"機名稱、適當的使用者帳號與密碼, 以及工作群組的資訊。"
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
-"如果偵測出來的列印機是您所需要的，你可以選擇該項目，並輸入存取的使用者名稱、"
-"密碼，必要時並輸入群組名稱。"
+"如果偵測出來的列印機是您所需要的, 你可以選擇該項目, 並輸入存取的使用者名稱、"
+"密碼, 必要時並輸入群組名稱。"
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "網芳主機名稱”"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB 伺服器 IP"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "列印機名稱"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "工作群組"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "自動偵測"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "伺服器的主機名稱或者是 IP 必須指定"
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Samba 分享的名稱沒指定 !"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "安全性警告"
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -11377,21 +11716,21 @@ msgid ""
 "\n"
 msgstr ""
 "您目前打算使用一組帳號與密碼以便於能夠存取 Windows 主機來進行列印的工作。不過"
-"您需要注意的是，因為系統是呼叫 Samba 的程式軟體連線到 Windows 主機，所以執行"
-"程式時會在命令列加上您所設定輸入的帳號密碼。這可能會有一些安全性問題，比方有"
+"您需要注意的是, 因為系統是呼叫 Samba 的程式軟體連線到 Windows 主機, 所以執行"
+"程式時會在命令列加上您所設定輸入的帳號密碼。這可能會有一些安全性問題, 比方有"
 "使用者可以執行 ps aux指令來查看您帳號密碼內容。\n"
 "\n"
 "所以建議您可以使用下面方式：\n"
 "\n"
-"在 Windows 主機設置不需要密碼的帳號，比方「GUEST」，然後只有開放該帳號具備列"
-"印的功能。請注意，千萬不要直接把 administrator 帳號設定為不需要密碼，然後直接"
-"使用該 administrator 登入，因為這是很危險的。\n"
+"在 Windows 主機設置不需要密碼的帳號, 比方「GUEST」, 然後只有開放該帳號具備列"
+"印的功能。請注意, 千萬不要直接把 administrator 帳號設定為不需要密碼, 然後直接"
+"使用該 administrator 登入, 因為這是很危險的。\n"
 "\n"
-"或者是您可以設定您的 Windows 機器能夠讓列印機與 LPD 協定配合，如此您就可以在 "
+"或者是您可以設定您的 Windows 機器能夠讓列印機與 LPD 協定配合, 如此您就可以在 "
 "Printerdrake 程式內使用「%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 "
@@ -11399,10 +11738,10 @@ msgid ""
 "type in Printerdrake.\n"
 "\n"
 msgstr ""
-"請設定好您的 Windows 主機的服務，確認列印機能夠在 IPP 通訊協定上正常運作，以"
+"請設定好您的 Windows 主機的服務, 確認列印機能夠在 IPP 通訊協定上正常運作, 以"
 "便於在 PrinterDrake 程式內使用 \"%s\" 連線能夠存取到。\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) "
@@ -11415,12 +11754,12 @@ msgstr ""
 "\n"
 "您確定要繼續進行設定這台列印機下去嗎?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "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 "
@@ -11428,56 +11767,56 @@ msgid ""
 "print queue name for the printer you wish to access and any applicable user "
 "name and password."
 msgstr ""
-"如要使用 NetWare 列印機，您必須要提供 NetWare\n"
+"如要使用 NetWare 列印機, 您必須要提供 NetWare\n"
 "列印伺服器的主機名稱 (注意! 這個名稱與 TCP/IP \n"
-"的主機名稱可能並不相同)，還要有分享出來的列印\n"
-"佇列名稱，以及適當的使用者帳號與密碼。"
+"的主機名稱可能並不相同), 還要有分享出來的列印\n"
+"佇列名稱, 以及適當的使用者帳號與密碼。"
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "列印伺服器名稱"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "列印佇列名稱"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP 伺服器名稱沒指定!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "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 "，主機 \"%s\"，連接埠 %s"
+msgstr ", 主機 \"%s\", 連接埠 %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 "主機 \"%s\"，連接埠 %s"
+msgstr "主機 \"%s\", 連接埠 %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "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 "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
-"請由清單內選擇您預期的列印機項目，並且輸入主機名稱、\n"
-"IP等資訊，必要時請輸入該連結埠號 (預設使用 port 9100)。"
+"請由清單內選擇您預期的列印機項目, 並且輸入主機名稱、\n"
+"IP等資訊, 必要時請輸入該連結埠號 (預設使用 port 9100)。"
 
-#: 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 "
@@ -11485,34 +11824,34 @@ msgid ""
 "JetDirect servers the port number is usually 9100, on other servers it can "
 "vary. See the manual of your hardware."
 msgstr ""
-"要透過TCP/socket這類型的列印機進行列印，您需要\n"
-"提供該列印機的主機名稱，同時也可能需要選擇性輸入\n"
+"要透過TCP/socket這類型的列印機進行列印, 您需要\n"
+"提供該列印機的主機名稱, 同時也可能需要選擇性輸入\n"
 "所在Port的位址。在大部分的HP-JetDirect列印機\n"
-"伺服主機所使用的Port多半為9100，其餘類型的列印機\n"
+"伺服主機所使用的Port多半為9100, 其餘類型的列印機\n"
 "就不一定為這個數值。建議您先閱讀列印機所提供的\n"
-"手冊，尋找出你目前使用這款列印機的相關硬體資訊。"
+"手冊, 尋找出你目前使用這款列印機的相關硬體資訊。"
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "沒指定列印機主機名稱或是IP !"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "列印機主機名稱或是IP"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, fuzzy, c-format
 msgid "Refreshing Device URI list..."
 msgstr "正在更新列印機資料 ..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "印表裝置的 URI"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -11520,37 +11859,37 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 "您可以直接使用 URI 的方式存取該列印機。URI 必須完整輸入\n"
-"CUPS伺服器所在位址，或者是用 Foomatic 規格方式輸入。\n"
-"請注意，並不是所有的 URI 類型都能夠被所有的 spooler 支援。"
+"CUPS伺服器所在位址, 或者是用 Foomatic 規格方式輸入。\n"
+"請注意, 並不是所有的 URI 類型都能夠被所有的 spooler 支援。"
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "必須輸入完整的 URI 位址！"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, fuzzy, c-format
 msgid "Pipe into command"
 msgstr "使用 Pipe 管線方式組成列印工作"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, fuzzy, c-format
 msgid "Command line"
 msgstr "網域名稱"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, fuzzy, c-format
 msgid "A command line must be entered!"
 msgstr "必須輸入完整的 URI 位址！"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -11558,119 +11897,119 @@ msgid ""
 "an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "正在安裝套件 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 ""
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, fuzzy, c-format
 msgid "Installing SANE packages..."
 msgstr "正在安裝套件..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, fuzzy, c-format
 msgid "Installing mtools packages..."
 msgstr "正在安裝套件..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "正在掃描你的 HP 多功能裝置"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "正在讀取列印機資料 ..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr ""
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "列印機的名稱應該只有包含英文字母、數字與底線這類字元"
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
-"這台 \"%s\" 列印機已經存在了，\n"
+"這台 \"%s\" 列印機已經存在了, \n"
 "您確定要覆蓋這台列印機的組態設定嗎？"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 "每一個列印機都需要指定一個名稱 (比方像是 printer)。\n"
-"至於描述與位置欄位可以不必填入，因為這些欄位是註解。"
+"至於描述與位置欄位可以不必填入, 因為這些欄位是註解。"
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "列印機名稱"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "描述"
 
-#: 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 "位置"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "正在準備列印機資料"
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "您的列印機型號"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11684,27 +12023,27 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"PrinterDrake 程式已經比較了現有資料庫內以及自動偵測的結果，以便於能夠找出最適"
-"用的列印機類型。這個結果可能有問題，尤其您的列印機的項目並沒有登記在目前已知"
-"的資料庫內時，所以請檢視這個結果是否正確，必要時請選擇「手動選擇型號」項目挑"
+"PrinterDrake 程式已經比較了現有資料庫內以及自動偵測的結果, 以便於能夠找出最適"
+"用的列印機類型。這個結果可能有問題, 尤其您的列印機的項目並沒有登記在目前已知"
+"的資料庫內時, 所以請檢視這個結果是否正確, 必要時請選擇「手動選擇型號」項目挑"
 "選出正確的型號項目。\n"
 "\n"
 "目前 PrinterDrake 程式所找到的列印機項目如下：\n"
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "該型號正確"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr "手動選擇型號"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11718,38 +12057,38 @@ msgstr ""
 "請檢視 PrinterDrake 程式所自動偵測到的列印機型號是否正確。\n"
 "您也可以尋找檢視下面的列印機清單。"
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11757,65 +12096,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "安裝"
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, fuzzy, c-format
-msgid "CD-ROM"
-msgstr "於 CDROM 裝置"
-
-#: 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
 #, fuzzy, c-format
 msgid "Floppy Disk"
 msgstr "開機片"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "其他地方"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "選擇檔案"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "正在安裝套件 %s..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI Windows 列印機設定"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11826,18 +12158,18 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 "您目前是設定使用 OKI 雷射列印機項目。這類的列印機\n"
-"使用一種很特殊的傳輸溝通協定，因此這類列印機一定要\n"
+"使用一種很特殊的傳輸溝通協定, 因此這類列印機一定要\n"
 "安裝在電腦第一個連接埠位置上才能夠正常工作。\n"
 "所以現在請您先確定您目前的列印機已經正確地安置在\n"
-"第一個連接埠上，以便於才能夠正在列印測試頁內容。\n"
+"第一個連接埠上, 以便於才能夠正在列印測試頁內容。\n"
 "否則列印功能將會無法正常工作。"
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark 噴墨列印機設定"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11846,11 +12178,11 @@ msgid ""
 "to."
 msgstr ""
 "Lexmark 所提供的噴墨列印機驅動程式只有支援本機列印機\n"
-"的列印的功能，將無法使用這類遠端列印機。請確認您目前\n"
-"列印機已經正確連結到您本地端電腦上，設定該列印機的\n"
+"的列印的功能, 將無法使用這類遠端列印機。請確認您目前\n"
+"列印機已經正確連結到您本地端電腦上, 設定該列印機的\n"
 "連結位置。"
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11864,21 +12196,21 @@ msgid ""
 msgstr ""
 "若是希望能夠使用這台 Lexmark 噴墨列印機進行列印的話\n"
 "您需要由 Lexmark 網站 (http://www.lexmark.com) 首頁上\n"
-"尋找相關連結，下載這台列印機的驅動程式。比方當您連上\n"
-"Lexmark 網站首頁後，請點選 \"Drivers\" 按鈕，選擇您\n"
-"目前使用該款列印機型號，並確認是選取使用 \"Linux\"的\n"
-"版本。一般來說，您下載回來的檔案，可能是 RPM 套件檔案\n"
+"尋找相關連結, 下載這台列印機的驅動程式。比方當您連上\n"
+"Lexmark 網站首頁後, 請點選 \"Drivers\" 按鈕, 選擇您\n"
+"目前使用該款列印機型號, 並確認是選取使用 \"Linux\"的\n"
+"版本。一般來說, 您下載回來的檔案, 可能是 RPM 套件檔案\n"
 "或者是幾個 shell script (執行該檔案將會啟動安裝程式)。\n"
-"一般來說，您並不需要透過圖行化的前端介面來進行相關的\n"
+"一般來說, 您並不需要透過圖行化的前端介面來進行相關的\n"
 "的設定。然後使用 \"lexmarkmaintain\" 程式項目來列印噴頭\n"
 "校正的工作設定。"
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, fuzzy, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Lexmark 噴墨列印機設定"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, fuzzy, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11887,16 +12219,39 @@ msgid ""
 "connected to."
 msgstr ""
 "Lexmark 所提供的噴墨列印機驅動程式只有支援本機列印機\n"
-"的列印的功能，將無法使用這類遠端列印機。請確認您目前\n"
-"列印機已經正確連結到您本地端電腦上，設定該列印機的\n"
+"的列印的功能, 將無法使用這類遠端列印機。請確認您目前\n"
+"列印機已經正確連結到您本地端電腦上, 設定該列印機的\n"
+"連結位置。"
+
+#: printer/printerdrake.pm:2897
+#, fuzzy, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "音效設定"
+
+#: 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 ""
+"Lexmark 所提供的噴墨列印機驅動程式只有支援本機列印機\n"
+"的列印的功能, 將無法使用這類遠端列印機。請確認您目前\n"
+"列印機已經正確連結到您本地端電腦上, 設定該列印機的\n"
 "連結位置。"
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2924
+#, fuzzy, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "手動組態設定"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11909,41 +12264,41 @@ msgstr ""
 "預設列印機設定\n"
 "\n"
 "您需要確定紙張的大小與墨水的種類設定都正確無誤。\n"
-"請注意一下，當使用高品質列印時所花費的時間會越久。"
+"請注意一下, 當使用高品質列印時所花費的時間會越久。"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "列印機型號選擇"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "%s 參數需要為整數!"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "%s 選項一定要為數字!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "%s 參數超出允許範圍"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr "您要使用這台列印機 (\"%s\") 為預設列印機嗎？"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "列印測試頁"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11952,62 +12307,62 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 "您選取你要列印的測試頁。\n"
-"注意: 圖形測試頁會花費比較久的時間來列印，\n"
-"若是該列印機硬體可用記憶體很少的話，列印時間\n"
+"注意: 圖形測試頁會花費比較久的時間來列印, \n"
+"若是該列印機硬體可用記憶體很少的話, 列印時間\n"
 "能夠會需要花費更久時間。\n"
-"一般情況來說，選擇標準的測試頁就很足夠了。"
+"一般情況來說, 選擇標準的測試頁就很足夠了。"
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "不列印測試頁"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "列印"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "標準列印測試頁"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Letter 紙張列印測試頁"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "A4 紙張列印測試頁"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "圖形列印測試頁"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "不要列印任何測試頁"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "正在列印測試頁..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, fuzzy, c-format
 msgid "Could not install the %s package!"
 msgstr "正在安裝 %s 套件"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, fuzzy, c-format
 msgid "Skipping photo test page."
 msgstr "圖形列印測試頁"
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12022,26 +12377,26 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 msgstr ""
-"測試頁已經被送到列印伺服程式了，接著可能需要花\n"
-"一點時間，列印機才會把結果印出來。\n"
+"測試頁已經被送到列印伺服程式了, 接著可能需要花\n"
+"一點時間, 列印機才會把結果印出來。\n"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "列印正常嗎？"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "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 "
@@ -12049,28 +12404,28 @@ msgid ""
 "\"kprinter <file>\". The graphical tools allow you to choose the printer and "
 "to modify the option settings easily.\n"
 msgstr ""
-"要在終端機命令列環境列印檔案的話，您可以執行這個指令: \n"
+"要在終端機命令列環境列印檔案的話, 您可以執行這個指令: \n"
 "\"%s <檔案名稱>\"\n"
 "或者是使用圖型介面程式:\n"
 "\"xpp <檔案名稱>\"\n"
 "或者是\n"
 "\"kprinter <檔案名稱>\"\n"
-"即可。您可以透過圖型介面程式簡單的選擇列印機項目，\n"
+"即可。您可以透過圖型介面程式簡單的選擇列印機項目, \n"
 "包含修改相關的列印選項。\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 "
 "printing dialogs of many applications, but here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"這個指令功能，其實您也可以在許多應用程式列印對話方塊的 \"列印命令\" 使用"
+"這個指令功能, 其實您也可以在許多應用程式列印對話方塊的 \"列印命令\" 使用"
 "它。\n"
-"但是這邊不提供所謂的檔案名稱，因為相關檔案的列印功能是由相關應用程式提供。\n"
+"但是這邊不提供所謂的檔案名稱, 因為相關檔案的列印功能是由相關應用程式提供。\n"
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -12079,21 +12434,21 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 "\n"
-"「%s」指令，能夠讓您修改某個設定列印工作項目的參數設定。\n"
-"簡單一點的方式就是在命令列加上您要填入的設定值，比方「%s <檔案>」。 "
+"「%s」指令, 能夠讓您修改某個設定列印工作項目的參數設定。\n"
+"簡單一點的方式就是在命令列加上您要填入的設定值, 比方「%s <檔案>」。 "
 
-#: 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 "
 "list shown below or click on the \"Print option list\" button.%s%s%s\n"
 "\n"
 msgstr ""
-"要獲得目前這台列印機可用的相關參數選項，或者是查看下面清單\n"
-"所顯示的項目，請點選點選『列印選項清單』按鈕。%s%s%s\n"
+"要獲得目前這台列印機可用的相關參數選項, 或者是查看下面清單\n"
+"所顯示的項目, 請點選點選『列印選項清單』按鈕。%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"
@@ -12102,7 +12457,7 @@ msgstr ""
 "下面包含了目前列印機支援的選項清單:\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 "
@@ -12110,20 +12465,20 @@ msgid ""
 msgstr ""
 "要在命令列環境(終端機視窗)列印檔案的話, 您可以執行這個指令 \"%s <檔案>\".\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 "
 "printing dialogs of many applications. But here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"這個指令功能，其實您也可以在許多應用程式列印對話方塊的\n"
+"這個指令功能, 其實您也可以在許多應用程式列印對話方塊的\n"
 "『列印命令』使用它。\n"
-"但是這邊不提供所謂的檔案名稱，因為相關檔案的列印功能是由\n"
+"但是這邊不提供所謂的檔案名稱, 因為相關檔案的列印功能是由\n"
 "相關應用程式提供。\n"
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -12132,16 +12487,16 @@ msgstr ""
 "要獲得目前這台列印機可用的相關參數選項, 請點選 \"Print option list 列印機選項"
 "表\"按鈕."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
-"要在終端機命令列環境列印檔案的話，您可以執行這個指令: \"%s <檔案>\" 或者是 "
+"要在終端機命令列環境列印檔案的話, 您可以執行這個指令: \"%s <檔案>\" 或者是 "
 "\"%s <檔案>\"。\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12156,7 +12511,7 @@ msgstr ""
 "桌面上, 標示為 \"STOP Printer! 停止列印機!\" 以停止全部的列印工作, 當你按下它"
 "時. 這對如卡紙來說十分有用.\n"
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -12165,46 +12520,36 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 "\n"
-"\"%s\" 與 \"%s\" 指令，能夠讓您修改某個設定列印工作項目\n"
-"的參數設定。簡單一點的方式就是在命令列加上您要填入的設定值，\n"
+"\"%s\" 與 \"%s\" 指令, 能夠讓您修改某個設定列印工作項目\n"
+"的參數設定。簡單一點的方式就是在命令列加上您要填入的設定值, \n"
 "比方 \"%s <檔案>\"。\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "使用「%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 "關閉"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "列印選項清單"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -12215,10 +12560,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -12232,18 +12579,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "讀取列印機資料 ..."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "列印機傳送設定"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -12252,45 +12594,45 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"若是您已經設定過 %s spooler 列印機項目的話，您可以很簡單\n"
-"將組態設定內容套用給 %s 項目。能夠套用的組態項目，包含像是\n"
-"列印機的名稱、描述資訊、位置、連線類型、預設參數等等項目，\n"
+"若是您已經設定過 %s spooler 列印機項目的話, 您可以很簡單\n"
+"將組態設定內容套用給 %s 項目。能夠套用的組態項目, 包含像是\n"
+"列印機的名稱、描述資訊、位置、連線類型、預設參數等等項目, \n"
 "不過不包含傳送要列印的工作項目功能。\n"
-"另外並不是所有的列印工作都能夠被傳輸過來，因為下面原因：\n"
+"另外並不是所有的列印工作都能夠被傳輸過來, 因為下面原因：\n"
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
-"CUPS 目前並不支援位於Novell主機上的列印機，包含不使用free-formed\n"
+"CUPS 目前並不支援位於Novell主機上的列印機, 包含不使用free-formed\n"
 "命令傳送列印資料的列印機。\n"
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
-"PDQ 僅支援本地端列印機，或者是遠端 LPD 的列印機，以及\n"
+"PDQ 僅支援本地端列印機, 或者是遠端 LPD 的列印機, 以及\n"
 "TCP/Socket 列印機類型。\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "PD 與 LPRng 不支援 IPP 類型的列印機。\n"
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
-"除此之外，queues 無法透過該程式建立，或者是 \"foomatic-configure\"\n"
+"除此之外, queues 無法透過該程式建立, 或者是 \"foomatic-configure\"\n"
 "無法進行傳輸。"
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -12301,7 +12643,7 @@ msgstr ""
 "透過廠商所提供的 PPD 檔案內容或者是原始性的 CUPS 驅動程式\n"
 "設定的列印機無法被進行轉換動作."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -12309,19 +12651,19 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 "\n"
-"請點選標記您要傳送的列印機項目，然後點選 \"傳送\" 即可。"
+"請點選標記您要傳送的列印機項目, 然後點選 \"傳送\" 即可。"
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "不傳送列印機"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "傳送"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -12330,47 +12672,47 @@ msgid ""
 msgstr ""
 "在 %s 已經存在了一個名稱為 %s 的列印機名稱。\n"
 "請點選『傳送』覆蓋內容。\n"
-"您也可以另外輸入一個名稱，或者是略過這台列印機。"
+"您也可以另外輸入一個名稱, 或者是略過這台列印機。"
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "新列印機名稱"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "正在傳送 %s ..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "正在更新列印機資料 ..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "啟動網路中 ..."
 
-#: 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 "立即設定網路"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "目前網路功能尚未設定"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -12378,17 +12720,17 @@ msgid ""
 "configuration, you will not be able to use the printer which you are "
 "configuring now. How do you want to proceed?"
 msgstr ""
-"您目前要開始設定遠端列印機列印的項目。要進行此項目設定的前提，您的系統需要具"
-"備網路功能以便於進行存取動作，但是目前網路尚未設定。如果您打算略過網路設定項"
-"目繼續進行下面的步驟的話，關於設定使用遠端列印機功能的項目將無法設定。您打算"
+"您目前要開始設定遠端列印機列印的項目。要進行此項目設定的前提, 您的系統需要具"
+"備網路功能以便於進行存取動作, 但是目前網路尚未設定。如果您打算略過網路設定項"
+"目繼續進行下面的步驟的話, 關於設定使用遠端列印機功能的項目將無法設定。您打算"
 "要怎麼作呢？"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "略過網路設定項目繼續進行下面的步驟"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, fuzzy, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -12397,44 +12739,44 @@ msgid ""
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
-"在系統整個安裝過程中，系統的網路服務並未啟動。建議您可以在\n"
-"整個安裝完成，重新開機進入系統後，透過 Mandrake 控制台程式\n"
-"選擇『網路』『連線』項目進行設定。此外，後續像是列印機\n"
-"的設定，您也可以透過 Mandrake 控制台程式，在『硬體』內的\n"
+"在系統整個安裝過程中, 系統的網路服務並未啟動。建議您可以在\n"
+"整個安裝完成, 重新開機進入系統後, 透過 Mandrake 控制台程式\n"
+"選擇『網路』『連線』項目進行設定。此外, 後續像是列印機\n"
+"的設定, 您也可以透過 Mandrake 控制台程式, 在『硬體』內的\n"
 "『列印機』項目來進行設定"
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
 "printer again."
 msgstr ""
-"網路服務的存取功能並未開啟，而且也無法啟動這個服務項目。\n"
-"請檢查一下您的設定，甚至包含您的硬體是否設定正確無誤。\n"
-"當檢查完畢後，再重新設定遠端列印的相關項目。"
+"網路服務的存取功能並未開啟, 而且也無法啟動這個服務項目。\n"
+"請檢查一下您的設定, 甚至包含您的硬體是否設定正確無誤。\n"
+"當檢查完畢後, 再重新設定遠端列印的相關項目。"
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "正在重新啟動列印系統服務 ..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "高"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "瘋狂狀態"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "在 %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 %"
@@ -12451,20 +12793,20 @@ msgstr ""
 "您目前正準備在「%s」安全等級的環境安裝來安裝「%s』\n"
 "這個列印系統項目。\n"
 "\n"
-"這個列印服務項目，相關程式將會在幕後運作，以便於能夠\n"
-"提供相關印表功能。此外，列印相關的服務，也能夠經由網路\n"
-"的方式進行存取，所以某個層面來說這可能有被攻擊的危險。\n"
-"因此，在這個安全等級環境下，將只有少部份的服務程式預設\n"
+"這個列印服務項目, 相關程式將會在幕後運作, 以便於能夠\n"
+"提供相關印表功能。此外, 列印相關的服務, 也能夠經由網路\n"
+"的方式進行存取, 所以某個層面來說這可能有被攻擊的危險。\n"
+"因此, 在這個安全等級環境下, 將只有少部份的服務程式預設\n"
 "會在開機時啟動。\n"
 "\n"
 "您確定要開始設定這台機器上的列印項目設定嗎？"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "於開機時啟動列印服務系統"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -12479,263 +12821,318 @@ msgid ""
 msgstr ""
 "列印服務系統 (%s) 將不會在系統開機時載入。\n"
 "\n"
-"若是您系統設定是選擇比較高的安全等級項目的話，\n"
+"若是您系統設定是選擇比較高的安全等級項目的話, \n"
 "預設也是不會啟動列印服務的項目的。\n"
 "\n"
 "您希望這邊能夠設定在開機時能夠預設啟動列印\n"
 "服務的項目嗎？"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "正在檢查已經安裝的軟體"
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "正在移除 %s"
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, fuzzy, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "變更列印系統"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "正在安裝套件 %s..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, fuzzy, c-format
 msgid "Could not install the %s printing system!"
 msgstr "變更列印系統"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, fuzzy, c-format
+msgid "Name or IP of remote server:"
+msgstr "遠端的 lpd 伺服器列印機"
+
+#: printer/printerdrake.pm:3970
 #, fuzzy, c-format
 msgid "Setting Default Printer..."
 msgstr "預設列印機"
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, fuzzy, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "遠端的 CUPS 伺服器列印機"
+
+#: 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
+#, fuzzy, c-format
+msgid "Local CUPS printing system"
+msgstr "變更列印系統"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "選擇印表列印系統"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "您打算用那一套列印系統？"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, fuzzy, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "正在設定「%s」列印機中 ..."
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "正在安裝 Foomatic 套件..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
 "it. "
 msgstr ""
-"下列的列印機都已經設定過了，您可以點選其中一個項目，\n"
-"可以查看內容資訊或者是修改內容設定，包含設定為預設列印機。"
+"下列的列印機都已經設定過了, 您可以點選其中一個項目, \n"
+"可以查看內容資訊或者是修改內容設定, 包含設定為預設列印機。"
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, fuzzy, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "更新列印機清單 (重新尋找遠端可用的所有 CUPS 列印機)"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "更新列印機清單 (重新尋找遠端可用的所有 CUPS 列印機)"
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPS 設定組態"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "變更列印系統"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "一般模式"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "專家模式"
 
-#: 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 "列印機選項"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "修改列印機設定"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"列印機 %s\n"
+"列印機 %s%s\n"
 "您要修改這個列印機的那個項目？"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, fuzzy, c-format
+msgid "This printer is disabled"
+msgstr "這個分割區無法重新調整大小"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "做吧 !"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "列印機連線方式"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "列印機名稱, 描述, 位置"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "列印機廠商,型號,驅動程式"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "列印機廠商,型號"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr "使用這台列印機為預設列印機"
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
-#, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "新增這台列印機至 Star Office/OpenOffice.org/GIMP 內"
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
+#, fuzzy, c-format
+msgid "Enable Printer"
+msgstr "開啟服務"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
-#, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "移除位於 Star Office/OpenOffice.org/GIMP 的列印機"
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
+#, fuzzy, c-format
+msgid "Disable Printer"
+msgstr "關閉服務"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "列印測試頁..."
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, fuzzy, c-format
 msgid "Learn how to use this printer"
 msgstr "瞭解如何使用這台列印機"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "刪除列印機"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "正在刪除舊有列印機 \"%s\" ..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "新增列印機至 Star Office/OpenOffice.org/GIMP 內"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"這台列印機 \"%s\" 已經成功的新增於 Star Office/OpenOffice.org/GIMP 內。"
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "無法新增列印機 \"%s\" 到 Star Office/OpenOffice.org/GIMP 內。"
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "移除 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 "已經成功的將 Star Office/OpenOffice.org/GIMP 的列印機 \"%s\" 移除。"
+#: printer/printerdrake.pm:4781
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now enabled."
+msgstr "列印機 \"%s\", 位於 \"%s\""
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "無法移除在 Star Office/OpenOffice.org/GIMP 的列印機 \"%s\"。"
+#: printer/printerdrake.pm:4786
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now disabled."
+msgstr "Internet 連線共享目前關閉了。"
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "您確定要刪除 \"%s\" 列印機嗎？"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "正在移除列印機 \"%s\"..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "預設列印機"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "這台列印機 \"%s\" 將會被設定成為預設列印機。"
 
-#: 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 "無法在 _已格式_ 化的磁碟陣列 md%d 中加入分割區"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "呼叫 mkraid 失敗 (也許是 raidtools 遺失?)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid 失敗"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "分割區數目不足以用來設定成為階層 %d 的磁碟陣列\n"
@@ -12760,16 +13157,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, fuzzy, c-format
 msgid "Scannerdrake"
 msgstr "選取您的掃描器"
 
-#: 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 ""
@@ -12799,7 +13196,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr ""
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -12809,29 +13207,38 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr ""
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, fuzzy, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "(位於這個機器上)"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, fuzzy, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "(位於這個機器上)"
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
 "gdm)."
 msgstr ""
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -12843,14 +13250,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12866,7 +13274,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12879,7 +13287,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12888,100 +13296,105 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "安全警示："
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr ""
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr ""
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr ""
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, fuzzy, c-format
 msgid "Set the root umask."
 msgstr "沒有密碼"
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr ""
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -12990,103 +13403,103 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr ""
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr ""
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr ""
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr ""
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, fuzzy, c-format
 msgid "Set the user umask."
 msgstr "使用者"
@@ -13132,211 +13545,216 @@ msgid "List users on display managers (kdm and gdm)"
 msgstr ""
 
 #: security/l10n.pm:20
+#, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
 #, fuzzy, c-format
 msgid "Allow X Window connections"
 msgstr "一般 modem 連線方式"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr ""
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, fuzzy, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "設定系統服務"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
-#: 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 ""
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr ""
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr ""
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr ""
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr ""
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, fuzzy, c-format
 msgid "No password aging for"
 msgstr "沒有密碼"
 
-#: 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
 #, fuzzy, c-format
 msgid "Password history length"
 msgstr "輸入的密碼太簡單了"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, fuzzy, c-format
 msgid "Root umask"
 msgstr "沒有密碼"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr ""
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, fuzzy, c-format
 msgid "Shell timeout"
 msgstr "核心啟動時間逾時時間"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, fuzzy, c-format
 msgid "User umask"
 msgstr "使用者"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, fuzzy, c-format
 msgid "Check open ports"
 msgstr "於 port %s 偵測到"
 
-#: 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 ""
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr ""
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr ""
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr ""
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr ""
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr ""
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -13373,10 +13791,10 @@ msgid ""
 "but very sensitive. It must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"把安全機制設定在這個等級時必須要非常謹慎，\n"
-"它會讓您的系統用起來更加簡易方便，可是卻極易\n"
+"把安全機制設定在這個等級時必須要非常謹慎, \n"
+"它會讓您的系統用起來更加簡易方便, 可是卻極易\n"
 "受到破壞: 這個設定不應該被用在有連線到Internet\n"
-"的主機，因為所有的存取動作都沒有用密碼加以\n"
+"的主機, 因為所有的存取動作都沒有用密碼加以\n"
 "限制。"
 
 #: security/level.pm:44
@@ -13384,21 +13802,21 @@ msgstr ""
 msgid ""
 "Passwords are now enabled, but use as a networked computer is still not "
 "recommended."
-msgstr "已啟動密碼認證功能，但仍然不建議將此系統運作於網路上網路環境。"
+msgstr "已啟動密碼認證功能, 但仍然不建議將此系統運作於網路上網路環境。"
 
 #: security/level.pm:45
 #, c-format
 msgid ""
 "This is the standard security recommended for a computer that will be used "
 "to connect to the Internet as a client."
-msgstr "標準的系統安全性設定，建議用在有對外連線的主機上使用。"
+msgstr "標準的系統安全性設定, 建議用在有對外連線的主機上使用。"
 
 #: security/level.pm:46
 #, c-format
 msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
-msgstr "包含了相關存取限制，以及每日定期系統稽核檢查動作。"
+msgstr "包含了相關存取限制, 以及每日定期系統稽核檢查動作。"
 
 #: security/level.pm:47
 #, c-format
@@ -13409,7 +13827,7 @@ msgid ""
 "accept\n"
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
-msgstr "高度的安全性相關的檢查與設定，適合提供在架設對外服務的伺服器使用。"
+msgstr "高度的安全性相關的檢查與設定, 適合提供在架設對外服務的伺服器使用。"
 
 #: security/level.pm:50
 #, c-format
@@ -13417,7 +13835,7 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"與上一個模式相同，不過整個系統幾乎都是封閉的。系統整個安全設定機制都是在最嚴"
+"與上一個模式相同, 不過整個系統幾乎都是封閉的。系統整個安全設定機制都是在最嚴"
 "密的狀態。"
 
 #: security/level.pm:55
@@ -13475,7 +13893,7 @@ msgstr ""
 msgid ""
 "Runs commands scheduled by the at command at the time specified when\n"
 "at was run, and runs batch commands when the load average is low enough."
-msgstr "atd 服務程式，能夠讓您在在命令列指定某個時間執行某個程式。"
+msgstr "atd 服務程式, 能夠讓您在在命令列指定某個時間執行某個程式。"
 
 #: services.pm:25
 #, c-format
@@ -13485,8 +13903,8 @@ msgid ""
 "basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
-"cron 是個標準 unix 系統程式，能夠提供使用者定期執行特定程式。\n"
-"vixie 版本的 cron 增加了許多功能，\n"
+"cron 是個標準 unix 系統程式, 能夠提供使用者定期執行特定程式。\n"
+"vixie 版本的 cron 增加了許多功能, \n"
 "在安全性與設定方面能夠更彈性好用。"
 
 #: services.pm:28
@@ -13505,7 +13923,7 @@ msgid ""
 "operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
-"GPM 能夠讓系統在文字模式下驅動顯示出滑鼠游標，能夠在 Midnight Commander\n"
+"GPM 能夠讓系統在文字模式下驅動顯示出滑鼠游標, 能夠在 Midnight Commander\n"
 "這類程式中所使用。另外還能夠支援在文字模式下螢幕文字的剪貼複製功能。"
 
 #: services.pm:33
@@ -13514,14 +13932,14 @@ msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
-"HardDrake 程式會進行硬體偵測動作，以便於設定新加入或者是有變更過\n"
+"HardDrake 程式會進行硬體偵測動作, 以便於設定新加入或者是有變更過\n"
 "的週邊裝置。"
 
 #: services.pm:35
 #, c-format
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
-msgstr "Apache 是一個提供 Web 服務的程式，提供架設 Web Server 讓使用者瀏覽。"
+msgstr "Apache 是一個提供 Web 服務的程式, 提供架設 Web Server 讓使用者瀏覽。"
 
 #: services.pm:36
 #, c-format
@@ -13533,9 +13951,9 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"internet superserver daemon (一般稱呼為 inetd)，它代為像是 telnet、ftp,\n"
-"rsh、rlogin 等等這類服務的監聽，然後有連線請求時，在實際呼叫提供服務的\n"
-"程式進行後續交談溝通的動作。關閉這個項目，仰賴於這個服務代為監聽啟動的\n"
+"internet superserver daemon (一般稱呼為 inetd), 它代為像是 telnet、ftp,\n"
+"rsh、rlogin 等等這類服務的監聽, 然後有連線請求時, 在實際呼叫提供服務的\n"
+"程式進行後續交談溝通的動作。關閉這個項目, 仰賴於這個服務代為監聽啟動的\n"
 "項目將會無法使用"
 
 #: services.pm:40
@@ -13544,7 +13962,7 @@ msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
 msgstr ""
-"啟動 Linux Kernel 2.2 系列的防火牆機制，用來保護您的機器不會遭受\n"
+"啟動 Linux Kernel 2.2 系列的防火牆機制, 用來保護您的機器不會遭受\n"
 "外來的網路攻擊。"
 
 #: services.pm:42
@@ -13558,7 +13976,7 @@ msgstr ""
 "/etc/sysconfig/keyboard\n"
 "檔案的鍵盤對應設定組態。\n"
 "您可以事後使用 kdbconfig 程式來設定。\n"
-"一般來說，目前大部分機器並不需要這個項目。"
+"一般來說, 目前大部分機器並不需要這個項目。"
 
 #: services.pm:45
 #, c-format
@@ -13579,7 +13997,7 @@ msgstr "系統開機時能夠自動偵測週邊裝置的狀態並且設定。"
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
-msgstr "Linuxconf 程式會在開機時偵測一些項目，調整維護系統一些組態設定。"
+msgstr "Linuxconf 程式會在開機時偵測一些項目, 調整維護系統一些組態設定。"
 
 #: services.pm:50
 #, c-format
@@ -13588,7 +14006,7 @@ msgid ""
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
 "lpd 服務程式是 lpr 程式運作上不可缺的程式。若是要架設列印服務伺服器\n"
-"的話，lpd 是很常見的選擇。"
+"的話, lpd 是很常見的選擇。"
 
 #: services.pm:52
 #, c-format
@@ -13603,7 +14021,7 @@ msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
 msgstr ""
-"named (BIND) 適用來提供 Domain Name Server (DNS) 服務的程式，\n"
+"named (BIND) 適用來提供 Domain Name Server (DNS) 服務的程式, \n"
 "用來解析主機名稱與 IP 對應的關係。"
 
 #: services.pm:55
@@ -13612,7 +14030,7 @@ msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"掛載與卸下所有網路檔案系統，比方像是 網路檔案系統(NFS), SMB, \n"
+"掛載與卸下所有網路檔案系統, 比方像是 網路檔案系統(NFS), SMB, \n"
 "NCP (NetWare) 這類。"
 
 #: services.pm:57
@@ -13620,7 +14038,7 @@ msgstr ""
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
-msgstr "在系統開機時，選擇啟動網路功能，或者是關閉不啟動該服務。"
+msgstr "在系統開機時, 選擇啟動網路功能, 或者是關閉不啟動該服務。"
 
 #: services.pm:59
 #, c-format
@@ -13629,7 +14047,7 @@ msgid ""
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
-"NFS 是一個常用的網路通訊協定，能夠提供跨網路分享其他主機的檔案系統。\n"
+"NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n"
 "這個服務項目會依照系統的 /etc/exports 檔案設定來啟動 NFS 分享功能。"
 
 #: services.pm:62
@@ -13638,17 +14056,17 @@ msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS 是一個常用的網路通訊協定，能夠提供跨網路分享其他主機的檔案系統。\n"
+"NFS 是一個常用的網路通訊協定, 能夠提供跨網路分享其他主機的檔案系統。\n"
 "這個服務提供 NFS 檔案分享時的鎖定機制。"
 
 #: services.pm:64
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "自動開關 numlock key 鎖在開機時於 console\n"
-"與 XFree."
+"與 Xorg."
 
 #: services.pm:66
 #, c-format
@@ -13663,9 +14081,9 @@ msgid ""
 "have\n"
 "it installed on machines that don't need it."
 msgstr ""
-"PCMCIA 支援，一般是用來讓筆記型電腦的網路卡、Modem 驅動所設計。\n"
-"一般來說，要額外設定好 PCMCIA 後才會真正啟動 PCMCIA 服務，因此\n"
-"就算是系統不需要這個功能，預先啟動他也不會有任何影響。"
+"PCMCIA 支援, 一般是用來讓筆記型電腦的網路卡、Modem 驅動所設計。\n"
+"一般來說, 要額外設定好 PCMCIA 後才會真正啟動 PCMCIA 服務, 因此\n"
+"就算是系統不需要這個功能, 預先啟動他也不會有任何影響。"
 
 #: services.pm:70
 #, c-format
@@ -13675,15 +14093,15 @@ msgid ""
 "machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"portmapper 程式管理了 RPC 連線，一般用於 NFS 與 NIS 通訊協定內。\n"
-"若是您系統要使用到 RPC 相關服務，您就必須啟動它。"
+"portmapper 程式管理了 RPC 連線, 一般用於 NFS 與 NIS 通訊協定內。\n"
+"若是您系統要使用到 RPC 相關服務, 您就必須啟動它。"
 
 #: services.pm:73
 #, c-format
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
 "one machine to another."
-msgstr "Postfix 是一個郵件傳送代理程式，用來投遞信件提供 SMTP 服務。"
+msgstr "Postfix 是一個郵件傳送代理程式, 用來投遞信件提供 SMTP 服務。"
 
 #: services.pm:74
 #, c-format
@@ -13698,7 +14116,7 @@ msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle or DVD players"
 msgstr ""
-"給 block 這類區塊裝置指派 raw 裝置 (就像是硬碟的分割區)，\n"
+"給 block 這類區塊裝置指派 raw 裝置 (就像是硬碟的分割區), \n"
 "一般是給 oracle 這類特殊程式使用。"
 
 #: services.pm:78
@@ -13709,7 +14127,7 @@ msgid ""
 "routing protocols are needed for complex networks."
 msgstr ""
 "routed 服務程式允許透過 RIP 通訊協定來更新路由表的資訊。\n"
-"一般來說，RIP 是給小型網路用途使用。"
+"一般來說, RIP 是給小型網路用途使用。"
 
 #: services.pm:81
 #, c-format
@@ -13717,7 +14135,7 @@ msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"rstat 通訊協定，能夠讓位於網路上的使用者接收到網路上任何一台\n"
+"rstat 通訊協定, 能夠讓位於網路上的使用者接收到網路上任何一台\n"
 "主機的運作效能資訊。"
 
 #: services.pm:83
@@ -13726,16 +14144,16 @@ msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"rusers 通訊協定，能夠讓位於網路上的使用者得知那些使用者登入在那些\n"
+"rusers 通訊協定, 能夠讓位於網路上的使用者得知那些使用者登入在那些\n"
 "機器上"
 
 #: services.pm:85
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
-"rwho 通訊協定，能夠讓遠端的使用者獲得該機器上所有登入在主機上的\n"
+"rwho 通訊協定, 能夠讓遠端的使用者獲得該機器上所有登入在主機上的\n"
 "使用找 (類似於 finger)。"
 
 #: services.pm:87
@@ -13759,8 +14177,8 @@ msgstr "載入 usb 裝置所需要的驅動程式"
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "啟動 X Font Server (這是為了 XFree 執行一定要的)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "啟動 X Font Server (這是為了 Xorg 執行一定要的)."
 
 #: services.pm:117 services.pm:159
 #, c-format
@@ -13804,7 +14222,7 @@ msgstr "未啟動"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "服務程式"
 
 #: services.pm:221
@@ -13816,7 +14234,7 @@ msgstr ""
 "抱歉 ! 這個服務項目並沒有\n"
 "額外的相關資訊。"
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "資訊"
@@ -13831,719 +14249,1188 @@ msgstr ""
 msgid "On boot"
 msgstr "開機自動載入"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "啟動"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
-#, fuzzy, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "感謝您選擇 Mandrakelinux 9.2"
+#: share/advertising/01.pl:13
+#, c-format
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr ""
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
-#, fuzzy, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "歡迎來到開放源碼的世界。"
+#: share/advertising/01.pl:15
+#, c-format
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "歡迎來到 <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 ""
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:13
 #, fuzzy, c-format
-msgid "<b>Discovery</b>"
-msgstr "驅動程式"
+msgid "<b>Open Source</b>"
+msgstr "<b>伺服器</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, fuzzy, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "歡迎來到開放源碼的世界。"
+
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
+msgid "<b>The GPL</b>"
 msgstr ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
+msgstr ""
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
 msgstr ""
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr ""
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "Internet"
+#: share/advertising/05.pl:17
+#, c-format
+msgid ""
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
 msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
 msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
 msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
 msgstr ""
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+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-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
 msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
 msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+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-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "Mandrake 控制中心"
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "Mandrakelinux 控制中心"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr ""
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr ""
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
+
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
+
+#: 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
-#, fuzzy, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "Mandrake 控制中心"
+#: share/advertising/10.pl:13
+#, c-format
+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 ""
 
-#: 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>"
+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
-#, fuzzy, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "成為 MandrakeExpert 專家"
+#: share/advertising/10.pl:17
+#, c-format
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+
+#: share/advertising/11.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
-#, fuzzy, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "存取彙整工具"
+#: share/advertising/11.pl:16
+#, c-format
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
-#, fuzzy, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "感謝您選擇 Mandrakelinux 9.2"
+#: share/advertising/11.pl:18
+#, c-format
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr ""
+
+#: share/advertising/12.pl:13
+#, c-format
+msgid "<b>The KDE Choice</b>"
+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:15
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/12.pl:17
 #, c-format
-msgid "\t- Plus much more"
+msgid ""
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
 msgstr ""
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/12.pl:19
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, fuzzy, c-format
-msgid "Do you require assistance?"
-msgstr "你是否有任何 %s 介面?"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "選擇您檔案系統所使用的加密金鑰"
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:15
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
+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 ""
 
-#: 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/dwd-02.pl:13
+#: share/advertising/13-b.pl:15
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
+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/dwd-02.pl:15
+#: share/advertising/14.pl:13
+#, fuzzy, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "OpenOffice.org Math"
+
+#: share/advertising/14.pl:15
 #, c-format
-msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/14.pl:19
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid ""
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:13
+#, fuzzy, c-format
+msgid "<b>Kontact</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:13
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>漫遊瀏覽網際網路</b>"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:17
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/16.pl:18
+#, fuzzy, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "以 FTP 傳輸檔案"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
 #, c-format
-msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+msgid "\t* ..."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr ""
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr ""
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr ""
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr ""
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr ""
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.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."
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
+msgstr ""
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr ""
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr ""
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>開發環境</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, 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."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"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-06.pl:17
+#: share/advertising/19.pl:19
 #, 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!"
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/20.pl:13
 #, fuzzy, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "成為 MandrakeExpert 專家"
+msgid "<b>Development Editors</b>"
+msgstr "程式開發平台"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
-#, fuzzy, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "你是否有任何 %s 介面?"
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:16
 #, c-format
-msgid "<b>Note</b>"
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
 msgstr ""
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:17
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
+msgid ""
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:18
 #, 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>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/21.pl:13
+#, fuzzy, c-format
+msgid "<b>Development Languages</b>"
+msgstr "程式開發平台"
+
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"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:13
+#: share/advertising/21.pl:16
 #, c-format
-msgid "<b>PowerPack+</b>"
+msgid "\t* The famous <b>C language</b>."
 msgstr ""
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/21.pl:17
 #, 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."
+msgid "\t* Object oriented languages:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/21.pl:18
 #, c-format
-msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+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
+#, fuzzy, 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
+#, c-format
+msgid "\t* And many more."
 msgstr ""
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/22.pl:13
 #, fuzzy, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "選擇您檔案系統所使用的加密金鑰"
+msgid "<b>Development Tools</b>"
+msgstr "程式開發平台"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:13
+#, fuzzy, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>伺服器</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/23.pl:16
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/23.pl:17
 #, c-format
-msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/23.pl:18
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:13
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
+msgid "<b>Servers</b>"
+msgstr "<b>伺服器</b>"
+
+#: share/advertising/24.pl:15
+#, c-format
+msgid ""
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/24.pl:17
+#, fuzzy, c-format
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "Apache WWW 伺服器"
+
+#: share/advertising/24.pl:18
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
+msgid ""
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/24.pl:20
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/24.pl:21
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid ""
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/25.pl:13
+#, c-format
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Mandrakelinux 控制中心</b>"
+
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/25.pl:17
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid ""
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/26.pl:13
+#, c-format
+msgid "<b>The Open Source Model</b>"
+msgstr ""
+
+#: 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
+#, fuzzy, c-format
+msgid "<b>Online Store</b>"
+msgstr "Mandrakelinux 控制中心"
+
+#: share/advertising/27.pl:15
 #, 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 ""
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:17
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- Sending and receiving emails"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:13
+#, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:18
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:16
-#, fuzzy, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "Apache WWW 伺服器"
+#: share/advertising/28.pl:20
+#, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:13
+#, c-format
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline 線上服務</b>"
+
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr ""
+
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
 #, c-format
-msgid "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
+
+#: share/advertising/30.pl:15
+#, c-format
+msgid ""
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:25
 #, c-format
+msgid "Office Workstation"
+msgstr "辦公軟體平台"
+
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
+"辦公軟體： 文書處理軟體 (kword、abiword), 試算表 (kspread、gnumeric), pdf 閱"
+"讀程式等等"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
+"辦公軟體： 文書處理軟體 (kword、abiword), 試算表 (kspread、gnumeric), pdf 閱"
+"讀程式等等"
+
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "遊戲平台"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:34
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "娛樂的一些程式： 紙牌、益智、動作、策略 等"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "多媒體平台"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "音效以及影像撥放編輯程式"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Internet 平台"
+
+#: share/compssUsers.pl:44
+#, fuzzy, c-format
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
+"包含讀信、寫信以及閱讀網路論壇的工具 (pine、mutt、tin ..) 與及 web 瀏覽工具"
+
+#: share/compssUsers.pl:49
+#, c-format
+msgid "Network Computer (client)"
+msgstr "用戶端網路環境"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "包含 ssh 等其他不同通訊協定的用戶端程式"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "組態設定"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "讓您方便設定您系統的工具"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Console 工具"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "編輯器, shell, 檔案工具, 終端機"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++ 發展環境, 包含編譯器、程式庫與及一些引入檔案"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "文件檔案"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux 系統與一些免費軟體的書籍、HOWTO 文件"
+
+#: 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 "LSB 的支援, 包含第三類協力廠商軟體支援"
+
+#: share/compssUsers.pl:85
 #, fuzzy, c-format
-msgid "<b>Development tools</b>"
-msgstr "程式開發平台"
+msgid "Apache"
+msgstr "路徑"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "群組"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Samba 伺服器"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+msgid "Firewall/Router"
+msgstr "防火牆/路由器"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Internet 閘道器"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/檔案 (F)/新增 (_N)"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix 郵件伺服器"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "使用光碟片回存"
+
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "NTP 伺服器"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:108
 #, c-format
-msgid "And of course the editors!"
+msgid "DNS/NIS"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "網域名稱伺服器"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "列印伺服器名稱"
+
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Samba 伺服器"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "資料庫軟體"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL、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、ProFTPD"
+
+#: share/compssUsers.pl:125
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Mali"
+
+#: share/compssUsers.pl:126
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "Postfix 郵件伺服器"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL、MySQL 資料庫"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "網路伺服器"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS server、SMB server、Proxy server、Ssh server"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE 環境"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE 圖形桌面介面環境, 包含許多好用的圖型介面工具程式"
+
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "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 "包含友善的應用程式、桌面軟體的圖型化使用環境"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "其他圖型桌面軟體"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, 等等管理程式"
+
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Philippines"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "NIS 伺服主機"
+
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Webcam"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Mandrake Terminal Server 設定"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "網路設定"
+
+#: 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 "Mandrakelinux 控制中心"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "正在設定「%s」列印機中 ..."
+
 #: standalone.pm:21
 #, c-format
 msgid ""
@@ -14595,8 +15482,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -14619,7 +15506,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"
@@ -14632,7 +15519,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -14702,7 +15589,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -14710,106 +15597,100 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "請登出，然後用 Ctrl-Alt-BackSpace 重新啟動 X"
+msgstr "請登出, 然後用 Ctrl-Alt-BackSpace 重新啟動 X"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr ""
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr ""
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "確定"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
 msgstr "Mandrake Terminal Server 設定"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "開啟服務"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "關閉服務"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "啟動服務"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "停止服務"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "網路開機 Floppy/ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "網路開機映像檔"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "新增/刪除使用者"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "新增/刪除用戶端"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
-msgstr "首次精靈"
+msgstr "首次巫師"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -14826,22 +15707,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, fuzzy, c-format
 msgid "Cancel Wizard"
-msgstr "點選這裡啟動設定精靈 ->"
+msgstr "點選這裡啟動設定巫師 ->"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, fuzzy, c-format
 msgid "Use thin clients."
 msgstr "新增/刪除用戶端"
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14850,45 +15731,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "這個過程將會需要花費一些時間。"
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "完成"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
 msgstr "Mandrake Terminal Server 設定"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14904,7 +15785,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14924,7 +15805,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14935,14 +15816,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"
@@ -14963,7 +15844,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14981,7 +15862,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14992,7 +15873,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -15003,7 +15884,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -15023,7 +15904,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -15033,7 +15914,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"
@@ -15053,13 +15934,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -15071,62 +15952,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "開機片"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "開機映像檔案"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "核心"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, fuzzy, c-format
 msgid "Default kernel version"
 msgstr "核心版本"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "建立整個核心 -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "未選取核心!"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "建立單一網路卡 -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "未選擇網路卡!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "建立所有核心 -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- 刪除"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "刪除所有 NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -15134,171 +16015,171 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "新增使用者 -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- 刪除使用者"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, fuzzy, c-format
 msgid "type: %s"
 msgstr "格式： "
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, fuzzy, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "自動重新設定"
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "並未建立網路開機映像檔"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, fuzzy, c-format
 msgid "Thin Client"
 msgstr "DHCP 用戶端"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, fuzzy, c-format
 msgid "Allow Thin Clients"
 msgstr "新增/刪除用戶端"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "新增用戶端 -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, fuzzy, c-format
 msgid "type: fat"
 msgstr "格式： "
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, fuzzy, c-format
 msgid "type: thin"
 msgstr "格式： "
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, fuzzy, c-format
 msgid "local config: false"
 msgstr "本機密碼檔"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, fuzzy, c-format
 msgid "local config: true"
 msgstr "重新設定"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- 刪除用戶端"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, fuzzy, c-format
 msgid "Delete Client"
 msgstr "<-- 刪除用戶端"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "dhcpd 設定..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr ""
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "網路遮罩"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr ""
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, fuzzy, c-format
 msgid "Domain Name:"
 msgstr "網域名稱"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, fuzzy, c-format
 msgid "Name Servers:"
 msgstr "Samba 伺服器"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "寫入設定"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "dhcpd 伺服器設定"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -15306,103 +16187,97 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
-msgstr "請插入一張磁片:"
+msgstr "請插入一張軟片:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "無法存取到軟碟"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
-msgstr "請移開軟碟內的磁片"
+msgstr "請移開軟碟內的軟片"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "沒有可用的軟碟機"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, fuzzy, c-format
 msgid "PXE image is %s/%s"
 msgstr "網路開機的映像檔案是 %s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "寫入檔案 %s 時發生錯誤"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "網路開機的映像檔案是 %s"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
-msgstr "製作時發生錯誤，您確認你有安裝 mkisofs 程式"
+msgstr "製作時發生錯誤, 您確認你有安裝 mkisofs 程式"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "需要建立 /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
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "%s 沒有正常回應"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr ""
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr ""
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "偵測到 %s"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, fuzzy, c-format
 msgid "%s not found...\n"
 msgstr "%s 沒有正常回應"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr ""
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr ""
@@ -15437,12 +16312,12 @@ msgid ""
 "\n"
 "Press ok to continue."
 msgstr ""
-"目前準備設定自動安裝磁片。這個功能有點危險，使用上要很慎重。\n"
+"目前準備設定自動安裝軟片。這個功能有點危險, 使用上要很慎重。\n"
 "\n"
-"這個功能，您將能夠很自動的在所要安裝的電腦上自動進行安裝的\n"
-"動作，有些步驟則能夠停下來讓使用者自己手動進行一些操作。\n"
+"這個功能, 您將能夠很自動的在所要安裝的電腦上自動進行安裝的\n"
+"動作, 有些步驟則能夠停下來讓使用者自己手動進行一些操作。\n"
 "\n"
-"為了最安全考量，所有分割區劃分以及格式化動作將會自動進行。\n"
+"為了最安全考量, 所有分割區劃分以及格式化動作將會自動進行。\n"
 "\n"
 "您希望繼續嗎？"
 
@@ -15466,23 +16341,23 @@ msgstr "自動化步驟設定"
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
-msgstr "請選擇每一個安裝的步驟，這些將會是您所操作的安裝過程"
+msgstr "請選擇每一個安裝的步驟, 這些將會是您所操作的安裝過程"
 
 #: standalone/drakautoinst:77 standalone/drakautoinst:78
 #: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
-msgstr "正在製作自動安裝磁片"
+msgstr "正在製作自動安裝軟片"
 
 #: standalone/drakautoinst:90
 #, fuzzy, c-format
 msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "請在 %s 中插入一片空白磁片"
+msgstr "請在 %s 中插入一片空白軟片"
 
 #: standalone/drakautoinst:91
 #, fuzzy, c-format
 msgid "Creating auto install floppy (drivers disk)"
-msgstr "正在製作自動安裝磁片"
+msgstr "正在製作自動安裝軟片"
 
 #: standalone/drakautoinst:158
 #, c-format
@@ -15497,8 +16372,8 @@ msgstr ""
 "\n"
 "自動安裝內可用的參數項目都在左邊的區段內"
 
-#: 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 "恭喜!!"
@@ -15509,8 +16384,8 @@ msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
-"已經成功建立自動安裝磁片。\n"
-"您可以使用這張磁片進行自動安裝的程序"
+"已經成功建立自動安裝軟片。\n"
+"您可以使用這張軟片進行自動安裝的程序"
 
 #: standalone/drakautoinst:289
 #, c-format
@@ -15537,66 +16412,61 @@ msgstr "Chad"
 msgid "tape"
 msgstr "磁帶"
 
-#: standalone/drakbackup:112
-#, fuzzy, c-format
-msgid "No devices found"
-msgstr "找不到列印機！"
-
-#: 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 ""
 
-#: 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 "
 "original 'base' backup."
 msgstr ""
 
-#: 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 "
@@ -15604,7 +16474,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 "
@@ -15612,60 +16482,60 @@ 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
 #, fuzzy, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Cron 使用非 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 ""
 
-#: 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 ""
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, fuzzy, c-format
 msgid "Old user list:\n"
 msgstr ""
 "\n"
 "- 使用者檔案:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, fuzzy, c-format
 msgid "New user list:\n"
 msgstr ""
 "\n"
 "- 使用者檔案:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -15675,7 +16545,7 @@ msgstr ""
 "                      DrakBackup 報表清單 \n"
 "\n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -15684,7 +16554,7 @@ msgstr ""
 "\n"
 "                      DrakBackup Daemon 報表清單\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -15697,13 +16567,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 "全部進度"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, fuzzy, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -15711,47 +16581,47 @@ msgid ""
 "If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
-"%s 已經存在了，您要刪除該項目嗎？\n"
+"%s 已經存在了, 您要刪除該項目嗎？\n"
 "\n"
-"警告：若是您已經完成該工作進度，也許您可以刪除該主機上\n"
+"警告：若是您已經完成該工作進度, 也許您可以刪除該主機上\n"
 "認證憑證檔案。"
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
-msgstr "產生憑證檔案，請稍後...。"
+msgstr "產生憑證檔案, 請稍後...。"
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
-msgstr "錯誤，無法執行 %s。"
+msgstr "錯誤, 無法執行 %s。"
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "%s 無密碼回應 (位於連接埠 %s)"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "%s - 錯誤的密碼"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
-msgstr "由 %s 傳輸到 %s 發生錯誤，權限拒絕"
+msgstr "由 %s 傳輸到 %s 發生錯誤, 權限拒絕"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "無法找到 %s (位於 %s)"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "%s 沒有正常回應"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -15768,84 +16638,84 @@ msgstr ""
 "\n"
 "這應該不需要輸入任何密碼."
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "遠端的 WebDAV 站台已經在進行同步了！"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAV 傳輸失敗！"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "未放入 CDR/DVDR！"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "似乎不是可燒錄的媒介裝置！"
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "不是可抹寫的媒介裝置！"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "刪除該媒介裝置需要花費一些時間。"
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "權限的問題無法存取 CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "%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 "備份系統檔案..."
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "硬碟備份檔案..."
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "備份使用者檔案..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "備份其他檔案..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "硬碟備份進度..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "備份沒有任何異動！"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15856,7 +16726,7 @@ msgstr ""
 "Drakbackup 透過 %s 活動:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15864,9 +16734,9 @@ msgid ""
 "FTP.\n"
 msgstr ""
 "\n"
-"(!) FTP 連結錯誤：由於 FTP 連線錯誤，備份檔案將沒透過 FTP 備份傳送出去。\n"
+"(!) FTP 連結錯誤：由於 FTP 連線錯誤, 備份檔案將沒透過 FTP 備份傳送出去。\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, fuzzy, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
@@ -15874,14 +16744,14 @@ msgstr ""
 "使用 FTP 上傳檔案時發生錯誤。\n"
 "請檢視您的 FTP 設定是否設定。"
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, fuzzy, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 "透過 FTP 傳送檔案清單: %s\n"
 " "
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15892,7 +16762,7 @@ msgstr ""
 "Drakbackup 使用 CD 方式進行處理：\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15903,25 +16773,25 @@ msgstr ""
 "Drakbackup 使用磁帶機方式進行處理：\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, fuzzy, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 "執行 sendmail 程式時發生錯誤\n"
-"  由於該錯誤，備份報表檔案將無法送出\n"
+"  由於該錯誤, 備份報表檔案將無法送出\n"
 "  請檢視您系統的 sendmail 是否有錯誤。"
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr "郵件發送時發生錯誤。\n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "無法建立 catalog 資訊"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -15930,411 +16800,411 @@ msgstr ""
 "\n"
 "請檢視您所需要的全部項目。\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr "這個選項能夠備份與還原您系統的 /etc 目錄。\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "備份您的系統檔案。(/etc 目錄)"
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, fuzzy, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "使用遞增備份 (不會覆蓋舊有備份)"
 
-#: 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 "使用遞增備份 (不會覆蓋舊有備份)"
 
-#: 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 ""
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "不要包含重要的檔案 (passwd、group、fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr "使用該選項您將能夠還原任何版本 /etc 檔案目錄."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "請檢查希望要備份的所有使用者項目。"
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "不要包含瀏覽器的快取資料檔"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, fuzzy, c-format
 msgid "Select the files or directories and click on 'OK'"
-msgstr "選取檔案或者是目錄，然後點選 '加入'"
+msgstr "選取檔案或者是目錄, 然後點選 '加入'"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "移除選取項目"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "使用者"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "使用 FTP 連線備份"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "網路方式:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, fuzzy, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 "建立/傳送\n"
 "備份 SSH 的憑證檔案"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, fuzzy, c-format
 msgid "Transfer Now"
 msgstr ""
 "  傳送    \n"
 "現在"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, fuzzy, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 "其他 (非 drakbackup)\n"
 "認證憑證檔案已經存在"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, fuzzy, c-format
 msgid "Host name or IP."
 msgstr "主機名稱"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "請輸入要備份到該主機的所在目錄名稱"
 
-#: standalone/drakbackup:1621
-#, fuzzy, c-format
-msgid "Login name"
-msgstr "網域名稱"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "記住該密碼"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "需要指定主機名稱、使用者與密碼！"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "使用 CD/DVDROM 備份"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, fuzzy, c-format
 msgid "Choose your CD/DVD device"
 msgstr "請選取您 CD/DVD 容量大小"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "請選取您 CD/DVD 容量大小"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "Multisession CD"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, fuzzy, c-format
 msgid "Erase your RW media (1st Session)"
-msgstr "如果您要先清除該讀寫媒介裝置上的資料 (1st Session)，請選取該項目"
+msgstr "如果您要先清除該讀寫媒介裝置上的資料 (1st Session), 請選取該項目"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr " 刪除中 "
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "裝置設備"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, fuzzy, c-format
 msgid "DVDRAM device"
 msgstr "裝置設備"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "尚未有任何 CD 裝置定義!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "使用磁帶進行備份"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, fuzzy, c-format
 msgid "Device name to use for backup"
 msgstr "請輸入您要用來備份使用的裝置名稱"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "備份之後不回捲磁帶"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "使用磁帶進行備份"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, fuzzy, c-format
 msgid "Eject tape after the backup"
 msgstr "使用磁帶進行備份"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "請輸入您要儲存的目錄名稱："
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, fuzzy, c-format
 msgid "Directory to save to"
 msgstr "請輸入您要儲存的目錄名稱："
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, fuzzy, c-format
 msgid ""
 "Maximum size\n"
 " allowed for Drakbackup (MB)"
 msgstr "請輸入備份允許最大的大小"
 
-#: 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 "硬碟 / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "每小時"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "每天"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "每週"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "每月"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, fuzzy, c-format
 msgid "custom"
 msgstr "自訂"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "1月"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "2月"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "3月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "4月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "5月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "6月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "7月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "8月"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "9月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "10月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "11月"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "12月"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "星期日"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "星期一"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "星期二"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "星期三"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "星期四"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "星期五"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "星期六"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "使用排程程式"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "請輸入每一次備份的間隔時間"
 
-#: 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 "分"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "時"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "天"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "月"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, fuzzy, c-format
 msgid "Weekday"
 msgstr "星期三"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, fuzzy, c-format
 msgid "Please choose the media for backup."
 msgstr "請選擇要用來備份的裝置"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, fuzzy, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
@@ -16342,7 +17212,7 @@ msgstr ""
 "\n"
 "請注意目前所有 '網路' 媒介都會使用硬碟。"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, fuzzy, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
@@ -16350,117 +17220,117 @@ msgstr ""
 "\n"
 "請注意目前所有 '網路' 媒介都會使用硬碟。"
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, fuzzy, c-format
 msgid "Please choose the compression type"
 msgstr "請選取要回存的日期"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, fuzzy, c-format
 msgid "Use .backupignore files"
 msgstr "備份檔案啟用最大容量配給限制。"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "在每次備份完成後發送郵件通知該使用者："
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "網芳主機名稱”"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "備份成功後刪除硬碟上的 tar 檔案"
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "備份項目設定"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "備份儲存位置設定"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "備份時間設定"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "更多選項"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "目前網路功能尚未設定"
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackup 組態"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "請選取您要備份的項目"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, fuzzy, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "備份成功後刪除硬碟上的 tar 檔案"
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "透過網路"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "於 CD-R 裝置"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "於磁帶機裝置"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "備份使用者資料"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, fuzzy, c-format
 msgid " (Default is all users)"
 msgstr "預設列印機"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "請選取您要備份的項目"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "備份系統資料"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "手動選取使用者"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "請選擇用來備份資料的裝置..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -16469,7 +17339,7 @@ msgstr ""
 "\n"
 "備份來源檔: \n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -16478,7 +17348,7 @@ msgstr ""
 "\n"
 "- 系統檔案:\n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -16487,7 +17357,7 @@ msgstr ""
 "\n"
 "- 使用者檔案:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -16496,7 +17366,7 @@ msgstr ""
 "\n"
 "- 其他檔案:\n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -16505,12 +17375,12 @@ msgstr ""
 "\n"
 "- 儲存於硬碟的路徑: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -16519,17 +17389,7 @@ msgstr ""
 "\n"
 "- 備份完成後刪除硬碟內先前備份的 tar 檔案。\n"
 
-#: standalone/drakbackup:2506
-#, fuzzy, c-format
-msgid "NO"
-msgstr "資訊"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr ""
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -16538,22 +17398,22 @@ msgstr ""
 "\n"
 "- 燒錄到 CD 片"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr " 位於位置: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -16562,12 +17422,17 @@ msgstr ""
 "\n"
 "- 儲存於該磁帶機裝置：%s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\t刪除=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -16576,7 +17441,7 @@ msgstr ""
 "\n"
 "- 儲存 %s 於站台 - %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -16585,7 +17450,7 @@ msgstr ""
 "\t\t 使用者名稱: %s\n"
 "\t\t 位於路徑: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -16594,42 +17459,42 @@ msgstr ""
 "\n"
 "- 選項:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\t不要包含系統檔案\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t使用 tar 與 bzip2 進行備份\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\t使用 tar 與 gzip 進行備份\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, fuzzy, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\t使用 tar 與 gzip 進行備份\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\t使用.backupignore 檔案\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "位於 CUPS 伺服器 \"%s\""
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -16638,47 +17503,47 @@ msgstr ""
 "\n"
 "- Daemon (%s) 服務程式包含 :\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-硬碟\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-光碟機\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-磁帶機\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-網路 (透過 FTP)\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t網路 (透過 SSH)\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-網路 (透過 rsync)\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-網路 (透過 webdav)\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "尚未設定任何組態項目，請點選精靈或者是進階模式建立之。\n"
+msgstr "尚未設定任何組態項目, 請點選巫師或者是進階模式建立之。\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -16687,33 +17552,33 @@ msgstr ""
 "要回存的資料清單:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr ""
 "\n"
 "- 系統檔案:\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr ""
 "\n"
 "- 使用者檔案:\n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr ""
 "\n"
 "- 其他檔案:\n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -16722,143 +17587,143 @@ msgstr ""
 "毀損的資料檔案清單:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "下一次請取消或者是移除該項目。"
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "備份的檔案已經毀損"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          您所選取的所有資料已經                       "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          成功回存到 %s                    "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         回存組態設定       "
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "選取 OK 來回存其他檔案。"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "回存的使用者清單 (只有回存最近使用者重要的檔案)"
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "請選取要回存的日期"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "由硬碟回存。"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, fuzzy, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "請輸入備份資料所要回存的目錄"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, fuzzy, c-format
 msgid "Directory with backups"
 msgstr "回存所有備份資料"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "請選取要用來回存資料的裝置來源"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "其他裝置"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "回存系統"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "回存使用者檔案"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "回存其他檔案"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "選擇要回存的路徑名稱 (代替預設的 /)"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, fuzzy, c-format
 msgid "Path To Restore To"
 msgstr "自訂回存方式"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "在回存前進行新的備份動作 (只能夠用在遞增式備份時.)"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "在回存資料時先刪除使用者的相關目錄"
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "找不到列印機！"
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, fuzzy, c-format
 msgid "Restore Selected"
 msgstr ""
 "回存選取項目\n"
 "檔案"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -16867,17 +17732,17 @@ msgstr ""
 "回存選取項目\n"
 "檔案"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "備份檔案找不到 - %s。"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "使用光碟片回存"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -16886,17 +17751,17 @@ msgstr ""
 "請置入標籤名稱為 %s 的 CD 片到光碟機內\n"
 "(掛載點為 /mnt/cdrom)"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
-msgstr "不正確的 CD 片標籤，磁碟標籤名稱為 %s。"
+msgstr "不正確的 CD 片標籤, 磁碟標籤名稱為 %s。"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "使用磁帶回存"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -16905,288 +17770,293 @@ msgstr ""
 "請置入標籤名稱為 %s 的磁帶\n"
 "到 %s 磁帶機內"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
-msgstr "不正確的磁帶標籤，磁帶標籤為 %s。"
+msgstr "不正確的磁帶標籤, 磁帶標籤為 %s。"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "使用網路回存檔案"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "網路回存使用的協定：%s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "主機名稱"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "主機路徑或是模組名稱"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "需要輸入密碼"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "需要輸入帳號名稱"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "需要輸入主機名稱"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "需要輸入路徑或是模組名稱"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "要回存的檔案..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "回存失敗..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "%s 沒有正常回應"
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "搜尋檔案來回存"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "回存所有備份資料"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "自訂回存方式"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "使用型錄回存"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "無法找到備份以回存...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, fuzzy, c-format
 msgid "Verify that %s is the correct path"
 msgstr "這樣子正確嗎？"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD 片就緒 - 繼續執行。"
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, fuzzy, c-format
 msgid "Directory To Restore From"
 msgstr "使用光碟片回存"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "回存進度"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "儲存"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "建立備份"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "回存"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, fuzzy, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "下列的套件將會被安裝上"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "請選取要回存的資料..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "備份系統檔案"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "備份使用者檔案"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "備份其他檔案"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "全部進度"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, fuzzy, c-format
 msgid "Sending files by FTP"
 msgstr "正在送出檔案..."
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "正在送出檔案..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "依據目前組態設定開始備份"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "檢視備份組態設定"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
-msgstr "精靈設定模式"
+msgstr "巫師設定模式"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "進階設定"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, fuzzy, c-format
 msgid "View Configuration"
 msgstr "組態設定"
 
-#: 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 "立即備份"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
-"尚未產生組態設定檔案，請點選\n"
-"精靈或者是進階模式建立之。"
+"尚未產生組態設定檔案, 請點選\n"
+"巫師或者是進階模式建立之。"
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, fuzzy, c-format
 msgid "Graphical boot theme selection"
 msgstr "列印機型號選擇"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "系統模式"
 
-#: 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 "/檔案 (_F)"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
-msgstr "/檔案/結束 (_Q)"
+msgstr "/檔案 (F)/結束 (_Q)"
 
-#: 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 "安裝佈景"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "建立新的佈景"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, fuzzy, c-format
+msgid "Do you want to configure it now?"
+msgstr "您想要測試您的設定值嗎？"
+
+#: standalone/drakboot:177
 #, fuzzy, c-format
 msgid "Theme"
 msgstr "佈景"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -17195,318 +18065,313 @@ msgstr ""
 "在 console\n"
 "顯示佈景"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "開機時啟動 X Window 圖形作業環境"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
-msgstr "不，我不需要自動登入 (AutoLogin)"
+msgstr "不, 我不需要自動登入 (AutoLogin)"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "是的，我需要用這個 (使用者、桌面) 來自動登入"
+msgstr "是的, 我需要用這個 (使用者、桌面) 來自動登入"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "預設使用者"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "預設桌面"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "安裝 %s 失敗，發生如下之錯誤："
-
-#: 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 ""
-"要回報任何臭蟲問題, 請點選回報的按鈕.\n"
-"這將會開啟瀏覽器於 %s\n"
-" 其中你將找到一表格填入. 以上顯示的資訊將 會\n"
-"被傳送到那伺服器."
 
-#: standalone/drakbug:48
-#, c-format
-msgid "Mandrake Bug Report Tool"
+#: standalone/drakbug:41
+#, fuzzy, c-format
+msgid "Mandrakelinux Bug Report Tool"
 msgstr "Mandrake 臭蟲報告工具"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrake 控制中心"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux 控制中心"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "同步工具"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr "單一工具"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "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 "Mandrake 選單編輯器"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec 安全設定偵測"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "遠端列印機"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "套件管理程式"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi 套件管理"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows 整合工具"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake 使用者管理"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
-msgstr "設定精靈"
-
-#: standalone/drakbug:84
-#, fuzzy, 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 ""
-"要回報任何臭蟲問題，請點選回報的按鈕。\n"
-"系統將會開啟瀏覽器並連線到 %s\n"
-" 然後請找到適當的項目並輸入相關問題資訊，以便於將臭蟲問題送至主機通知發展人"
-"員。"
+msgstr "設定巫師"
 
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "應用程式:"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "套件： "
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "核心："
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "發行： "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
 "or Full Path:"
 msgstr ""
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, fuzzy, c-format
 msgid "Find Package"
 msgstr "%d 個套件"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "總結"
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
+msgid "Bug Description/System Information"
 msgstr ""
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
+msgid "YOUR TEXT HERE"
 msgstr ""
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, fuzzy, c-format
 msgid "Submit kernel version"
 msgstr "核心版本"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr ""
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"要回報任何臭蟲問題, 請點選回報的按鈕.\n"
+"這將會開啟瀏覽器於 %s\n"
+" 其中你將找到一表格填入. 以上顯示的資訊將 會\n"
+"被傳送到那伺服器."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "回報"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "尚未安裝"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, fuzzy, c-format
 msgid "Package not installed"
 msgstr "尚未安裝"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr ""
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "連線到 %s ..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
-msgstr "找不到可用的瀏覽器程式，請先安裝上可用的瀏覽器"
+msgstr "找不到可用的瀏覽器程式, 請先安裝上可用的瀏覽器"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, fuzzy, c-format
 msgid "Please enter a package name."
 msgstr "請輸入使用者帳號"
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr ""
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, fuzzy, c-format
 msgid "DrakClock"
 msgstr "Drakbackup"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, fuzzy, c-format
 msgid "not defined"
 msgstr "重新設定"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, fuzzy, c-format
 msgid "Change Time Zone"
 msgstr "時區"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "時區 - DakClock"
 
-#: 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 "硬體時鐘設定為 GMT 時間嗎?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, fuzzy, c-format
 msgid "Network Time Protocol"
 msgstr "網路介面"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, fuzzy, c-format
 msgid "Enable Network Time Protocol"
 msgstr "網路回存使用的協定：%s"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, fuzzy, c-format
 msgid "Server:"
 msgstr "主機： "
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, fuzzy, c-format
 msgid "Reset"
 msgstr "拒絕"
 
-#: standalone/drakclock:214
-#, c-format
+#: standalone/drakclock:225
+#, fuzzy, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
-msgstr ""
+"Do you want to install ntp?"
+msgstr "這個 %s 套件需要安裝上, 您要安裝該套件嗎？"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "網路組態 (%d 介面卡)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "閘道器："
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "介面:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "請稍後"
@@ -17516,12 +18381,8 @@ msgstr "請稍後"
 msgid "Interface"
 msgstr "介面"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "驅動程式"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "狀態"
@@ -17536,7 +18397,7 @@ msgstr "主機名稱："
 msgid "Configure hostname..."
 msgstr "設定主機名稱..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "區域網路設定"
@@ -17546,8 +18407,8 @@ msgstr "區域網路設定"
 msgid "Configure Local Area Network..."
 msgstr "設定區域網路..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "套用"
@@ -17557,127 +18418,133 @@ msgstr "套用"
 msgid "Manage connections"
 msgstr "Cable 連線"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, fuzzy, c-format
 msgid "Device selected"
 msgstr "移除選取項目"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, fuzzy, c-format
 msgid "IP configuration"
 msgstr "CUPS 設定組態"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "DNS 伺服器"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "NIS 域名"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, fuzzy, c-format
 msgid "static"
 msgstr "自動分配 IP"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, fuzzy, c-format
+msgid "Metric"
+msgstr "限制"
+
+#: standalone/drakconnect:491
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "Internet 平台"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "核心啟動時間逾時時間"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "選擇檔案"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "科威特"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "型號"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "開啟"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "關閉"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "媒介類別"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "模組名稱"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "IP 位址"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "匯流排"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "匯流排上的位置"
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
-msgstr "您系統偵測不到有網路卡的存在，請重新執行硬體設定工具。"
+msgstr "您系統偵測不到有網路卡的存在, 請重新執行硬體設定工具。"
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "選取網路介面"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "選取網路介面"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, fuzzy, 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 ""
@@ -17685,70 +18552,70 @@ 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 ""
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr ""
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "毀損的套件"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, fuzzy, c-format
 msgid "down"
 msgstr "完成"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "已連線"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "尚未連線"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "斷線..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "連線..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
-msgstr "警告，偵測到您系統已經有現成的網路連線，也許正在存取您的網路服務"
+msgstr "警告, 偵測到您系統已經有現成的網路連線, 也許正在存取您的網路服務"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, fuzzy, c-format
 msgid "Deactivate now"
 msgstr "立即關閉"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, fuzzy, c-format
 msgid "Activate now"
 msgstr "立即啟動"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -17757,79 +18624,97 @@ msgstr ""
 "您還沒有任何已經設定好的網路介面。\n"
 "請點選設定來進行網路介面設定動作"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "區域網路設定"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "介面卡 %s： %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "通訊協定"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "於開機時啟動"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
-msgstr "網路介面尚未設定，請執行設定精靈"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
+msgstr "網路介面尚未設定, 請執行設定巫師"
 
-#. -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
 #, fuzzy, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
-msgstr ""
-"您還沒有任何 Internet 連線設定。請先點選\n"
-"設定按鈕來建立一個 Internet 連線設定內容"
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
+msgstr "網路介面尚未設定, 請執行設定巫師"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internet 連線設定"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, fuzzy, c-format
 msgid "Third DNS server (optional)"
 msgstr "第一台DNS伺服器 (可不輸入)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internet 連線設定"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Internet 存取"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "連線項目： "
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "狀態："
 
-#: 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 ""
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -17837,116 +18722,124 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr "改變完成, 您想要重新開始 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 "製作開機磁片"
+msgstr "製作開機軟片"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "一般"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, fuzzy, c-format
 msgid "Device"
 msgstr "裝置： "
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, fuzzy, c-format
 msgid "Kernel version"
 msgstr "核心版本"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "偏好"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "進階選項"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "大小"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, fuzzy, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "mkinitrd 選項"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "強迫"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "省略 raid 模組"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "若需要的話"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "省略 scsi 模組"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "新增模組"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "移除一模組"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "請確定裝置 %s 內已放入磁碟片"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
-"在裝置 %s 內找不到磁碟片，或者是磁片防寫。\n"
+"在裝置 %s 內找不到磁碟片, 或者是軟片防寫。\n"
 "請放入一張磁碟片。"
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "無法建立另一行程：%s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, fuzzy, c-format
 msgid "Floppy creation completed"
 msgstr "連線速度"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr ""
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, fuzzy, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -18022,7 +18915,7 @@ msgstr "True Type 字體檔安裝"
 #: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
-msgstr "請稍後，執行 ttmkfdir 程式中..."
+msgstr "請稍後, 執行 ttmkfdir 程式中..."
 
 #: standalone/drakfont:334
 #, c-format
@@ -18068,8 +18961,8 @@ msgid ""
 "-You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"進行安裝字型前，請務必確認您有適當的權限能夠存取使用，\n"
-"其中包含這些字型都是正確沒錯誤的。要不然，極端情況下，\n"
+"進行安裝字型前, 請務必確認您有適當的權限能夠存取使用, \n"
+"其中包含這些字型都是正確沒錯誤的。要不然, 極端情況下, \n"
 "您的 X 伺服器可能會因為不正確的字型檔案而不預期結束。"
 
 #: standalone/drakfont:477 standalone/drakfont:486
@@ -18087,7 +18980,7 @@ msgstr "字型清單"
 msgid "About"
 msgstr "放棄"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, fuzzy, c-format
 msgid "Uninstall"
 msgstr "後續反安裝設定"
@@ -18097,10 +18990,11 @@ msgstr "後續反安裝設定"
 msgid "Import"
 msgstr "字型匯入"
 
-#: 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"
@@ -18110,7 +19004,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -18130,7 +19024,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -18148,12 +19042,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "選擇能夠使用該字體的應用程式："
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, fuzzy, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -18162,126 +19056,131 @@ msgid ""
 "You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"進行安裝字型前，請務必確認您有適當的權限能夠存取使用，\n"
-"其中包含這些字型都是正確沒錯誤的。要不然，極端情況下，\n"
+"進行安裝字型前, 請務必確認您有適當的權限能夠存取使用, \n"
+"其中包含這些字型都是正確沒錯誤的。要不然, 極端情況下, \n"
 "您的 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 "一般列印機"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "選取字型檔案或者是所在目錄, 點選 '加入'"
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "檔案選取"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, fuzzy, c-format
 msgid "You've not selected any font"
 msgstr "找不到任何字型。\n"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "字型匯入"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "移除字型"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "確定的話請點選這裡"
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "不確定點選這裡"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "取消選取所有項目"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "選取所有項目"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "移除清單"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "字型匯入"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "初始測試"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "複製字體至系統"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "安裝與轉換字體"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "後續安裝設定"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "由您的系統移除該字體檔案"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "後續反安裝設定"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Internet 連線分享"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, fuzzy, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "抱歉, 目前只有支援使用 2.4 的核心版本。"
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internet 連線共享目前關閉了。"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, fuzzy, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -18293,39 +19192,39 @@ msgstr ""
 "\n"
 "您希望要處理那個？"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "開啟"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "重新設定"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "取消"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "啟用伺服器中..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Internet 連線工想目前開啟了。"
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internet 連線分享目前處於可用狀態"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -18336,22 +19235,22 @@ msgstr ""
 "目前 Internet 連線分享的設定已經完成了.. 目前已經可用了..\n"
 "您目前打算要做什麼呢？"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "關閉"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "正在關閉伺服器..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Internet 連線共享目前關閉了。"
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -18364,32 +19263,32 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"目前要進行Internet連線分享的設定，這個功能能夠\n"
+"目前要進行Internet連線分享的設定, 這個功能能夠\n"
 "讓其他區域網路內的電腦透過這台主機的頻寬分享\n"
 "連上 Internet。請注意: 您需要另外一張網路卡以便\n"
 "於提供區域網路電腦連線存取分享使用。"
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "介面 %s (使用 %s 模組)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "介面 %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "您系統並沒有網路卡存在"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "網路介面"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -18404,19 +19303,24 @@ msgstr ""
 "\n"
 "現在要進行這張網路卡與區域網路的連線組態設定。"
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "選取網路介面"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "請選擇要連線到區域網路內的網路卡。"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "網路介面已經設定完成"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -18425,33 +19329,33 @@ msgid ""
 "\n"
 "You can do it manually but you need to know what you're doing."
 msgstr ""
-"警告，系統網路卡介面 (%s) 已經設定過了。\n"
+"警告, 系統網路卡介面 (%s) 已經設定過了。\n"
 "\n"
 "您確定要自動重新設定過？\n"
 "\n"
-"如果您有特殊需求，可以選擇手動方式設定。"
+"如果您有特殊需求, 可以選擇手動方式設定。"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "自動重新設定"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "顯示目前網路介面組態設定"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "目前介面組態設定"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -18468,7 +19372,7 @@ msgstr ""
 "IP 屬性：%s\n"
 "驅動程式： %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -18483,20 +19387,20 @@ msgid ""
 "for you.\n"
 "\n"
 msgstr ""
-"設定程式已經紀錄了目前的組態設定資訊，並假設您已經設定好了\n"
+"設定程式已經紀錄了目前的組態設定資訊, 並假設您已經設定好了\n"
 "DHCP 服務；接下來請確認設定程式能夠正確取的您區域網路資訊；\n"
-"如果設定程式無法正確取得 DHCP 服務組態的話，相關設定將不會繼續。\n"
+"如果設定程式無法正確取得 DHCP 服務組態的話, 相關設定將不會繼續。\n"
 "\n"
-"沒問題的話，安裝程式將會重新設定您的網路介面，設定由 DHCP 主機\n"
+"沒問題的話, 安裝程式將會重新設定您的網路介面, 設定由 DHCP 主機\n"
 "取得IP資訊。\n"
 "\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "內部網路IP位址"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, fuzzy, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -18507,75 +19411,75 @@ msgstr ""
 "DHCP 伺服器設定。\n"
 "\n"
 "您可以在這邊選擇設定 DHCP 的相關組態設定。\n"
-"如果您不清楚相關參數的意思，您可以為持空白不要輸入資料。\n"
+"如果您不清楚相關參數的意思, 您可以為持空白不要輸入資料。\n"
 "\n"
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "該 DHCP 主機 IP"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "該 DHCP 主機 IP"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "內部網域的名稱"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP 起始範圍"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP 結束範圍"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "預設租約時間 (秒為單位)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "最大租約時間  (秒為單位)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "重新設定該網路介面與 DHCP 伺服器"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "該區域網路並不是以 .0 結尾，放棄..."
+msgstr "該區域網路並不是以 .0 結尾, 放棄..."
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "潛在的 LAN 位址衝突發現於目前 %s 設定!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "設定中..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "設定 script, 安裝軟體，啟動相關的 servers 服務"
+msgstr "設定 script, 安裝軟體, 啟動相關的 servers 服務"
 
-#: 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 "安裝 %s 套件發生錯誤"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -18584,14 +19488,14 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 "每個項目都已經設定好了。\n"
-"現在您的系統已經透過 DHCP 動態 IP 分配的方式取得連線 IP，\n"
+"現在您的系統已經透過 DHCP 動態 IP 分配的方式取得連線 IP, \n"
 "並且也已經能夠透過其他電腦的頻寬分享存取 Internet 服務。"
 
 #: standalone/drakhelp:17
 #, 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"
@@ -18616,56 +19520,61 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, fuzzy, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrake 控制中心"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
 "browse the help system"
 msgstr ""
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, fuzzy, c-format
 msgid "System settings"
 msgstr "自訂磁碟分割"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, fuzzy, c-format
 msgid "Custom settings"
 msgstr "自訂磁碟分割"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, fuzzy, c-format
 msgid "Custom & system settings"
 msgstr "自訂磁碟分割"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, fuzzy, c-format
 msgid "Editable"
 msgstr "關閉"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "路徑"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "使用者"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, fuzzy, c-format
 msgid "Group"
 msgstr "群組"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "權限"
@@ -18677,7 +19586,7 @@ msgid ""
 "groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"Drakperm 程式能夠讓使用者檢視以及修改重要檔案的權限，包含擁有者、\n"
+"Drakperm 程式能夠讓使用者檢視以及修改重要檔案的權限, 包含擁有者、\n"
 "群組等資訊。另外您也可以自行編輯創造更多屬於自訂的規則項目。"
 
 #: standalone/drakperm:110
@@ -18723,9 +19632,9 @@ msgid "Delete selected rule"
 msgstr "刪除所選取的規則"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, fuzzy, c-format
 msgid "Edit"
 msgstr "離開"
@@ -18735,47 +19644,65 @@ msgstr "離開"
 msgid "Edit current rule"
 msgstr "編輯目前規則"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "瀏覽"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "user"
+msgstr "滑鼠"
+
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "group"
+msgstr "群組"
+
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "other"
+msgstr "其他"
+
+#: standalone/drakperm:252
 #, fuzzy, c-format
 msgid "Read"
 msgstr "重播"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr ""
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, fuzzy, c-format
 msgid "Write"
 msgstr "寫入 %s"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr ""
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "執行"
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr ""
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, fuzzy, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-Bit"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -18784,52 +19711,52 @@ msgstr ""
 "使用於目錄:\n"
 " 只有該檔案或目錄的擁有者才可以刪除它"
 
-#: 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 "執行時另外具備該擁有者權限"
 
-#: 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 "執行時另外具備該群組權限"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "使用者："
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, fuzzy, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "群組："
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "目前使用者"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
-msgstr "當選取時，擁有者與群組將不被更動"
+msgstr "當選取時, 擁有者與群組將不被更動"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "路徑選擇"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "特性"
@@ -18859,7 +19786,7 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"目前要進行Internet連線分享的設定，這個功能能夠\n"
+"目前要進行Internet連線分享的設定, 這個功能能夠\n"
 "讓其他區域網路內的電腦透過這台主機的頻寬分享\n"
 "連上 Internet。請注意: 您需要另外一張網路卡以便\n"
 "於提供區域網路電腦連線存取分享使用。"
@@ -18932,56 +19859,44 @@ msgstr ""
 #: standalone/drakpxe:215
 #, fuzzy, c-format
 msgid "Location of auto_install.cfg file"
-msgstr "正在製作自動安裝磁片"
+msgstr "正在製作自動安裝軟片"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr ""
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr ""
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "預設"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, fuzzy, c-format
-msgid "ignore"
+msgid "Ignore"
 msgstr "新加坡"
 
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "否"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "是的"
-
-#. -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 "
@@ -19016,69 +19931,67 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"欄位的描述資訊：\n"
+"\n"
+
+#: standalone/draksec:168
 #, fuzzy, c-format
 msgid "(default value: %s)"
 msgstr " (預設：%s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "安全等級:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "安全警示："
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "安全性管理者:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, fuzzy, c-format
 msgid "Basic options"
 msgstr "DrakSec 基本參數選項"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "網路選項"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "系統選項"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "週期性檢查"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
-msgstr "請稍後，設定安全等級中..."
+msgstr "請稍後, 設定安全等級中..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
-msgstr "請稍後，設定安全選項..."
+msgstr "請稍後, 設定安全選項..."
 
 #: standalone/draksound:47
 #, c-format
 msgid "No Sound Card detected!"
 msgstr "偵測不到系統有任何音效裝置！"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -19090,15 +20003,15 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"目前您的系統偵測不到任何音效卡裝置，請確認您的音效卡有安插正確。\n"
+"目前您的系統偵測不到任何音效卡裝置, 請確認您的音效卡有安插正確。\n"
 "\n"
 "\n"
-"另外請連上我們的官方網站查看資料庫，檢視您的音效卡是否已經支援：\n"
+"另外請連上我們的官方網站查看資料庫, 檢視您的音效卡是否已經支援：\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -19110,7 +20023,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"請注意，若是您使用的音效卡是 ISA PnP 類型的話，您需要使用 sndconfig \n"
+"請注意, 若是您使用的音效卡是 ISA PnP 類型的話, 您需要使用 sndconfig \n"
 "這個程式來設定。請在 console 模式輸入執行 \"sndconfig\" 即可。"
 
 #: standalone/draksplash:21
@@ -19120,7 +20033,7 @@ msgid ""
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
 "系統需要安裝上 ImageMagick 套件才能夠進行設定。\n"
-"請點選 \"確定\" 安裝該套件，或者是點選 \"取消\" 放棄安裝"
+"請點選 \"確定\" 安裝該套件, 或者是點選 \"取消\" 放棄安裝"
 
 #: standalone/draksplash:68
 #, c-format
@@ -19234,15 +20147,15 @@ msgstr "在 Console 顯示 logo"
 msgid "Make kernel message quiet by default"
 msgstr "設定開機時不顯示核心訊息資訊"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "注意"
 
-#: 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 "%s 內尚未有任何開機載入畫面"
 
 #: standalone/draksplash:167
@@ -19255,186 +20168,196 @@ msgstr "選擇映像檔案        "
 msgid "saving Bootsplash theme..."
 msgstr "儲存開機載入圖片佈景項目..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "進度巴色彩選擇"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "您需要先選擇映像檔案！"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "產生御覽圖示中..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s 開機進度畫面 (%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 ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, fuzzy, c-format
 msgid "Add an UPS device"
 msgstr "新增項目"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, fuzzy, 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 ""
 "歡迎來到郵件設定工具。\n"
 "\n"
-"在這裡，您能夠設定您的警示通知的方式。\n"
+"在這裡, 您能夠設定您的警示通知的方式。\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 ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, fuzzy, c-format
 msgid "Autodetection"
 msgstr "自動偵測"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "正在偵測中"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "恭喜!!"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, fuzzy, c-format
 msgid "No new UPS devices was found"
 msgstr "找不到列印機！"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, fuzzy, c-format
 msgid "UPS driver configuration"
 msgstr "OKI Windows 列印機設定"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, fuzzy, c-format
 msgid "Please select your UPS model."
 msgstr "請測試滑鼠"
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, fuzzy, c-format
 msgid "Manufacturer / Model:"
 msgstr "列印機廠商,型號"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "名稱:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, fuzzy, c-format
 msgid "The name of your ups"
 msgstr "裝置的廠商名稱"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, fuzzy, c-format
 msgid "Port:"
 msgstr "連接埠"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, fuzzy, c-format
 msgid "The port on which is connected your ups"
 msgstr "請選取您滑鼠連接的序列埠。"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, fuzzy, c-format
 msgid "UPS devices"
 msgstr "Server 程式"
 
-#: 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 "名稱"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, fuzzy, c-format
 msgid "UPS users"
 msgstr "使用者"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, fuzzy, c-format
 msgid "Access Control Lists"
 msgstr "存取網路工具"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr ""
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, fuzzy, c-format
 msgid "Rules"
 msgstr "拒絕"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, fuzzy, c-format
 msgid "Action"
 msgstr "執行"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, fuzzy, c-format
 msgid "Level"
 msgstr "階層"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, fuzzy, c-format
 msgid "ACL name"
 msgstr "LVM 名稱？"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
 #, fuzzy, c-format
 msgid "DrakUPS"
 msgstr "Dvorak (US)"
 
-#: standalone/drakups:307
+#: standalone/drakups:335
 #, fuzzy, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "測試設定值"
@@ -19456,7 +20379,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "目前 Internet 連線分享的設定已經完成了.. 目前已經可用了..\n"
 "您目前打算要做什麼呢？"
@@ -19483,7 +20406,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Internet 連線共享已經設定完成了。目前是處於關閉不使用狀態。\n"
 "\n"
@@ -19544,7 +20467,7 @@ msgstr "移除一模組"
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -19569,13 +20492,13 @@ msgstr "組態設定"
 #: 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
@@ -19590,7 +20513,7 @@ msgstr ""
 #: standalone/drakvpn:325 standalone/drakvpn:685
 #, fuzzy, c-format
 msgid "%s entries"
-msgstr "，第 %s 磁區"
+msgstr ", 第 %s 磁區"
 
 #: standalone/drakvpn:326
 #, c-format
@@ -19598,12 +20521,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
@@ -19646,7 +20569,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"
@@ -19673,7 +20596,7 @@ msgstr "一般模式"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, fuzzy, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "離開"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -19877,7 +20800,7 @@ msgstr "連線名稱"
 
 #: standalone/drakvpn:590
 #, fuzzy, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "無法找到 %s (位於 %s)"
 
 #: standalone/drakvpn:591
@@ -19885,10 +20808,10 @@ msgstr "無法找到 %s (位於 %s)"
 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
@@ -19924,7 +20847,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 ""
@@ -19949,7 +20872,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"
@@ -19977,7 +20900,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"
@@ -20018,23 +20941,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 ""
@@ -20141,7 +21064,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"
@@ -20169,7 +21092,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"
@@ -20194,7 +21117,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"
@@ -20222,7 +21145,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"
@@ -20242,7 +21165,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 ""
 
@@ -20256,11 +21179,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"
@@ -20282,18 +21205,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"
@@ -20333,7 +21256,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]"
@@ -20458,7 +21381,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"
@@ -20467,7 +21390,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"
@@ -20476,7 +21399,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 ""
@@ -20496,9 +21419,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 ""
@@ -20546,7 +21469,7 @@ msgstr "天"
 #: standalone/drakvpn:1138
 #, c-format
 msgid "Flag"
-msgstr ""
+msgstr "旗幟"
 
 #: standalone/drakvpn:1139
 #, fuzzy, c-format
@@ -20594,6 +21517,11 @@ msgid "require"
 msgstr ""
 
 #: standalone/drakvpn:1146
+#, c-format
+msgid "default"
+msgstr "預設"
+
+#: standalone/drakvpn:1146
 #, fuzzy, c-format
 msgid "use"
 msgstr "滑鼠"
@@ -20603,114 +21531,115 @@ msgstr "滑鼠"
 msgid "unique"
 msgstr "Martinique"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "美國 (boradcast)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "美國 (cable)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "美國 (cable-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "加拿大 (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "日本  (broascast)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "日本 (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "中國 (broadcast)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "西歐"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "東歐"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "法國 [SECAM]"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "丹麥"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "阿根廷 Optus cable TV"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr ""
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr ""
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "區域："
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "準備開始掃描電視頻道"
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "正在掃描電視頻道"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "掃描電視頻道發生錯誤"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "祝有美好的一天！"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
-msgstr "完成，您現在可以在 X 下執行 xawtv 程式了！\n"
+msgstr "完成, 您現在可以在 X 下執行 xawtv 程式了！\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "系統偵測不到任何電視卡！"
 
-#: 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-"
@@ -20722,54 +21651,31 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"目前您的系統偵測不到任何電視卡，請確認您的電視卡有安插正確。\n"
+"目前您的系統偵測不到任何電視卡, 請確認您的電視卡有安插正確。\n"
 "\n"
 "\n"
-"另外請連上我們的官方網站查看資料庫，檢視您的電視卡是否已經支援：\n"
+"另外請連上我們的官方網站查看資料庫, 檢視您的電視卡是否已經支援：\n"
 "\n"
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "另外可供選擇的驅動程式"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "可供您的音效卡額外可選擇的驅動程式清單"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr "該裝置目前安插上了多少個實體 bug 裝置 (比方：PCI、USB 等等...)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "取消"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI 通道"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr ""
-
-#: standalone/harddrake2:24
-#, c-format
-msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
-msgstr ""
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "匯流排描述"
@@ -20780,7 +21686,7 @@ msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
 "subdevice PCI/USB ids"
 msgstr ""
-"- PCI 與 USB 裝置：這列出了廠商名稱，裝置名稱與附屬廠商等 PCI/USB IDS 資訊"
+"- PCI 與 USB 裝置：這列出了廠商名稱, 裝置名稱與附屬廠商等 PCI/USB IDS 資訊"
 
 #: standalone/harddrake2:30
 #, c-format
@@ -20789,136 +21695,285 @@ msgid ""
 "- eide devices: the device is either a slave or a master device\n"
 "- scsi devices: the scsi bus and the scsi device ids"
 msgstr ""
-"- PCI 裝置 ：包含 PCI 插曹，介面卡裝置的功能\n"
+"- PCI 裝置 ：包含 PCI 插曹, 介面卡裝置的功能\n"
 "- EIDE 裝置：包含 Master 或者是 Slave 裝置項目\n"
 "- SCSI 裝置：包含 SCSI 匯流排裝置與 SCSI 裝置的 IDS"
 
 #: standalone/harddrake2:33
-#, fuzzy, c-format
-msgid "Cache size"
-msgstr "組塊大小"
+#, c-format
+msgid "Drive capacity"
+msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
+msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 
 #: standalone/harddrake2:34
+#, fuzzy, c-format
+msgid "this field describes the device"
+msgstr "該裝置的欄位描述"
+
+#: standalone/harddrake2:35
 #, c-format
-msgid "Drive capacity"
-msgstr ""
+msgid "Old device file"
+msgstr "舊的裝置檔案"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:36
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr ""
+msgid "old static device name used in dev package"
+msgstr "dev 套件內所使用的舊有裝置名稱"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
-msgid "Coma bug"
+msgid "New devfs device"
+msgstr "新的 devfs 裝置"
+
+#: standalone/harddrake2:38
+#, fuzzy, c-format
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "由何新的 devfs 提供產生的動態新裝置名稱"
+
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
+#, c-format
+msgid "Module"
+msgstr "型號"
+
+#: standalone/harddrake2:41
+#, c-format
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "負責處理此裝置的 GNU/Linux 核心模組"
+
+#: standalone/harddrake2:42
+#, fuzzy, c-format
+msgid "Extended partitions"
+msgstr "建立新的分割區"
+
+#: standalone/harddrake2:42
+#, fuzzy, c-format
+msgid "the number of extended partitions"
+msgstr "   進度Bar的色彩                                 "
+
+#: standalone/harddrake2:43
+#, fuzzy, c-format
+msgid "Geometry"
+msgstr "重試"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:44
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgid "Disk controller"
 msgstr ""
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:44
 #, c-format
-msgid "Cpuid family"
+msgid "the disk controller on the host side"
 msgstr ""
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:45
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
+msgid "class of hardware device"
+msgstr "硬體裝置類別"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "型號"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "硬碟型號"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "網路列印機連接埠"
+
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "Primary partitions"
+msgstr "硬碟格式化"
+
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "the number of the primary partitions"
+msgstr "   進度Bar的色彩                                 "
+
+#: standalone/harddrake2:49
+#, c-format
+msgid "the vendor name of the device"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
 msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:50
 #, fuzzy, c-format
-msgid "Cpuid level"
-msgstr "安全等級"
+msgid "the PCI bus on which the device is plugged"
+msgstr "該裝置目前安插上了多少個實體 bug 裝置 (比方：PCI、USB 等等...)"
+
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device #"
+msgstr "Server 程式"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device number"
+msgstr "一個數字"
+
+#: standalone/harddrake2:52
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
+msgid "PCI function #"
 msgstr ""
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "連線名稱"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "廠商"
+
+#: standalone/harddrake2:53
 #, c-format
-msgid "Frequency (MHz)"
+msgid "this is the standard numerical identifier of the vendor"
 msgstr ""
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "Device ID"
+msgstr "裝置： "
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:55
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
+msgid "Sub vendor ID"
 msgstr ""
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:56
 #, fuzzy, c-format
-msgid "this field describes the device"
-msgstr "該裝置的欄位描述"
+msgid "Sub device ID"
+msgstr "Server 程式"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Device USB ID"
+msgstr "裝置： "
+
+#: standalone/harddrake2:57
 #, c-format
-msgid "Old device file"
-msgstr "舊的裝置檔案"
+msgid ".."
+msgstr ""
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:61
 #, c-format
-msgid "old static device name used in dev package"
-msgstr "dev 套件內所使用的舊有裝置名稱"
+msgid "Bogomips"
+msgstr ""
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:61
 #, c-format
-msgid "New devfs device"
-msgstr "新的 devfs 裝置"
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:62
 #, fuzzy, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "由何新的 devfs 提供產生的動態新裝置名稱"
+msgid "Cache size"
+msgstr "組塊大小"
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
+#: standalone/harddrake2:62
 #, c-format
-msgid "Module"
-msgstr "型號"
+msgid "size of the (second level) cpu cache"
+msgstr ""
 
-#: standalone/harddrake2:48
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "負責處理此裝置的 GNU/Linux 核心模組"
+msgid "Coma bug"
+msgstr ""
 
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "建立新的分割區"
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr ""
+
+#: standalone/harddrake2:67
 #, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "   進度Bar的色彩                                 "
+msgid "Cpuid level"
+msgstr "安全等級"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+
+#: standalone/harddrake2:69
 #, c-format
 msgid "Flags"
 msgstr ""
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr ""
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -20926,545 +21981,611 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:75
+#, c-format
+msgid "Halt bug"
+msgstr ""
+
+#: standalone/harddrake2:76
+#, c-format
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr ""
+
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr ""
+
+#: standalone/harddrake2:79
 #, fuzzy, c-format
-msgid "Geometry"
-msgstr "重試"
+msgid "Model name"
+msgstr "模組名稱"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:79
+#, fuzzy, c-format
+msgid "official vendor name of the cpu"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:80
+#, fuzzy, c-format
+msgid "the name of the CPU"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:81
 #, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
+msgid "Processor ID"
 msgstr ""
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:81
+#, fuzzy, c-format
+msgid "the number of the processor"
+msgstr "   進度Bar的色彩                                 "
+
+#: standalone/harddrake2:82
 #, c-format
-msgid "Halt bug"
+msgid "Model stepping"
+msgstr "模型步"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
 msgstr ""
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:83
+#, fuzzy, c-format
+msgid "the vendor name of the processor"
+msgstr "裝置的廠商名稱"
+
+#: standalone/harddrake2:84
+#, fuzzy, c-format
+msgid "Write protection"
+msgstr "列印機自動偵測"
+
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
+"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 ""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "Floppy format"
 msgstr "格式化"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
 #, c-format
-msgid "sub generation of the cpu"
-msgstr ""
+msgid "Channel"
+msgstr "取消"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
 #, c-format
-msgid "class of hardware device"
-msgstr "硬體裝置類別"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI 通道"
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
+#, fuzzy, c-format
+msgid "Disk identifier"
+msgstr "列印機"
+
+#: standalone/harddrake2:93
 #, c-format
-msgid "Model"
-msgstr "型號"
+msgid "usually the disk serial number"
+msgstr ""
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:94
+#, fuzzy, c-format
+msgid "Logical unit number"
+msgstr "本機密碼檔"
+
+#: standalone/harddrake2:94
 #, c-format
-msgid "hard disk model"
-msgstr "硬碟型號"
+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
+#, fuzzy, c-format
+msgid "Device file"
+msgstr "舊的裝置檔案"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:99
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr ""
+
+#: standalone/harddrake2:100
 #, fuzzy, c-format
-msgid "Model name"
-msgstr "模組名稱"
+msgid "whether the wheel is emulated or not"
+msgstr "按鍵模擬"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:101
 #, fuzzy, c-format
-msgid "official vendor name of the cpu"
+msgid "the type of the mouse"
+msgstr "請測試滑鼠"
+
+#: standalone/harddrake2:102
+#, fuzzy, c-format
+msgid "the name of the mouse"
 msgstr "裝置的廠商名稱"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:103
 #, c-format
 msgid "Number of buttons"
 msgstr "兩個按鍵"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:103
 #, fuzzy, c-format
 msgid "the number of buttons the mouse has"
 msgstr "   進度Bar的色彩                                 "
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:104
 #, fuzzy, c-format
-msgid "the name of the CPU"
-msgstr "裝置的廠商名稱"
+msgid "the type of bus on which the mouse is connected"
+msgstr "請選取您滑鼠連接的序列埠。"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:105
 #, c-format
-msgid "network printer port"
-msgstr "網路列印機連接埠"
+msgid "Mouse protocol used by X11"
+msgstr ""
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:105
 #, c-format
-msgid "Processor ID"
+msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
 #, fuzzy, c-format
-msgid "the number of the processor"
-msgstr "   進度Bar的色彩                                 "
+msgid "Identification"
+msgstr "匯流排描述"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:113 standalone/harddrake2:129
 #, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "硬碟格式化"
+msgid "Connection"
+msgstr "連線名稱"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:122
 #, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "   進度Bar的色彩                                 "
-
-#: standalone/harddrake2:71
-#, c-format
-msgid "Model stepping"
-msgstr "模型步"
-
-#: standalone/harddrake2:71
-#, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr ""
+msgid "Performances"
+msgstr "偏好"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:123
 #, fuzzy, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "請選取您滑鼠連接的序列埠。"
+msgid "Bugs"
+msgstr "匯流排"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:124
 #, c-format
-msgid "the vendor name of the device"
-msgstr "裝置的廠商名稱"
-
-#: standalone/harddrake2:74
-#, fuzzy, c-format
-msgid "the vendor name of the processor"
-msgstr "裝置的廠商名稱"
+msgid "FPU"
+msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:132
 #, fuzzy, c-format
-msgid "Write protection"
-msgstr "列印機自動偵測"
+msgid "Partitions"
+msgstr "分割區 %s"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:137
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
+msgid "Features"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: 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 "/說明 (_H)"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, fuzzy, c-format
 msgid "/Autodetect _printers"
 msgstr "自動偵測"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, fuzzy, c-format
 msgid "/Autodetect _modems"
 msgstr "自動偵測"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, fuzzy, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "自動偵測"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/結束 (_Q)"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, fuzzy, c-format
 msgid "/_Fields description"
 msgstr "描述"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Harddrake 說明"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"欄位的描述資訊：\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
 msgstr ""
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/報告錯誤 (_R)"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/關於 (_A)"
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "關於 Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
-#, fuzzy, c-format
+#: 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 ""
-"這是 HardDrake 程式，Mandrake 所發展的硬體檢視設定工具。\n"
-"版本："
+"這是 HardDrake 程式, Mandrakelinux 所發展的硬體檢視設定工具。\n"
+"<span foreground=\"royalblue3\">版本：</span> %s\n"
+"<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud &lt;"
+"tvignaud@mandrakesoft.com&gt;\n"
+"\n"
 
-#: standalone/harddrake2:147
-#, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 版本 %s"
+#: standalone/harddrake2:218
+#, fuzzy, c-format
+msgid "Harddrake2"
+msgstr "HardDrake 硬體偵測設定"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "已偵測的硬體"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "設定模組"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "執行設定程式"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, fuzzy, c-format
 msgid "unknown"
 msgstr "未知的型號"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "未知的"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, fuzzy, c-format
+msgid "Misc"
+msgstr "Msec 安全設定偵測"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr ""
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr ""
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, fuzzy, c-format
 msgid "burner"
 msgstr "列印機"
 
-#: 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 "請選取鍵盤排列的格式是那一種。"
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "您希望 BackSpace 後退鍵能夠在 console 下回應 Delete 按鍵的功能嗎？"
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, fuzzy, c-format
+msgid "LocaleDrake"
+msgstr "本機密碼檔"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
-msgstr "變更已經完成，不過您需要重新登入才能夠生效"
+msgstr "變更已經完成, 不過您需要重新登入才能夠生效"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrake Tools Logs"
+msgid "Mandrakelinux Tools Logs"
 msgstr "Mandrake 工具解析"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, fuzzy, c-format
 msgid "Logdrake"
 msgstr "logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "僅顯示所選取日期"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
-msgstr "/檔案/新增 (_N)"
+msgstr "/檔案 (F)/新增 (_N)"
 
-#: 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 "/檔案/開啟 (_O)"
+msgstr "/檔案 (F)/開啟 (_O)"
 
-#: 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 "/檔案/儲存 (_S)"
+msgstr "/檔案 (F)/儲存 (_S)"
 
-#: 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 "/檔案/另存新檔 (_A)"
+msgstr "/檔案 (F)/另存新檔 (_A)"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
-msgstr "/檔案/-"
+msgstr "/檔案 (F)/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
-msgstr "/選項/測試"
+msgstr "/選項 (O)/測試"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
-msgstr "/說明/關於 (_A)"
+msgstr "/說明 (H)/關於 (_A)"
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: 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 "尋找"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "監察記錄檔的工具"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "設定"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "相配的"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "但是不相配"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "選取檔案"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "行事曆"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "檔案的內容"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "郵件警示"
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
-msgstr "請稍候，正在解析檔案：%s"
+msgstr "請稍候, 正在解析檔案：%s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWW 伺服器"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "網域名稱解析器"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP 伺服器"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix 郵件伺服器"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Samba 伺服器"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "NIS 伺服主機"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin 服務"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd 服務"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, fuzzy, c-format
 msgid "Configure the mail alert system"
 msgstr "變更列印系統"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "郵件警示通知組態設定"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -21473,68 +22594,68 @@ msgid ""
 msgstr ""
 "歡迎來到郵件設定工具。\n"
 "\n"
-"在這裡，您能夠設定您的警示通知的方式。\n"
+"在這裡, 您能夠設定您的警示通知的方式。\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, fuzzy, c-format
 msgid "What do you want to do?"
 msgstr "您要把這個裝置 %s 掛載在那裡 ?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, fuzzy, c-format
 msgid "Services settings"
 msgstr "服務設定"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, fuzzy, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
-msgstr "若是您所選取的服務項目若是沒執行的話，您將會收到警示通知"
+msgstr "若是您所選取的服務項目若是沒執行的話, 您將會收到警示通知"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, fuzzy, 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 "當系統負載超過該數值時，您將會收到警示通知"
+msgstr "當系統負載超過該數值時, 您將會收到警示通知"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr ""
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, fuzzy, c-format
 msgid "Alert configuration"
 msgstr "警示設定"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "請於下方輸入你的 e-mail"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "另存新檔..."
@@ -21559,470 +22680,496 @@ msgstr "Mouse Systems"
 msgid "Please test your mouse:"
 msgstr "請測試滑鼠"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, fuzzy, c-format
+msgid "Network is up on interface %s"
+msgstr "網路介面"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "目前網路功能尚未設定"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "連線"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "切斷連線"
+
+#: standalone/net_applet:55
+#, fuzzy, c-format
+msgid "Monitor Network"
+msgstr "使用網路回存檔案"
+
+#: standalone/net_applet:56
+#, fuzzy, c-format
+msgid "Configure Network"
+msgstr "設定網路連線"
+
+#. -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 "更新"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr ""
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, fuzzy, c-format
 msgid "Network Monitoring"
 msgstr "網路設定"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr ""
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, fuzzy, c-format
 msgid ""
 "Sending\n"
 "speed:"
 msgstr "正在送出檔案..."
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, fuzzy, c-format
 msgid ""
 "Receiving\n"
 "speed:"
 msgstr "正在送出檔案..."
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, fuzzy, c-format
 msgid ""
 "Connection\n"
 "time: "
 msgstr "連線項目： "
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, fuzzy, c-format
 msgid "Wait please, testing your connection..."
 msgstr "正在測試網路連線"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, fuzzy, c-format
 msgid "Disconnecting from Internet "
 msgstr "連線到 Internet"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, fuzzy, c-format
 msgid "Connecting to Internet "
 msgstr "連線到 Internet"
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, fuzzy, c-format
 msgid "Disconnection from Internet failed."
 msgstr "連線到 Internet"
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, fuzzy, c-format
 msgid "Disconnection from Internet complete."
 msgstr "連線到 Internet"
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, fuzzy, c-format
 msgid "Connection complete."
 msgstr "連線速度"
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, fuzzy, c-format
 msgid "Color configuration"
 msgstr "警示設定"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr ""
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr ""
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr ""
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, fuzzy, c-format
 msgid "Local measure"
 msgstr "本機密碼檔"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr ""
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr ""
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, fuzzy, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
-msgstr "警告，偵測到您系統已經有現成的網路連線，也許正在存取您的網路服務"
-
-#: standalone/net_monitor:421
-#, fuzzy, c-format
-msgid "Disconnect %s"
-msgstr "切斷連線"
+msgstr "警告, 偵測到您系統已經有現成的網路連線, 也許正在存取您的網路服務"
 
-#: standalone/net_monitor:421
-#, fuzzy, c-format
-msgid "Connect %s"
-msgstr "連線"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, fuzzy, c-format
 msgid "No internet connection configured"
 msgstr "Internet 連線設定"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, fuzzy, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "修改列印機設定"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, fuzzy, c-format
 msgid "Reading data of installed printers..."
 msgstr "可用的列印機"
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, fuzzy, c-format
 msgid "%s Printer Management Tool"
 msgstr "新列印機名稱"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
-#, fuzzy, c-format
+#: 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 "執行"
+msgstr "/執行 (_A)"
 
-#: standalone/printerdrake:143
-#, fuzzy, c-format
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/新增印表機 (_A)"
+
+#: standalone/printerdrake:149
+#, c-format
 msgid "/Set as _Default"
-msgstr " (預設開機)"
+msgstr "/指定為預設值 (_D)"
 
-#: standalone/printerdrake:144
-#, fuzzy, c-format
+#: standalone/printerdrake:150
+#, c-format
 msgid "/_Edit"
-msgstr "編輯"
+msgstr "/編輯 (_E)"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
-msgstr "刪除"
+msgstr "/刪除 (_D)"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
-msgstr "專家模式"
+msgstr "/專家模式 (_E)"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/更新(_R)"
 
-#: standalone/printerdrake:154
-#, fuzzy, c-format
-msgid "/_Add Printer"
-msgstr "列印機"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, fuzzy, c-format
 msgid "/_Configure CUPS"
 msgstr "設定 X 環境"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "尋找:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "套用過濾器"
 
-#: 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 "列印機名稱"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, fuzzy, c-format
 msgid "Connection Type"
 msgstr "連結類型："
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, fuzzy, c-format
 msgid "Server Name"
 msgstr "伺服器名稱："
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, fuzzy, c-format
 msgid "Add Printer"
 msgstr "列印機"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, fuzzy, c-format
 msgid "Add a new printer to the system"
 msgstr "新增群組"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, fuzzy, c-format
 msgid "Set as default"
 msgstr "預設"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, fuzzy, c-format
 msgid "Set selected printer as the default printer"
 msgstr "使用這台列印機為預設列印機"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, fuzzy, c-format
 msgid "Edit selected printer"
 msgstr "偵測到 %s "
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, fuzzy, c-format
 msgid "Delete selected printer"
 msgstr "刪除所選取的規則"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "更新"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, fuzzy, c-format
 msgid "Refresh the list"
 msgstr "使用者列表"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, fuzzy, c-format
 msgid "Configure CUPS"
 msgstr "設定 X 環境"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, fuzzy, c-format
 msgid "Configure CUPS printing system"
 msgstr "變更列印系統"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "開啟"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, fuzzy, c-format
+msgid "Disabled"
+msgstr "關閉"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "作者: "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, fuzzy, c-format
 msgid "Printer Management \n"
 msgstr "新列印機名稱"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, fuzzy, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
 "\n"
 "Do you want to install the SANE packages?"
-msgstr "這個 %s 套件需要安裝上，您要安裝該套件嗎？"
+msgstr "這個 %s 套件需要安裝上, 您要安裝該套件嗎？"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, fuzzy, c-format
 msgid "Aborting Scannerdrake."
 msgstr "選取您的掃描器"
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, fuzzy, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "可用的列印機"
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, fuzzy, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "可用的列印機"
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, fuzzy, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "Mandrakelinux 目前的版本還不支援 %s"
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, fuzzy, c-format
 msgid "%s found on %s, configure it automatically?"
-msgstr "找到了 %s 裝置 (於 %s)，現在要設定嗎？"
+msgstr "找到了 %s 裝置 (於 %s), 現在要設定嗎？"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr "在掃描器資料庫內找不到此型號 - %s，您要手動設定嗎？"
+msgstr "在掃描器資料庫內找不到此型號 - %s, 您要手動設定嗎？"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, fuzzy, c-format
 msgid "Select a scanner model"
 msgstr "選取您的掃描器"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr ""
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, fuzzy, c-format
 msgid "Detected model: %s"
 msgstr "偵測到的型號：%s %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, fuzzy, c-format
 msgid "Port: %s"
 msgstr "連接埠"
 
-#: standalone/scannerdrake:161
-#, fuzzy, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "Mandrakelinux 目前的版本還不支援 %s"
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "選擇檔案"
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, fuzzy, c-format
 msgid "Select firmware file for the %s"
 msgstr "選擇檔案"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, fuzzy, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "選擇檔案"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, fuzzy, c-format
 msgid "The %s is unsupported"
 msgstr "目前還不支援這款 %s 掃描器"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, fuzzy, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -22031,35 +23178,35 @@ msgstr ""
 "這台 %s 掃描器需要先執行 printerdrake 程式進行設定。\n"
 "您可以透過 Mandrake 控制台內的硬體項目內執行該程式。"
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, fuzzy, c-format
 msgid "Auto-detect available ports"
 msgstr "自動偵測"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, fuzzy, c-format
 msgid "Please select the device where your %s is attached"
 msgstr ""
 "ScannerDrake 程式無法偵測您的 %s 掃描器。\n"
 "請選擇您目前掃描器安裝的裝置項目"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "選取裝置"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, fuzzy, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "可用的列印機"
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, fuzzy, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -22067,10 +23214,10 @@ msgid ""
 "Graphics in the applications menu."
 msgstr ""
 "您的 %s 掃描器已經設定完成了。\n"
-"您可以執行執行 ``XSane'' 程式進行文件掃描的工作。或者您也可以在程式集內，於多"
+"您可以執行執行 ``XSane'' 程式進行文件掃描的工作。或者您也可以在程式集內, 於多"
 "媒體/圖形項目內找到該程式。"
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, fuzzy, c-format
 msgid ""
 "The following scanners\n"
@@ -22081,7 +23228,7 @@ msgstr ""
 "\n"
 "目前有一台未知類型的列印機安裝在您本機上。"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, fuzzy, c-format
 msgid ""
 "The following scanner\n"
@@ -22092,170 +23239,170 @@ msgstr ""
 "\n"
 "目前有一台未知類型的列印機安裝在您本機上。"
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, fuzzy, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "您的系統偵測不到有任何本機列印機的安裝"
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, fuzzy, c-format
 msgid "Search for new scanners"
 msgstr "可用的列印機"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, fuzzy, c-format
 msgid "Add a scanner manually"
 msgstr "手動選取使用者"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "選擇檔案"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, fuzzy, c-format
 msgid "Scanner sharing"
 msgstr "檔案分享"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, fuzzy, c-format
 msgid "All remote machines"
 msgstr "(位於這個機器上)"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, fuzzy, c-format
 msgid "This machine"
 msgstr "(位於這個機器上)"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, fuzzy, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "檔案分享"
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr ""
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, fuzzy, c-format
 msgid "Sharing of local scanners"
 msgstr "可用的列印機"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, fuzzy, c-format
 msgid "Add host"
 msgstr "新增使用者"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "編輯選擇的主機"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, fuzzy, c-format
 msgid "Remove selected host"
 msgstr "移除選取項目"
 
-#: 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 ""
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "請輸入主機名稱或是 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 ""
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, fuzzy, c-format
 msgid "Usage of remote scanners"
 msgstr "使用未用到的空間"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, fuzzy, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
-msgstr "這個 %s 套件需要安裝上，您要安裝該套件嗎？"
+msgstr "這個 %s 套件需要安裝上, 您要安裝該套件嗎？"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "位於 \"%s\" 的硬體類別項目已經移除：\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
 #, fuzzy, c-format
 msgid "Some devices were added: %s\n"
 msgstr "一些裝置項目已經新增了：\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, fuzzy, c-format
 msgid "Hardware probing in progress"
 msgstr "正在偵測中"
@@ -22267,7 +23414,7 @@ msgstr ""
 
 #: standalone/service_harddrake_confirm:8
 #, fuzzy, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "您想要測試您的設定值嗎？"
 
 #: steps.pm:14
@@ -22360,22 +23507,22 @@ msgstr "安裝升級"
 msgid "Exit install"
 msgstr "離開安裝程式"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "這樣子正確嗎？"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "展開樹狀結構"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "縮疊樹狀結構"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "切換是否依照群組來加以排序"
@@ -22393,277 +23540,3 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Installation failed"
 msgstr "佈景安裝失敗"
-
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "辦公軟體平台"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"辦公軟體： 文書處理軟體 (kword、abiword), 試算表 (kspread、gnumeric), pdf 閱"
-"讀程式等等"
-
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "遊戲平台"
-
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "娛樂的一些程式： 紙牌、益智、動作、策略 等"
-
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "多媒體平台"
-
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "音效以及影像撥放編輯程式"
-
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet 平台"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"包含讀信、寫信以及閱讀網路論壇的工具 (pine、mutt、tin ..) 與及 web 瀏覽工具"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "用戶端網路環境"
-
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "包含 ssh 等其他不同通訊協定的用戶端程式"
-
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "組態設定"
-
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "讓您方便設定您系統的工具"
-
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Console 工具"
-
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "編輯器, shell, 檔案工具, 終端機"
-
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE 環境"
-
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE 圖形桌面介面環境，包含許多好用的圖型介面工具程式"
-
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Gnome 環境"
-
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
-
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "其他圖型桌面軟體"
-
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, 等等管理程式"
-
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++ 發展環境，包含編譯器、程式庫與及一些引入檔案"
-
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "文件檔案"
-
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux 系統與一些免費軟體的書籍、HOWTO 文件"
-
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
-
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "LSB 的支援，包含第三類協力廠商軟體支援"
-
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
-
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache、ProFTPD"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Mail"
-msgstr "Mali"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Postfix mail server"
-msgstr "Postfix 郵件伺服器"
-
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "資料庫軟體"
-
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL、MySQL 資料庫"
-
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "防火牆/路由器"
-
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet 閘道器"
-
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "網路伺服器"
-
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS server、SMB server、Proxy server、Ssh server"
-
-#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr ""
-"包含讀信、寫信以及閱讀網路論壇的工具 (pine、mutt、tin ..) 與及 web 瀏覽工具"
-
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr "您能夠分享出 NFS 或者是 Samba 資源。您打算用那個"
-
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr "您能夠分享出 NFS 或者是 SMB 資源。您打算用那個"
-
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr "你必須要是 root 才可讀取設定檔. \n"
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "您的顯示卡有支援 3D 加速功能，但是只能夠配合 XFree %s 才能夠發揮作用。\n"
-#~ "您的顯示卡配合 XFree %s 在 2D 顯示上會有比較好的效能。"
-
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "您的顯示卡搭配 XFree %s 才能夠啟用 3D 硬體加速功能，但是請注意，\n"
-#~ "這是實驗性質的支援項目，而且上可能會有不預期的情況。您的顯示卡\n"
-#~ "搭配 XFree %s 在 2D 顯示上的支援度應該會比較良好。"
-
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac (顯示卡驅動程式的安裝)"
-
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "4 億色 (32 位元)"
-
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "XFree86 伺服程式： %s\n"
-
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "下面清單是可供選擇的鍵盤列表"
-
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "請在 %s 磁碟機內插入一張可開機磁碟片"
-
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTV 程式並未安裝！"
-
-#~ msgid "Provider dns 1 (optional)"
-#~ msgstr "ISP 第一台 dns (可不用輸入)"
-
-#~ msgid "Provider dns 2 (optional)"
-#~ msgstr "ISP 第二台 dns (可不用輸入)"
-
-#~ msgid "Ethernet Card"
-#~ msgstr "Etnernet 介面卡"
-
-#~ msgid "DHCP Client"
-#~ msgstr "DHCP 用戶端"
-
-#~ msgid ""
-#~ "Change\n"
-#~ "Restore Path"
-#~ msgstr ""
-#~ "變更\n"
-#~ "回存路徑"
-
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "您的 ISDN 連線種類為何 ?"
-
-#~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
-#~ "select a PCI card on the next screen."
-#~ msgstr ""
-#~ "偵測到 ISDN PCI 卡，但是不清楚是那個類型。請在下一個螢幕選擇這張卡的類型。"
-
-#~ msgid "No ISDN PCI card found. Please select one on the next screen."
-#~ msgstr "找不到 ISDN PCI 介面卡，請在下一個螢幕手動選擇一張。"
-
-#~ msgid "Windows (FAT32)"
-#~ msgstr "Windows (FAT32)"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "科學計算平台"
-
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS 服務"
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "DNS 與 NIS 伺服器"
-
-#~ msgid "Please select media for backup..."
-#~ msgstr "請選取要備份使用的裝置..."
-
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "設定遠端列印機"
-
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome 環境"
-
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "執行 \"%s\" 中 ..."
-
-#~ msgid "On Hard Drive"
-#~ msgstr "位於硬碟"
-
-#~ msgid "Messages"
-#~ msgstr "訊息"
-
-#~ msgid "Syslog"
-#~ msgstr "Syslog (系統記錄)"
-
-#~ msgid "Compact"
-#~ msgstr "緊密模式"