updated pot file

3 files changed, 911 insertions, 719 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 1d8a3c10c..5ef9af254 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -862,6 +862,16 @@ msgstr ""
 
 #: ../../common.pm:1
 #, c-format
+msgid "consolehelper missing"
+msgstr ""
+
+#: ../../common.pm:1
+#, c-format
+msgid "kdesu missing"
+msgstr ""
+
+#: ../../common.pm:1
+#, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
@@ -2123,6 +2133,16 @@ msgid ""
 ""
 msgstr ""
 
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#, c-format
+msgid "No"
+msgstr ""
+
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1
+#, c-format
+msgid "Yes"
+msgstr ""
+
 #: ../../install_any.pm:1
 #, c-format
 msgid ""
@@ -2180,11 +2200,6 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "You don't have enough free space on your Windows partition"
-msgstr ""
-
-#: ../../install_interactive.pm:1
-#, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
@@ -2222,7 +2237,7 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "There is no FAT partition to resize or to use as loopback (or not enough space left)"
+msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr ""
 
 #: ../../install_interactive.pm:1
@@ -2232,6 +2247,16 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
+msgid "Resizing Windows partition"
+msgstr ""
+
+#: ../../install_interactive.pm:1 ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Resizing"
+msgstr ""
+
+#: ../../install_interactive.pm:1
+#, c-format
 msgid "partition %s"
 msgstr ""
 
@@ -2260,29 +2285,29 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid ""
-"The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+msgid "Computing the size of the Windows partition"
 msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "Resizing Windows partition"
+msgid ""
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
 
-#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Resizing"
+msgid "Which partition do you want to resize?"
 msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "Which partition do you want to resize?"
+msgid "Use the free space on the Windows partition"
 msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "Use the free space on the Windows partition"
+msgid "There is no FAT partition to use as loopback (or not enough space left)"
 msgstr ""
 
 #: ../../install_interactive.pm:1
@@ -2937,7 +2962,7 @@ msgstr ""
 msgid "Bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Printer"
 msgstr ""
@@ -2952,7 +2977,7 @@ msgstr ""
 msgid "Keyboard"
 msgstr ""
 
-#: ../../install_steps_interactive.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
 #, c-format
 msgid "Mouse"
 msgstr ""
@@ -3395,26 +3420,6 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1
-#, c-format
-msgid "No"
-msgstr ""
-
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1 ../../standalone/drakgw:1
-#, c-format
-msgid "Yes"
-msgstr ""
-
-#: ../../interactive.pm:1 ../../interactive.pm:1
-#, c-format
-msgid "consolehelper missing"
-msgstr ""
-
-#: ../../interactive.pm:1
-#, c-format
-msgid "kdesu missing"
-msgstr ""
-
 #: ../../keyboard.pm:1
 #, c-format
 msgid ""
@@ -4622,7 +4627,7 @@ msgid ""
 "--config-info         : explain configuration file options (for non-X users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
-"--version             : show version name.\n"
+"--version             : show version number.\n"
 ""
 msgstr ""
 
@@ -5288,8 +5293,7 @@ msgstr ""
 #: ../../diskdrake/hd_gtk.pm:1
 #, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
+"You have one big MicroSoft Windows partition.\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
@@ -6076,6 +6080,121 @@ msgstr ""
 msgid "cpu # "
 msgstr ""
 
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SMBus controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "USB controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SCSI controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "(E)IDE/ATA controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Joystick"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Scanner"
+msgstr ""
+
+#: ../../harddrake/data.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Unknown/Others"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Bridges and system controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Modem"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Ethernetcard"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Processors"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Webcam"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Soundcard"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Other MultiMedia devices"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Tvcard"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Videocard"
+msgstr ""
+
+#: ../../harddrake/data.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Tape"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "DVD-ROM"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CD/DVD burners"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CDROM"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Disk"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Zip"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Floppy"
+msgstr ""
+
 #: ../../harddrake/sound.pm:1
 #, c-format
 msgid "Let me pick any driver"
@@ -6202,7 +6321,7 @@ msgstr ""
 msgid "Switching between ALSA and OSS help"
 msgstr ""
 
-#: ../../harddrake/sound.pm:1 ../../standalone/drakTermServ:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbug:1 ../../standalone/drakfont:1
+#: ../../harddrake/sound.pm:1 ../../standalone/drakTermServ:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbackup:1 ../../standalone/drakbug:1
 #, c-format
 msgid "Help"
 msgstr ""
@@ -6615,6 +6734,11 @@ msgstr ""
 msgid "Web Server"
 msgstr ""
 
+#: ../../network/ethernet.pm:1
+#, c-format
+msgid "Zeroconf Host name"
+msgstr ""
+
 #: ../../network/ethernet.pm:1 ../../network/network.pm:1
 #, c-format
 msgid "Host name"
@@ -6644,7 +6768,7 @@ msgstr ""
 msgid "Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 
-#: ../../network/ethernet.pm:1 ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
 #, c-format
 msgid "Choose the network interface"
 msgstr ""
@@ -7563,6 +7687,11 @@ msgstr ""
 msgid ", multi-function device on parallel port \\#%s"
 msgstr ""
 
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", USB printer"
+msgstr ""
+
 #: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid ", USB printer \\#%s"
@@ -7573,7 +7702,7 @@ msgstr ""
 msgid " on parallel port \\#%s"
 msgstr ""
 
-#: ../../printer/main.pm:1
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Local Printers"
 msgstr ""
@@ -7628,7 +7757,7 @@ msgstr ""
 msgid "Configuring applications..."
 msgstr ""
 
-#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/printerdrake:1
+#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/printerdrake:1
 #, c-format
 msgid "Printerdrake"
 msgstr ""
@@ -7785,11 +7914,6 @@ msgstr ""
 msgid "Add a new printer"
 msgstr ""
 
-#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Reading printer data..."
-msgstr ""
-
 #: ../../printer/printerdrake.pm:1 ../../standalone/drakconnect:1
 #, c-format
 msgid "Normal Mode"
@@ -7852,9 +7976,19 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Failed to configure printer \"%s\"!"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr ""
 
+#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Reading printer data..."
+msgstr ""
+
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
@@ -8733,32 +8867,57 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Here is a list of all auto-detected printers. Please choose the printer you want to set up. 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\"."
+msgid "Please choose the printer to which the print jobs should go."
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "The following printer was auto-detected. 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\"."
+msgid "Please choose the printer you want to set up. 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 ""
 
-#: ../../printer/printerdrake.pm:1
+#: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Here is a list of all auto-detected printers. Please choose the printer you want to set up or enter a device name/file name in the input line"
+msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "The following printer was auto-detected, if it is not the one you want to configure, enter a device name/file name in the input line"
+msgid "There is currently no alternative possibiliy"
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Available printers"
+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 ""
 
 #: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Local Printer"
+msgid "The following printer was auto-detected. "
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Please choose the printer to which the print jobs should go or enter a device name/file name in the input line"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Please choose the printer you want to set up or enter a device name/file name in the input line"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Alternatively, you can specify a device name/file name in the input line"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "If it is not the one you want to configure, enter a device name/file name in the input line"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Available printers"
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
@@ -8776,6 +8935,11 @@ msgstr ""
 msgid "No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Local Printer"
+msgstr ""
+
 #: ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "USB printer \\#%s"
@@ -8893,6 +9057,11 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Searching for new printers..."
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid "NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed."
 msgstr ""
 
@@ -10013,7 +10182,7 @@ msgid ""
 "  /var/lib/drakbackup directory\n"
 "\n"
 "  Configuration file:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 "\n"
 "Restore Step:\n"
 "  \n"
@@ -10891,11 +11060,6 @@ msgstr ""
 
 #: ../../standalone/drakbackup:1
 #, c-format
-msgid "Tape"
-msgstr ""
-
-#: ../../standalone/drakbackup:1
-#, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
@@ -11957,60 +12121,10 @@ msgstr ""
 #: ../../standalone/drakfont:1
 #, c-format
 msgid ""
-"drakfont Future Overview\n"
-"        - Fonts import:\n"
-"                pfb ( Adobe Type 1 binary )\n"
-"                pfa ( Adobe Type 1 ASCII )\n"
-"                ttf ( True-Type  )\n"
-"                pcf.gz\n"
-"                Speedo\n"
-"                and Bitmap (PCF, BDF, and SNF)\n"
-"        - Features\n"
-"                - Install fonts from any directory\n"
-"                - Get windows fonts on any vfat partitions\n"
-"                - Get fonts on any partitions.\n"
-"                - UN-installation of any fonts (even if not installed through drakfont)\n"
-"        - Support\n"
-"              - Xfs\n"
-"              - ghostscript & printer\n"
-"              - Staroffice & printer\n"
-"              - abiword\n"
-"\t      - netscape\n"
-"              - Koffice, Gnumeric, ... studying\n"
-"              - all fonts supported by printer\n"
-"              - anti-aliases by RENDER in Xfree86 .... \n"
-"\t\t\t\tsupported by KDE.\n"
-"\t\t\t\twill be supported by gnome 1.2.\n"
-"Visual Interface:\n"
-"        Window interface:\n"
-"          - Fontselectiondialog widget\n"
-"          - Command buttons under Fontselectiondialog (like the actual frontend).\n"
-"        Commands buttons:\n"
-"          - import from windows partition.\n"
-"                import from all fat32 partitions and look for winnt/windows/font\n"
-"                and import all (delete doubles) but don't import if they already exist.\n"
-"          - import from directory\n"
-"                look to see if each font exists and do not delete the original.\n"
-"                (replace all, no, none)\n"
-"                expert options:\n"
-"                        specify the directory, and look to see if it exists before\n"
-"                        if it exists ask: (replace all, no, none)\n"
-"          - uninstall with list per font type\n"
-"        Expert additional switch\n"
-"          - option support:   ghostscript, Staroffice, etc...\n"
-"                check-button. (by default all check)\n"
-"          - Printer Application Fonts Support...\n"
-"\n"
-"\n"
-""
-msgstr ""
-
-#: ../../standalone/drakfont:1
-#, c-format
-msgid ""
 "\n"
 " Copyright (C) 2001-2002 by MandrakeSoft \n"
-"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\tDUPONT Sebastien (initial version)\n"
+"        CHAUMETTE Damien dchaumette\\@mandrakesoft.com\n"
 "\n"
 " 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"
@@ -12043,6 +12157,11 @@ msgstr ""
 
 #: ../../standalone/drakfont:1
 #, c-format
+msgid "About"
+msgstr ""
+
+#: ../../standalone/drakfont:1
+#, c-format
 msgid "Font List"
 msgstr ""
 
@@ -12215,7 +12334,7 @@ msgid ""
 "You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP)."
 msgstr ""
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr ""
@@ -12376,12 +12495,12 @@ msgstr ""
 msgid "Network interface"
 msgstr ""
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
 msgstr ""
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr ""
@@ -13141,7 +13260,7 @@ msgstr ""
 msgid "/_About..."
 msgstr ""
 
-#: ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#: ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/harddrake2:1 ../../standalone/logdrake:1
 #, c-format
 msgid "/_Help"
 msgstr ""
@@ -13176,7 +13295,7 @@ msgstr ""
 
 #: ../../standalone/harddrake2:1
 #, c-format
-msgid "/_Help..."
+msgid "/_Fields description"
 msgstr ""
 
 #: ../../standalone/harddrake2:1
@@ -13987,98 +14106,6 @@ msgstr ""
 msgid "No browser is installed on your system, Please install one if you want to browse the help system"
 msgstr ""
 
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "Location of auto_install.cfg file"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the auto_install.cfg file is located.\n"
-"\n"
-"Leave it blank if you do not want to set up automatic installation mode.\n"
-"\n"
-""
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "No CD or DVD image found, please copy the installation program and rpm files."
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "No image found"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "Installation image directory"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the installation image will be available.\n"
-"\n"
-"If you do not have an existing directory, please copy the CD or DVD contents.\n"
-"\n"
-""
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "The DHCP end ip"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "The DHCP start ip"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"The DHCP server will allow other computer to boot using PXE in the given range of address.\n"
-"\n"
-"The network address is %s using a netmask of %s.\n"
-"\n"
-""
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "Interface %s (on network %s)"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "Please choose which network interface will be used for the dhcp server."
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"You are about to configure your computer to install a PXE server as a DHCP server\n"
-"and a TFTP server to build an installation server.\n"
-"With that feature, other computers on your local network will be installable using from this computer.\n"
-"\n"
-"Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
-"\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "Installation Server Configuration"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "PXE Server Configuration"
-msgstr ""
-
 
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index e0da621f5..12506a061 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -965,6 +965,16 @@ msgstr "Oppstartsstilkonfigurasjon"
 
 #: ../../common.pm:1
 #, c-format
+msgid "consolehelper missing"
+msgstr "Konsollhjelper mangler"
+
+#: ../../common.pm:1
+#, c-format
+msgid "kdesu missing"
+msgstr "kdesu mangler"
+
+#: ../../common.pm:1
+#, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil vцre tilgjengelig etter installasjon i %s"
 
@@ -2683,6 +2693,18 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#, c-format
+msgid "No"
+msgstr "Nei"
+
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#, c-format
+msgid "Yes"
+msgstr "Ja"
+
 #: ../../install_any.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -2752,11 +2774,6 @@ msgstr "Jeg kan ikke finne noe rom for installering"
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "You don't have enough free space on your Windows partition"
-msgstr "Du har ikke nok ledig plass pх Windows partisjonen din"
-
-#: ../../install_interactive.pm:1
-#, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
@@ -2795,10 +2812,8 @@ msgid "Remove Windows(TM)"
 msgstr "Fjern Windows(TM)"
 
 #: ../../install_interactive.pm:1
-#, c-format
-msgid ""
-"There is no FAT partition to resize or to use as loopback (or not enough "
-"space left)"
+#, fuzzy, c-format
+msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr ""
 "Det finnes ingen FAT partisjon х forandre stјrrelsen pх eller х bruke som "
 "loopback (ikke nok plass igjen)"
@@ -2810,6 +2825,16 @@ msgstr "Krymping/forstјrring av FAT feilet: %s"
 
 #: ../../install_interactive.pm:1
 #, c-format
+msgid "Resizing Windows partition"
+msgstr "Beregner Windows filsystemgrense"
+
+#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Resizing"
+msgstr "Endrer stјrrelse"
+
+#: ../../install_interactive.pm:1
+#, c-format
 msgid "partition %s"
 msgstr "partisjon %s"
 
@@ -2849,6 +2874,11 @@ msgstr ""
 "Windows-partisjonen din er for fragmentert, vennligst kjјr ``defrag'' fјrst"
 
 #: ../../install_interactive.pm:1
+#, fuzzy, c-format
+msgid "Computing the size of the Windows partition"
+msgstr "Bruk den ledige plassen pх Windows partisjonen"
+
+#: ../../install_interactive.pm:1
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -2859,16 +2889,6 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Beregner Windows filsystemgrense"
-
-#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "Resizing"
-msgstr "Endrer stјrrelse"
-
-#: ../../install_interactive.pm:1
-#, c-format
 msgid "Which partition do you want to resize?"
 msgstr "Hvilken partisjonstype јnsker du х forandre stјrrelse pх?"
 
@@ -2878,6 +2898,13 @@ msgid "Use the free space on the Windows partition"
 msgstr "Bruk den ledige plassen pх Windows partisjonen"
 
 #: ../../install_interactive.pm:1
+#, fuzzy, c-format
+msgid "There is no FAT partition to use as loopback (or not enough space left)"
+msgstr ""
+"Det finnes ingen FAT partisjon х forandre stјrrelsen pх eller х bruke som "
+"loopback (ikke nok plass igjen)"
+
+#: ../../install_interactive.pm:1
 #, c-format
 msgid "Swap partition size in MB: "
 msgstr "Veksel-partisjonsstјrrelse i MB: "
@@ -3774,7 +3801,8 @@ msgstr "X ved oppstart"
 msgid "Bootloader"
 msgstr "Oppstartslaster som skal brukes"
 
-#: ../../install_steps_interactive.pm:1 ../../printer/printerdrake.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Printer"
 msgstr "Skriver"
@@ -3789,7 +3817,7 @@ msgstr "Tidssone"
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../../install_steps_interactive.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
 #, c-format
 msgid "Mouse"
 msgstr "Mus"
@@ -4275,28 +4303,6 @@ msgstr "Legg til"
 msgid "Choose a file"
 msgstr "Velg en fil"
 
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
-#: ../../modules/interactive.pm:1
-#, c-format
-msgid "No"
-msgstr "Nei"
-
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
-#: ../../modules/interactive.pm:1 ../../standalone/drakgw:1
-#, c-format
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../interactive.pm:1
-#, c-format
-msgid "consolehelper missing"
-msgstr "Konsollhjelper mangler"
-
-#: ../../interactive.pm:1
-#, c-format
-msgid "kdesu missing"
-msgstr "kdesu mangler"
-
 #: ../../keyboard.pm:1
 #, c-format
 msgid ""
@@ -5605,7 +5611,7 @@ msgid ""
 "users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
-"--version             : show version name.\n"
+"--version             : show version number.\n"
 msgstr ""
 
 #: ../../standalone.pm:1
@@ -6291,10 +6297,9 @@ msgid "Please click on a partition"
 msgstr "Vennligst klikk pх en partisjon"
 
 #: ../../diskdrake/hd_gtk.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
+"You have one big MicroSoft Windows partition.\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
@@ -7106,6 +7111,121 @@ msgstr ""
 msgid "cpu # "
 msgstr ""
 
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SMBus controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "USB controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SCSI controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "(E)IDE/ATA controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Joystick"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Scanner"
+msgstr "Velg et grafikk-kort"
+
+#: ../../harddrake/data.pm:1 ../../standalone/harddrake2:1
+#, fuzzy, c-format
+msgid "Unknown/Others"
+msgstr "Ukjent|Generisk"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Bridges and system controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Modem"
+msgstr "Modell"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Ethernetcard"
+msgstr "Ethernettkort"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Processors"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Webcam"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Soundcard"
+msgstr "Lydkort"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Other MultiMedia devices"
+msgstr "Andre"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Tvcard"
+msgstr "TV-kort"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Videocard"
+msgstr "Skjermmodus"
+
+#: ../../harddrake/data.pm:1 ../../standalone/drakbackup:1
+#, fuzzy, c-format
+msgid "Tape"
+msgstr "Type"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "DVD-ROM"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CD/DVD burners"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CDROM"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Disk"
+msgstr "Dansk"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Zip"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Floppy"
+msgstr "Lagre pх diskett"
+
 #: ../../harddrake/sound.pm:1
 #, c-format
 msgid "Let me pick any driver"
@@ -7246,7 +7366,6 @@ msgstr "Endrer mellom ALSA og OSS hjelp"
 
 #: ../../harddrake/sound.pm:1 ../../standalone/drakTermServ:1
 #: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
-#: ../../standalone/drakfont:1
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -7701,6 +7820,11 @@ msgstr "Domenenavn"
 msgid "Web Server"
 msgstr "Tjener"
 
+#: ../../network/ethernet.pm:1
+#, fuzzy, c-format
+msgid "Zeroconf Host name"
+msgstr "Vertsnavn"
+
 #: ../../network/ethernet.pm:1 ../../network/network.pm:1
 #, c-format
 msgid "Host name"
@@ -7738,7 +7862,6 @@ msgstr ""
 "mot Internett"
 
 #: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
-#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
@@ -8751,6 +8874,11 @@ msgstr ", multifunksjonsenhet pх USB"
 msgid ", multi-function device on parallel port \\#%s"
 msgstr ", multifunksjonsenhet pх parallelport \\/*%s"
 
+#: ../../printer/main.pm:1
+#, fuzzy, c-format
+msgid ", USB printer"
+msgstr ", USB skriver \\/*%s"
+
 #: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
 msgid ", USB printer \\#%s"
@@ -8761,7 +8889,7 @@ msgstr ", USB skriver \\/*%s"
 msgid " on parallel port \\#%s"
 msgstr " pх parallelport \\/*%s"
 
-#: ../../printer/main.pm:1
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Local Printers"
 msgstr "Lokale skrivere"
@@ -8982,11 +9110,6 @@ msgstr "Modifiser skriverkonfigurasjon"
 msgid "Add a new printer"
 msgstr "Legg til en ny skriver"
 
-#: ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Reading printer data..."
-msgstr "Leser skriverdata: ..."
-
 #: ../../printer/printerdrake.pm:1 ../../standalone/drakconnect:1
 #, c-format
 msgid "Normal Mode"
@@ -9060,11 +9183,21 @@ msgstr "Installerer Foomatic ..."
 
 #: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
+msgid "Failed to configure printer \"%s\"!"
+msgstr "Konfigurerer skriver \"%s\" ..."
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Konfigurerer skriver \"%s\" ..."
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Reading printer data..."
+msgstr "Leser skriverdata: ..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Hvilket utskriftsystem (spooler) јnsker du х bruke?"
 
@@ -10178,45 +10311,80 @@ msgstr ""
 "navn/filnavn i input-linjen"
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the printer to which the print jobs should go."
+msgstr "Vennligst velg porten hvor skriveren din er koblet til."
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up. 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\"."
+"Please choose the printer you want to set up. 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 ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"The following printer was auto-detected. 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\"."
+msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up or enter a device name/file name in the input line"
+msgid "There is currently no alternative possibiliy"
 msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"The following printer was auto-detected, if it is not the one you want to "
-"configure, enter a device name/file name in the input line"
+"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 ""
 
 #: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
-msgid "Available printers"
-msgstr "Lokal skriver"
+msgid "The following printer was auto-detected. "
+msgstr "Fјlgende pakker vil bli fjernet"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Local Printer"
+#, fuzzy, 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 ""
+"Vennligst velg en port hvor skriveren din er tilkoblet eller entre en enhet "
+"navn/filnavn i input-linjen"
+
+#: ../../printer/printerdrake.pm:1
+#, 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 ""
+"Vennligst velg en port hvor skriveren din er tilkoblet eller entre en enhet "
+"navn/filnavn i input-linjen"
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
+msgstr ""
+"Vennligst velg en port hvor skriveren din er tilkoblet eller entre en enhet "
+"navn/filnavn i input-linjen"
+
+#: ../../printer/printerdrake.pm:1
+#, 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 ""
+"Vennligst velg en port hvor skriveren din er tilkoblet eller entre en enhet "
+"navn/filnavn i input-linjen"
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Available printers"
 msgstr "Lokal skriver"
 
 #: ../../printer/printerdrake.pm:1
@@ -10243,6 +10411,11 @@ msgstr ""
 "usb/lp1, ...)."
 
 #: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Local Printer"
+msgstr "Lokal skriver"
+
+#: ../../printer/printerdrake.pm:1
 #, fuzzy, c-format
 msgid "USB printer \\#%s"
 msgstr "USB skriver \\/*%s"
@@ -10400,6 +10573,11 @@ msgstr ""
 "tilkoblinger."
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Searching for new printers..."
+msgstr "Lokal skriver"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11643,7 +11821,7 @@ msgid ""
 "  /var/lib/drakbackup directory\n"
 "\n"
 "  Configuration file:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 "\n"
 "Restore Step:\n"
 "  \n"
@@ -12482,11 +12660,6 @@ msgid "hourly"
 msgstr ""
 
 #: ../../standalone/drakbackup:1
-#, fuzzy, c-format
-msgid "Tape"
-msgstr "Type"
-
-#: ../../standalone/drakbackup:1
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
@@ -13554,65 +13727,10 @@ msgstr "Velg partisjonene du јnsker х partisjonere"
 #: ../../standalone/drakfont:1
 #, c-format
 msgid ""
-"drakfont Future Overview\n"
-"        - Fonts import:\n"
-"                pfb ( Adobe Type 1 binary )\n"
-"                pfa ( Adobe Type 1 ASCII )\n"
-"                ttf ( True-Type  )\n"
-"                pcf.gz\n"
-"                Speedo\n"
-"                and Bitmap (PCF, BDF, and SNF)\n"
-"        - Features\n"
-"                - Install fonts from any directory\n"
-"                - Get windows fonts on any vfat partitions\n"
-"                - Get fonts on any partitions.\n"
-"                - UN-installation of any fonts (even if not installed "
-"through drakfont)\n"
-"        - Support\n"
-"              - Xfs\n"
-"              - ghostscript & printer\n"
-"              - Staroffice & printer\n"
-"              - abiword\n"
-"\t      - netscape\n"
-"              - Koffice, Gnumeric, ... studying\n"
-"              - all fonts supported by printer\n"
-"              - anti-aliases by RENDER in Xfree86 .... \n"
-"\t\t\t\tsupported by KDE.\n"
-"\t\t\t\twill be supported by gnome 1.2.\n"
-"Visual Interface:\n"
-"        Window interface:\n"
-"          - Fontselectiondialog widget\n"
-"          - Command buttons under Fontselectiondialog (like the actual "
-"frontend).\n"
-"        Commands buttons:\n"
-"          - import from windows partition.\n"
-"                import from all fat32 partitions and look for winnt/windows/"
-"font\n"
-"                and import all (delete doubles) but don't import if they "
-"already exist.\n"
-"          - import from directory\n"
-"                look to see if each font exists and do not delete the "
-"original.\n"
-"                (replace all, no, none)\n"
-"                expert options:\n"
-"                        specify the directory, and look to see if it exists "
-"before\n"
-"                        if it exists ask: (replace all, no, none)\n"
-"          - uninstall with list per font type\n"
-"        Expert additional switch\n"
-"          - option support:   ghostscript, Staroffice, etc...\n"
-"                check-button. (by default all check)\n"
-"          - Printer Application Fonts Support...\n"
-"\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakfont:1
-#, c-format
-msgid ""
 "\n"
 " Copyright (C) 2001-2002 by MandrakeSoft \n"
-"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\tDUPONT Sebastien (initial version)\n"
+"        CHAUMETTE Damien dchaumette\\@mandrakesoft.com\n"
 "\n"
 " 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"
@@ -13644,6 +13762,11 @@ msgstr ""
 
 #: ../../standalone/drakfont:1
 #, fuzzy, c-format
+msgid "About"
+msgstr "Avbryt"
+
+#: ../../standalone/drakfont:1
+#, fuzzy, c-format
 msgid "Font List"
 msgstr "Monteringspunkt"
 
@@ -13823,7 +13946,7 @@ msgstr ""
 "Du kan nх dele Internett-tilkobling med andre maskiner pх ditt lokale "
 "nettverk ved х bruke automatisk nettverkskonfigurasjon (DHCP)."
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Problemer ved installering av pakke %s"
@@ -13994,7 +14117,7 @@ msgstr ""
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -14003,7 +14126,7 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
 "Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Ikke noe nettverksadapter i systemet ditt!"
@@ -14829,9 +14952,9 @@ msgid "Harddrake help"
 msgstr "Harddrake hjelp"
 
 #: ../../standalone/harddrake2:1
-#, c-format
-msgid "/_Help..."
-msgstr "/_Hjelp..."
+#, fuzzy, c-format
+msgid "/_Fields description"
+msgstr "Beskrivelse"
 
 #: ../../standalone/harddrake2:1
 #, fuzzy, c-format
@@ -15668,111 +15791,6 @@ msgid ""
 "browse the help system"
 msgstr ""
 
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Location of auto_install.cfg file"
-msgstr "Oppretter diskett for autoinstallasjon"
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the auto_install.cfg file is located.\n"
-"\n"
-"Leave it blank if you do not want to set up automatic installation mode.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"No CD or DVD image found, please copy the installation program and rpm files."
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "No image found"
-msgstr "Ingen lokal skriver funnet!\n"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Installation image directory"
-msgstr "Xpmac (installasjons skjermdriver)"
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the installation image will be available.\n"
-"\n"
-"If you do not have an existing directory, please copy the CD or DVD "
-"contents.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "The DHCP end ip"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid "The DHCP start ip"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"The DHCP server will allow other computer to boot using PXE in the given "
-"range of address.\n"
-"\n"
-"The network address is %s using a netmask of %s.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Interface %s (on network %s)"
-msgstr "Grensesnitt %s (bruker modul %s)"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Please choose which network interface will be used for the dhcp server."
-msgstr ""
-"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
-"mot Internett"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid ""
-"You are about to configure your computer to install a PXE server as a DHCP "
-"server\n"
-"and a TFTP server to build an installation server.\n"
-"With that feature, other computers on your local network will be installable "
-"using from this computer.\n"
-"\n"
-"Make sure you have configured your Network/Internet access using drakconnect "
-"before going any further.\n"
-"\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN)."
-msgstr ""
-"Du er i ferd med х konfigurere maskinen din til х dele Internett-"
-"tilkobling.\n"
-"Andre maskiner i nettverket ditt vil da kunne bruke denne maskinens "
-"Internett tilkobling.\n"
-"\n"
-"Merk: du trenger et dedikert nettverksadapter for х sette opp et lokalt "
-"nettverk (LAN)."
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Installation Server Configuration"
-msgstr "LAN-konfigurasjon"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "PXE Server Configuration"
-msgstr "LAN-konfigurasjon"
-
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Kontor og arbeidsmaskin"
@@ -16016,6 +16034,66 @@ msgstr "Personlig finans"
 msgid "Programs to manage your finances, such as gnucash"
 msgstr "Programmer for х hхndtere dine finanser, sх som gnucash"
 
+#~ msgid "You don't have enough free space on your Windows partition"
+#~ msgstr "Du har ikke nok ledig plass pх Windows partisjonen din"
+
+#~ msgid "/_Help..."
+#~ msgstr "/_Hjelp..."
+
+#, fuzzy
+#~ msgid "Location of auto_install.cfg file"
+#~ msgstr "Oppretter diskett for autoinstallasjon"
+
+#, fuzzy
+#~ msgid "No image found"
+#~ msgstr "Ingen lokal skriver funnet!\n"
+
+#, fuzzy
+#~ msgid "Installation image directory"
+#~ msgstr "Xpmac (installasjons skjermdriver)"
+
+#, fuzzy
+#~ msgid "Interface %s (on network %s)"
+#~ msgstr "Grensesnitt %s (bruker modul %s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please choose which network interface will be used for the dhcp server."
+#~ msgstr ""
+#~ "Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble "
+#~ "opp\n"
+#~ "mot Internett"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are about to configure your computer to install a PXE server as a "
+#~ "DHCP server\n"
+#~ "and a TFTP server to build an installation server.\n"
+#~ "With that feature, other computers on your local network will be "
+#~ "installable using from this computer.\n"
+#~ "\n"
+#~ "Make sure you have configured your Network/Internet access using "
+#~ "drakconnect before going any further.\n"
+#~ "\n"
+#~ "Note: you need a dedicated Network Adapter to set up a Local Area Network "
+#~ "(LAN)."
+#~ msgstr ""
+#~ "Du er i ferd med х konfigurere maskinen din til х dele Internett-"
+#~ "tilkobling.\n"
+#~ "Andre maskiner i nettverket ditt vil da kunne bruke denne maskinens "
+#~ "Internett tilkobling.\n"
+#~ "\n"
+#~ "Merk: du trenger et dedikert nettverksadapter for х sette opp et lokalt "
+#~ "nettverk (LAN)."
+
+#, fuzzy
+#~ msgid "Installation Server Configuration"
+#~ msgstr "LAN-konfigurasjon"
+
+#, fuzzy
+#~ msgid "PXE Server Configuration"
+#~ msgstr "LAN-konfigurasjon"
+
 #~ msgid "Do you really want to leave the installation?"
 #~ msgstr "иnsker du virkelig х forlate installasjonen?"
 
@@ -16131,12 +16209,6 @@ msgstr "Programmer for х hхndtere dine finanser, sх som gnucash"
 
 #, fuzzy
 #~ msgid ""
-#~ "The following printers\n"
-#~ "\n"
-#~ msgstr "Fјlgende pakker vil bli fjernet"
-
-#, fuzzy
-#~ msgid ""
 #~ "The following printer\n"
 #~ "\n"
 #~ msgstr "Fјlgende pakker vil bli fjernet"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index edf2be206..b784d0dd4 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -999,6 +999,16 @@ msgstr "Kонфигурацијa стила стартaњa"
 
 #: ../../common.pm:1
 #, c-format
+msgid "consolehelper missing"
+msgstr "consolehelper недостаје"
+
+#: ../../common.pm:1
+#, c-format
+msgid "kdesu missing"
+msgstr "недостаjе kdesu"
+
+#: ../../common.pm:1
+#, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Снимци ће бити доступни након инсталације у %s"
 
@@ -3256,6 +3266,18 @@ msgstr ""
 "\n"
 "Да ли заиста желите да уклоните ове пакете?\n"
 
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#, c-format
+msgid "No"
+msgstr "Не"
+
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#, c-format
+msgid "Yes"
+msgstr "Да"
+
 #: ../../install_any.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -3327,11 +3349,6 @@ msgstr "Не могу да пронaђем слободан простор за инсталирaње"
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "You don't have enough free space on your Windows partition"
-msgstr "Немате довољно слободног просторa на Windows партициjи"
-
-#: ../../install_interactive.pm:1
-#, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
@@ -3372,10 +3389,8 @@ msgid "Remove Windows(TM)"
 msgstr "Уклони Windows(TM)"
 
 #: ../../install_interactive.pm:1
-#, c-format
-msgid ""
-"There is no FAT partition to resize or to use as loopback (or not enough "
-"space left)"
+#, fuzzy, c-format
+msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr ""
 "Не постоje FAT партициjе коjимa се може променити величинa или коjе се могу "
 "кориситити зa loopback (или нема довољно слободног просторa)"
@@ -3387,6 +3402,16 @@ msgstr "FAT измена величине неуспела: %s"
 
 #: ../../install_interactive.pm:1
 #, c-format
+msgid "Resizing Windows partition"
+msgstr "Прорачунавам границе Windows фајл-система"
+
+#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Resizing"
+msgstr "Промена величине (resizing)"
+
+#: ../../install_interactive.pm:1
+#, c-format
 msgid "partition %s"
 msgstr "партиција %s "
 
@@ -3425,6 +3450,11 @@ msgstr ""
 "Вaша Windows партициjа jе превише фрагментирана, прво покрените ``defrag''"
 
 #: ../../install_interactive.pm:1
+#, fuzzy, c-format
+msgid "Computing the size of the Windows partition"
+msgstr "Корисити слободан простор на Windows партициjи"
+
+#: ../../install_interactive.pm:1
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -3436,16 +3466,6 @@ msgstr ""
 
 #: ../../install_interactive.pm:1
 #, c-format
-msgid "Resizing Windows partition"
-msgstr "Прорачунавам границе Windows фајл-система"
-
-#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
-#, c-format
-msgid "Resizing"
-msgstr "Промена величине (resizing)"
-
-#: ../../install_interactive.pm:1
-#, c-format
 msgid "Which partition do you want to resize?"
 msgstr "Којоj партицији  желите да промените величину?"
 
@@ -3455,6 +3475,13 @@ msgid "Use the free space on the Windows partition"
 msgstr "Корисити слободан простор на Windows партициjи"
 
 #: ../../install_interactive.pm:1
+#, fuzzy, c-format
+msgid "There is no FAT partition to use as loopback (or not enough space left)"
+msgstr ""
+"Не постоje FAT партициjе коjимa се може променити величинa или коjе се могу "
+"кориситити зa loopback (или нема довољно слободног просторa)"
+
+#: ../../install_interactive.pm:1
 #, c-format
 msgid "Swap partition size in MB: "
 msgstr "Величина Swap партициjе у MB:"
@@ -4362,7 +4389,8 @@ msgstr "Графички интерфејс"
 msgid "Bootloader"
 msgstr "Стартер"
 
-#: ../../install_steps_interactive.pm:1 ../../printer/printerdrake.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Printer"
 msgstr "Штампач"
@@ -4377,7 +4405,7 @@ msgstr "Временска зонa"
 msgid "Keyboard"
 msgstr "Тастатурa"
 
-#: ../../install_steps_interactive.pm:1
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
 #, c-format
 msgid "Mouse"
 msgstr "Миш"
@@ -4862,28 +4890,6 @@ msgstr "Додај"
 msgid "Choose a file"
 msgstr "Изаберите фајл"
 
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
-#: ../../modules/interactive.pm:1
-#, c-format
-msgid "No"
-msgstr "Не"
-
-#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
-#: ../../modules/interactive.pm:1 ../../standalone/drakgw:1
-#, c-format
-msgid "Yes"
-msgstr "Да"
-
-#: ../../interactive.pm:1
-#, c-format
-msgid "consolehelper missing"
-msgstr "consolehelper недостаје"
-
-#: ../../interactive.pm:1
-#, c-format
-msgid "kdesu missing"
-msgstr "недостаjе kdesu"
-
 #: ../../keyboard.pm:1
 #, c-format
 msgid ""
@@ -6232,7 +6238,7 @@ msgstr ""
 "  --incident        - програм треба да буде један од mandrake алата"
 
 #: ../../standalone.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
 "Backup and Restore application\n"
@@ -6244,7 +6250,7 @@ msgid ""
 "users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
-"--version             : show version name.\n"
+"--version             : show version number.\n"
 msgstr ""
 "[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
 "Програм за Backup и враћање података\n"
@@ -6958,10 +6964,9 @@ msgid "Please click on a partition"
 msgstr "Кликните на партицију"
 
 #: ../../diskdrake/hd_gtk.pm:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
+"You have one big MicroSoft Windows partition.\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
@@ -7771,6 +7776,121 @@ msgstr "Не могу да улогујем корисничко име %s (неисправна лозинка?)"
 msgid "cpu # "
 msgstr "cpu # "
 
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SMBus controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "USB controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SCSI controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "(E)IDE/ATA controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Joystick"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Scanner"
+msgstr "Изаберите скенер"
+
+#: ../../harddrake/data.pm:1 ../../standalone/harddrake2:1
+#, fuzzy, c-format
+msgid "Unknown/Others"
+msgstr "Непознати|Generic"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Bridges and system controllers"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Modem"
+msgstr "Модел"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Ethernetcard"
+msgstr "Мрeжна картицa"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Processors"
+msgstr "ID процесора"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Webcam"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Soundcard"
+msgstr "Звучна картицa"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Other MultiMedia devices"
+msgstr "Други Медиј"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Tvcard"
+msgstr "TV катицa"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Videocard"
+msgstr "Видео мод"
+
+#: ../../harddrake/data.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Tape"
+msgstr "Трака"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "DVD-ROM"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CD/DVD burners"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "CDROM"
+msgstr "на ЦД уређају"
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Disk"
+msgstr "Дански"
+
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Zip"
+msgstr ""
+
+#: ../../harddrake/data.pm:1
+#, fuzzy, c-format
+msgid "Floppy"
+msgstr "Boot Floppy"
+
 #: ../../harddrake/sound.pm:1
 #, c-format
 msgid "Let me pick any driver"
@@ -7947,7 +8067,6 @@ msgstr "Помоћ за промену између ALSA и OSS"
 
 #: ../../harddrake/sound.pm:1 ../../standalone/drakTermServ:1
 #: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
-#: ../../standalone/drakfont:1
 #, c-format
 msgid "Help"
 msgstr "Помоћ"
@@ -8418,6 +8537,11 @@ msgstr "Domain Name Сервер"
 msgid "Web Server"
 msgstr "Веб Сервер"
 
+#: ../../network/ethernet.pm:1
+#, fuzzy, c-format
+msgid "Zeroconf Host name"
+msgstr "Име хоста:"
+
 #: ../../network/ethernet.pm:1 ../../network/network.pm:1
 #, c-format
 msgid "Host name"
@@ -8454,7 +8578,6 @@ msgstr ""
 "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
 
 #: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
-#: ../../standalone/drakpxe:1
 #, c-format
 msgid "Choose the network interface"
 msgstr "Изаберите мрeжни интерфejс"
@@ -9471,6 +9594,11 @@ msgstr ", мулти-функционални уређај на USB"
 msgid ", multi-function device on parallel port \\#%s"
 msgstr ", мулти-функционални уређај на паралелном порту \\#%s"
 
+#: ../../printer/main.pm:1
+#, fuzzy, c-format
+msgid ", USB printer"
+msgstr ", USB штампач \\#%s"
+
 #: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid ", USB printer \\#%s"
@@ -9481,7 +9609,7 @@ msgstr ", USB штампач \\#%s"
 msgid " on parallel port \\#%s"
 msgstr " на парелелном порту \\#%s"
 
-#: ../../printer/main.pm:1
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Local Printers"
 msgstr "Локални штампачи"
@@ -9702,11 +9830,6 @@ msgstr "Измена конфигурације штампача"
 msgid "Add a new printer"
 msgstr "Додајте нови штампач"
 
-#: ../../printer/printerdrake.pm:1
-#, c-format
-msgid "Reading printer data..."
-msgstr "Учитавам податке за штампач ..."
-
 #: ../../printer/printerdrake.pm:1 ../../standalone/drakconnect:1
 #, c-format
 msgid "Normal Mode"
@@ -9783,12 +9906,22 @@ msgid "Installing Foomatic..."
 msgstr "Инсталирам Foomatic ..."
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Failed to configure printer \"%s\"!"
+msgstr "Подешавам штампач \"%s\" ..."
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Подешавам штампач \"%s\" ..."
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Reading printer data..."
+msgstr "Учитавам податке за штампач ..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Који систем за штампaње (spooler) желите да користитe ?"
 
@@ -11035,12 +11168,17 @@ msgstr ""
 "уређаја у линију за унос"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
+msgid "Please choose the printer to which the print jobs should go."
+msgstr "Изаберите порт на који је ваш рачунар повезан."
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
 msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up. 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\"."
+"Please choose the printer you want to set up. 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 ""
 "Овде се налази листа свих ауто-детектованих штампача. Изаберите штампач који "
 "ћелите да подесите. Подешавање штампача ће бити потпуно аутоматско. Уколико "
@@ -11049,30 +11187,65 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Here is a list of all auto-detected printers. "
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "There is currently no alternative possibiliy"
+msgstr ""
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
 msgid ""
-"The following printer was auto-detected. 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\"."
+"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 ""
 "Приказани штампач је ауто-детектован. Подешавање штампача ће бити потпуно "
 "аутоматско. Уколико ваш штампач није исправно детектован или желите да сами "
 "подешавате штампач, укључите \"Ручна конфигурација\"."
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, fuzzy, c-format
+msgid "The following printer was auto-detected. "
+msgstr ""
+"Следећи штамач\n"
+"\n"
+"%s%s\n"
+"је директно повезан на ваш систем"
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
 msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up or enter a device name/file name in the input line"
+"Please choose the printer to which the print jobs should go or enter a "
+"device name/file name in the input line"
 msgstr ""
-"Овде се налази листа свих ауто-детектованих штампача. Изаберите штампач који "
-"желите или унесите имеиме фајла уређаја у линији за унос"
+"Изаберите порт на који је ваш штампач повезан или унесите име/име фајла "
+"уређаја у линију за унос"
 
 #: ../../printer/printerdrake.pm:1
-#, c-format
+#, 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 ""
+"Изаберите порт на који је ваш штампач повезан или унесите име/име фајла "
+"уређаја у линију за унос"
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Alternatively, you can specify a device name/file name in the input line"
+msgstr ""
+"Изаберите порт на који је ваш штампач повезан или унесите име/име фајла "
+"уређаја у линију за унос"
+
+#: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
 msgid ""
-"The following printer was auto-detected, if it is not the one you want to "
-"configure, enter a device name/file name in the input line"
+"If it is not the one you want to configure, enter a device name/file name in "
+"the input line"
 msgstr ""
 "Приказани штампач је ауто-детектован, а уколико то није онај који желите да "
 "подесите, унесите име/име фајла уређаја у линију за унос"
@@ -11084,11 +11257,6 @@ msgstr "Доступни штампачи"
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Local Printer"
-msgstr "Локални штампач"
-
-#: ../../printer/printerdrake.pm:1
-#, c-format
 msgid "No printer found!"
 msgstr "Није пронађен штампач!"
 
@@ -11112,6 +11280,11 @@ msgstr ""
 
 #: ../../printer/printerdrake.pm:1
 #, c-format
+msgid "Local Printer"
+msgstr "Локални штампач"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid "USB printer \\#%s"
 msgstr "USB штампач \\#%s"
 
@@ -11314,6 +11487,11 @@ msgstr ""
 "конекције штампача."
 
 #: ../../printer/printerdrake.pm:1
+#, fuzzy, c-format
+msgid "Searching for new printers..."
+msgstr "Дељење локалних штампача"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -12690,7 +12868,7 @@ msgid ""
 "  /var/lib/drakbackup directory\n"
 "\n"
 "  Configuration file:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 "\n"
 "Restore Step:\n"
 "  \n"
@@ -12726,7 +12904,7 @@ msgstr ""
 "  /var/lib/drakbackup директоријум\n"
 "\n"
 "  Конфигурациони фајл:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 "\n"
 "\n"
 "Корак за обнављање:\n"
@@ -13718,11 +13896,6 @@ msgstr "на сат"
 
 #: ../../standalone/drakbackup:1
 #, c-format
-msgid "Tape"
-msgstr "Трака"
-
-#: ../../standalone/drakbackup:1
-#, c-format
 msgid "HardDrive / NFS"
 msgstr "HardDrive / NFS"
 
@@ -14861,67 +15034,12 @@ msgid "Choose the applications that will support the fonts:"
 msgstr "Изаберите апликације које ће подржавати фонтове :"
 
 #: ../../standalone/drakfont:1
-#, c-format
-msgid ""
-"drakfont Future Overview\n"
-"        - Fonts import:\n"
-"                pfb ( Adobe Type 1 binary )\n"
-"                pfa ( Adobe Type 1 ASCII )\n"
-"                ttf ( True-Type  )\n"
-"                pcf.gz\n"
-"                Speedo\n"
-"                and Bitmap (PCF, BDF, and SNF)\n"
-"        - Features\n"
-"                - Install fonts from any directory\n"
-"                - Get windows fonts on any vfat partitions\n"
-"                - Get fonts on any partitions.\n"
-"                - UN-installation of any fonts (even if not installed "
-"through drakfont)\n"
-"        - Support\n"
-"              - Xfs\n"
-"              - ghostscript & printer\n"
-"              - Staroffice & printer\n"
-"              - abiword\n"
-"\t      - netscape\n"
-"              - Koffice, Gnumeric, ... studying\n"
-"              - all fonts supported by printer\n"
-"              - anti-aliases by RENDER in Xfree86 .... \n"
-"\t\t\t\tsupported by KDE.\n"
-"\t\t\t\twill be supported by gnome 1.2.\n"
-"Visual Interface:\n"
-"        Window interface:\n"
-"          - Fontselectiondialog widget\n"
-"          - Command buttons under Fontselectiondialog (like the actual "
-"frontend).\n"
-"        Commands buttons:\n"
-"          - import from windows partition.\n"
-"                import from all fat32 partitions and look for winnt/windows/"
-"font\n"
-"                and import all (delete doubles) but don't import if they "
-"already exist.\n"
-"          - import from directory\n"
-"                look to see if each font exists and do not delete the "
-"original.\n"
-"                (replace all, no, none)\n"
-"                expert options:\n"
-"                        specify the directory, and look to see if it exists "
-"before\n"
-"                        if it exists ask: (replace all, no, none)\n"
-"          - uninstall with list per font type\n"
-"        Expert additional switch\n"
-"          - option support:   ghostscript, Staroffice, etc...\n"
-"                check-button. (by default all check)\n"
-"          - Printer Application Fonts Support...\n"
-"\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakfont:1
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 " Copyright (C) 2001-2002 by MandrakeSoft \n"
-"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\tDUPONT Sebastien (initial version)\n"
+"        CHAUMETTE Damien dchaumette\\@mandrakesoft.com\n"
 "\n"
 " 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"
@@ -14983,6 +15101,11 @@ msgstr ""
 "\n"
 
 #: ../../standalone/drakfont:1
+#, fuzzy, c-format
+msgid "About"
+msgstr "Прекини"
+
+#: ../../standalone/drakfont:1
 #, c-format
 msgid "Font List"
 msgstr "Листа фонтова"
@@ -15165,7 +15288,7 @@ msgstr ""
 "Сада можете делити Интернет конекциjу са другим компjутерима на вaшоj "
 "локалноj мрeжи  (LAN), користећи аутоматску мрeжну конфигурациjу (DHCP)."
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Проблеми при инсталациjи %s пакетa"
@@ -15361,7 +15484,7 @@ msgstr ""
 msgid "Network interface"
 msgstr "Мрeжни интерфejс"
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -15370,7 +15493,7 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
 "хардверa."
 
-#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#: ../../standalone/drakgw:1
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Нема мрeжног адаптера у вaшем систему !"
@@ -16273,9 +16396,9 @@ msgid "Harddrake help"
 msgstr "Harddrake помоћ"
 
 #: ../../standalone/harddrake2:1
-#, c-format
-msgid "/_Help..."
-msgstr "/_Помоћ..."
+#, fuzzy, c-format
+msgid "/_Fields description"
+msgstr "Опис"
 
 #: ../../standalone/harddrake2:1
 #, c-format
@@ -17138,111 +17261,6 @@ msgstr ""
 "Ниједан претраживач није инсталиран. Молим Вас да инсталирате један да би "
 "могли да користите ситем ѕа помоћ"
 
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Location of auto_install.cfg file"
-msgstr "Креирам ауто инсталациону дискету"
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the auto_install.cfg file is located.\n"
-"\n"
-"Leave it blank if you do not want to set up automatic installation mode.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"No CD or DVD image found, please copy the installation program and rpm files."
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "No image found"
-msgstr "Није пронађен штампач!"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Installation image directory"
-msgstr "Xpmac (Инсталациja дисплеj драjвер)"
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"Please indicate where the installation image will be available.\n"
-"\n"
-"If you do not have an existing directory, please copy the CD or DVD "
-"contents.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "The DHCP end ip"
-msgstr "DHCP крај распона"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "The DHCP start ip"
-msgstr "DHCP почетак распона"
-
-#: ../../standalone/drakpxe:1
-#, c-format
-msgid ""
-"The DHCP server will allow other computer to boot using PXE in the given "
-"range of address.\n"
-"\n"
-"The network address is %s using a netmask of %s.\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Interface %s (on network %s)"
-msgstr "Интерфеjс %s (користeћи модул %s)"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Please choose which network interface will be used for the dhcp server."
-msgstr ""
-"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid ""
-"You are about to configure your computer to install a PXE server as a DHCP "
-"server\n"
-"and a TFTP server to build an installation server.\n"
-"With that feature, other computers on your local network will be installable "
-"using from this computer.\n"
-"\n"
-"Make sure you have configured your Network/Internet access using drakconnect "
-"before going any further.\n"
-"\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN)."
-msgstr ""
-"Вaш рачунар можете подесити за дeљeње његове Интернет конекциje.\n"
-"са овом опциjом, други компjутери на вaшоj локалноj мрeжи ће моћи да "
-"користeИнтернет конекциjу са овог рачунара.\n"
-"\n"
-"Проверите да ли је подешена ваша Мрежни/Интернет приступ преко drakconnect "
-"пре него што наставимо.\n"
-"\n"
-"Напоменa: потребанa вам jе мрeжна картица да би подесили локалну мрeжу(LAN)."
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "Installation Server Configuration"
-msgstr "dhcpd Сервер конфигурација"
-
-#: ../../standalone/drakpxe:1
-#, fuzzy, c-format
-msgid "PXE Server Configuration"
-msgstr "dhcpd Сервер конфигурација"
-
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
 msgstr "Радна(Office) станицa"
@@ -17486,6 +17504,81 @@ msgstr "Личне финансиje"
 msgid "Programs to manage your finances, such as gnucash"
 msgstr "Програми за управљaње вaшим финансиjамa, као што jе gnucash"
 
+#~ msgid "You don't have enough free space on your Windows partition"
+#~ msgstr "Немате довољно слободног просторa на Windows партициjи"
+
+#~ msgid ""
+#~ "Here is a list of all auto-detected printers. Please choose the printer "
+#~ "you want to set up or enter a device name/file name in the input line"
+#~ msgstr ""
+#~ "Овде се налази листа свих ауто-детектованих штампача. Изаберите штампач "
+#~ "који желите или унесите имеиме фајла уређаја у линији за унос"
+
+#~ msgid "/_Help..."
+#~ msgstr "/_Помоћ..."
+
+#, fuzzy
+#~ msgid "Location of auto_install.cfg file"
+#~ msgstr "Креирам ауто инсталациону дискету"
+
+#, fuzzy
+#~ msgid "No image found"
+#~ msgstr "Није пронађен штампач!"
+
+#, fuzzy
+#~ msgid "Installation image directory"
+#~ msgstr "Xpmac (Инсталациja дисплеj драjвер)"
+
+#, fuzzy
+#~ msgid "The DHCP end ip"
+#~ msgstr "DHCP крај распона"
+
+#, fuzzy
+#~ msgid "The DHCP start ip"
+#~ msgstr "DHCP почетак распона"
+
+#, fuzzy
+#~ msgid "Interface %s (on network %s)"
+#~ msgstr "Интерфеjс %s (користeћи модул %s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please choose which network interface will be used for the dhcp server."
+#~ msgstr ""
+#~ "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are about to configure your computer to install a PXE server as a "
+#~ "DHCP server\n"
+#~ "and a TFTP server to build an installation server.\n"
+#~ "With that feature, other computers on your local network will be "
+#~ "installable using from this computer.\n"
+#~ "\n"
+#~ "Make sure you have configured your Network/Internet access using "
+#~ "drakconnect before going any further.\n"
+#~ "\n"
+#~ "Note: you need a dedicated Network Adapter to set up a Local Area Network "
+#~ "(LAN)."
+#~ msgstr ""
+#~ "Вaш рачунар можете подесити за дeљeње његове Интернет конекциje.\n"
+#~ "са овом опциjом, други компjутери на вaшоj локалноj мрeжи ће моћи да "
+#~ "користeИнтернет конекциjу са овог рачунара.\n"
+#~ "\n"
+#~ "Проверите да ли је подешена ваша Мрежни/Интернет приступ преко "
+#~ "drakconnect пре него што наставимо.\n"
+#~ "\n"
+#~ "Напоменa: потребанa вам jе мрeжна картица да би подесили локалну мрeжу"
+#~ "(LAN)."
+
+#, fuzzy
+#~ msgid "Installation Server Configuration"
+#~ msgstr "dhcpd Сервер конфигурација"
+
+#, fuzzy
+#~ msgid "PXE Server Configuration"
+#~ msgstr "dhcpd Сервер конфигурација"
+
 #~ msgid "Do you really want to leave the installation?"
 #~ msgstr "Да ли заиста хоћете да прекинете инсталацију?"
 
@@ -17758,7 +17851,7 @@ msgstr "Програми за управљaње вaшим финансиjамa, као што jе gnucash"
 #~ "  /var/lib/drakbackup directory\n"
 #~ "\n"
 #~ "  Configuration file:\n"
-#~ "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+#~ "\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 #~ "\n"
 #~ "Restore Step:\n"
 #~ "  \n"
@@ -17794,7 +17887,7 @@ msgstr "Програми за управљaње вaшим финансиjамa, као што jе gnucash"
 #~ "  /var/lib/drakbackup директоријум\n"
 #~ "\n"
 #~ "  Конфигурациони фајл:\n"
-#~ "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+#~ "\t/etc/drakconf/drakbackup/drakbackup.conf\n"
 #~ "\n"
 #~ "Поступак обнављања:\n"
 #~ "  \n"