no_comment

13 files changed, 1598 insertions, 1293 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index b578faa67..28f65f9d8 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -769,6 +769,7 @@ sub main {
 	   __("Test again") => sub { $ok = testFinalConfig($o, 1) },
 	   __("Quit") => sub { $quit = 1 },
         );
+	$in->set_help('configureXmain') unless $::isStandalone;
 	my $f = $in->ask_from_list_(['XFdrake'],
 				 _("What do you want to do?"),
 				 [ grep { !ref } @c ]);
@@ -810,6 +811,7 @@ sub main {
 	    }
 	    $in->ask_warn('', _("Please log out and then use Ctrl-Alt-BackSpace")) unless $found;
 	} else {
+	    $in->set_help('configureXxdm') unless $::isStandalone;
 	    my $run = $o->{xdm} || $::auto || $in->ask_yesorno(_("X at startup"),
 _("I can set up your computer to automatically start X upon booting.
 Would you like X to start when you reboot?"), 1);
diff --git a/perl-install/help.pm b/perl-install/help.pm
index e22f523e9..055d19190 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -15,7 +15,8 @@ installed, or if you wish to use multiple distributions or versions.
 
 
 Choose \"Upgrade\" if you wish to update a previous version of Mandrake
-Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."),
+Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1
+(Helios) or Gold 2000."),
 
 selectInstallClass =>
  __("Select:
@@ -134,6 +135,10 @@ match for your mouse.
 In case of a serial mouse, you will also have to tell DrakX
 which serial port it is connected to."),
 
+selectSerialPort =>
+ __("Please select the correct port. For example, the COM1 port in MS Windows
+is named ttyS0 in Linux."),
+
 configureNetwork =>
  __("This section is dedicated to configuring a local area
 network (LAN) or a modem.
@@ -164,6 +169,27 @@ a modem will be configured. DrakX will try to find your modem,
 if it fails you will have to select the right serial port where
 your modem is connected to."),
 
+configureNetworkIP =>
+ __("Enter:
+
+  - IP address: if you don't know it, ask your network administrator.
+
+  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not
+sure, ask your network administrator.
+
+  - Automatic IP: If your network uses bootp or dhcpd protocol, select 
+this option. If selected, no value is needed in \"IP address\". If you are
+not sure, ask your network administrator.
+"),
+
+configureNetworkISP =>
+ __("You may now enter dialup options. If you're not sure what to enter, the
+correct information can be obtained from your ISP."),
+
+configureNetworkProxy =>
+ __("If you will use proxies, please configure them now. If you don't know if
+you will use proxies, ask your network administrator or your ISP."),
+
 installCrypto =>
  __("You can install cryptographic package if your internet connection has been
 set up correctly. First choose a mirror where you wish to download packages and
@@ -221,9 +247,17 @@ should *never* be written down. Do not make the password too long or
 complicated, though: you must be able to remember without too much
 effort."),
 
+setRootPasswordMd5 =>
+ __("To enable a more secure system, you should select \"Use shadow file\" and
+\"Use MD5 passwords\"."),
+
+setRootPasswordNIS =>
+ __("If your network uses NIS, select \"Use NIS\". If you don't know, ask your
+network administrator."),
+
 addUser =>
  __("You may now create one or more \"regular\" user account(s), as
-opposed to the \"priviledged\" user account, root. You can create
+opposed to the \"privileged\" user account, root. You can create
 one or more account(s) for each person you want to allow to use
 the computer. Note that each user account will have its own
 preferences (graphical environment, program settings, etc.)
@@ -241,12 +275,12 @@ you will have created here, and login as root only for administration
 and maintenance purposes."),
 
 createBootdisk =>
- __("Please, please, answer \"Yes\" here! Just for example, when you
-reinstall Windows, it will overwrite the boot sector. Unless you have
-made the bootdisk as suggested, you won't be able to boot into Linux
-any more!"),
+ __("It is strongly recommended that you answer \"Yes\" here. If you install
+Microsoft Windows at a later date it will overwrite the boot sector.
+Unless you have made a bootdisk as suggested, you will not be able to
+boot into Linux any more."),
 
-setupBootloader =>
+setupBootloaderBeginner =>
  __("You need to indicate where you wish
 to place the information required to boot to Linux.
 
@@ -254,6 +288,49 @@ to place the information required to boot to Linux.
 Unless you know exactly what you are doing, choose \"First sector of
 drive (MBR)\"."),
 
+setupBootloader =>
+ __("Unless you know specifically otherwise, the usual choice is \"/dev/hda\"
+(the master drive on the primary channel)."),
+
+setupBootloaderAddEntry =>
+ __("LILO (the LInux LOader) can boot Linux and other operating systems.
+Normally they are correctly detected during installation. If you don't
+see yours detected, you can add one or more now.
+
+If you won't everybody can assess at one of them, you can remove it now
+(a boot disk will be needed to boot it)."),
+
+setupBootloaderGeneral =>
+ __("LILO main options are:
+  - Boot device: Sets the name of the device (e.g. a hard disk
+partition) that contains the boot sector. Unless you know specifically
+otherwise, choose \"/dev/hda\".
+
+  - Linear: Generate linear sector addresses instead of
+sector/head/cylinder addresses. Linear addresses are translated at run
+time and do not depend on disk geometry. Note that boot disks may not be
+portable if \"linear\" is used, because the BIOS service to determine the
+disk geometry does not work reliably for floppy  disks. When using
+\"linear\" with large disks, /sbin/lilo may generate references to
+inaccessible disk areas, because 3D sector addresses are not known
+before boot time.
+
+  - Compact: Tries to merge read requests for adjacent sectors into a
+single read request. This drastically reduces load time and keeps the
+map smaller. Using \"compact\" is especially recommended when booting from
+a floppy disk.
+
+  - Delay before booting default image: Specifies the number in tenths
+of a second the boot loader should wait before booting the first image.
+This is useful on systems that immediately boot from the hard disk after
+enabling the keyboard. The boot loader doesn't wait if \"delay\" is
+omitted or is set to zero.
+
+  - Video mode: This specifies the VGA text mode that should be selected
+when booting. The following values are available: 
+    * normal: select normal 80x25 text mode.
+    * <number>:  use the corresponding text mode."),
+
 configureX =>
  __("Now it's time to configure the X Window System, which is the
 core of the Linux GUI (Graphical User Interface). For this purpose,
@@ -267,247 +344,280 @@ ask DrakX not to) so that you can check and see if the
 settings suit you. If they don't, you can come back and
 change them, as many times as necessary."),
 
-miscellaneous =>
- __("You can now select some miscellaneous options for your system."),
-
-exitInstall =>
- __("Exit Linux-Mandrake installation to reboot your system."),
-);
-
-#- ################################################################################
-#- NO LONGER UP-TO-DATE...
-%steps_long = (
-selectLanguage =>
- __("Choose preferred language for install and system usage."),
-
-selectKeyboard =>
- __("Choose the layout corresponding to your keyboard from the list above"),
-
-selectPath =>
- __("Choose \"Installation\" if there are no previous versions of Linux
-installed, or if you wish to use multiple distributions or versions.
-
-
-Choose \"Update\" if you wish to update a previous version of Mandrake
-Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
-
-selectInstallClass =>
- __("Select:
-
-  - Beginner: If you have never installed Linux before, and wish to
-install the distribution elected \"Product of the year\" for 1999,
-click here.
-
-  - Developer: If you are familiar with Linux and will be using the
-computer primarily for software development, you will find happiness
-here.
-
-  - Server: If you wish to install a general purpose server, or the
-Linux distribution elected \"Distribution/Server\" for 1999, select
-this.
-
-  - Expert: If you are fluent with GNU/Linux and want to perform
-a highly customized installation, this Install Class is for you."),
-
-setupSCSI =>
- __("DrakX will attempt at first to look for one or more PCI
-SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
-to use, it will insert it (them)  automatically.
-
-If your SCSI adapter is ISA, or is PCI but DrakX doesn't know
-which driver to use for this card, or if you have no SCSI adapters
-at all, you will then be prompted on whether you have one or not.
-If you have none, answer \"No\". If you have one or more, answer
-\"Yes\". A list of drivers will then pop up, from which you will
-have to select one.
-
-After you have selected the driver, DrakX will ask if you
-want to specify options for it. First, try and let the driver
-probe for the hardware: it usually works fine.
-
-If not, do not forget the information on your hardware that you
-could get from you documentation or from Windows (if you have
-it on your system), as suggested by the installation guide.
-These are the options you will need to provide to the driver."),
-
-partitionDisks =>
- __("In this stage, you may choose what partition(s) use to install your
-Linux-Mandrake system."),
-
-#At this point, hard drive partitions must be defined. (Unless you
-#are overwriting a previous install of Linux and have already defined
-#your hard drive partitions as desired.) This operation consists of
-#logically dividing the computer's hard drive capacity into separate
-#areas for use.
-#
-#
-#Two common partition are: the root partition (/), which is the starting
-#point of the filesystem's directory hierarchy, and /boot, which contains
-#all files necessary to start the operating system when the
-#computer is first turned on.
-#
-#
-#Because the effects of this process are usually irreversible, partitioning
-#can be intimidating and stressful to the unexperienced. DiskDrake
-#simplifies the process so that it need not be. Consult the documentation
-#and take your time before proceeding."),
-
-formatPartitions =>
- __("Any partitions that have been newly defined must be formatted for
-use (formatting meaning creating a filesystem). At this time, you may
-wish to re-format some already existing partitions to erase the data
-they contain. Note: it is not necessary to re-format pre-existing
-partitions, particularly if they contain files or data you wish to keep.
-Typically retained are /home and /usr/local."),
-
-choosePackages =>
- __("You may now select the packages you wish to install.
-
-
-Please note that some packages require the installation of others.
-These are referred to as package dependencies. The packages you select,
-and the packages they require will be automatically selected for
-install. It is impossible to install a package without installing all
-of its dependencies.
-
-
-Information on each category and specific package is available in the
-area titled \"Info\",  located between list of packages and the five
-buttons \"Install\", \"Select more/less\" and \"Show more/less\"."),
-
-doInstallStep =>
- __("The packages selected are now being installed.
-
-
-This operation should take a few minutes."),
-
-selectMouse =>
- __("If DrakX failed to find your mouse, or if you want to
-check what it has done, you will be presented the list of mice
-above.
-
-
-If you agree with DrakX' settings, just jump to the section
-you want by clicking on it in the menu on the left. Otherwise,
-choose a mouse type in the menu which you think is the closest
-match for your mouse.
-
-In case of a serial mouse, you will also have to tell DrakX
-which serial port it is connected to."),
-
-configureNetwork =>
- __("This section is dedicated to configuring a local area network,
-or LAN. If you answer \"Yes\" here, DrakX will try to find an
-Ethernet adapter on your machine. PCI adapters should be found and
-initialized automatically. However, if your peripheral is ISA,
-autodetection will not work, and you will have to choose a driver
-from the list that will appear then.
-
-
-As for SCSI adapters, you can let the driver probe for the adapter
-in the first time, otherwise you will have to specify the options
-to the driver that you will have fetched from Windows' control
-panel.
-
-
-If you install a Linux-Mandrake system on a machine which is part
-of an already existing network, the network administrator will
-have given you all necessary information (IP address, network
-submask or netmask for short, and hostname). If you're setting
-up a private network at home for example, you should choose
-addresses "),
-
-configureTimezone =>
- __("Help"),
-
-configureServices =>
- __("Help"),
-
-configurePrinter =>
- __("Linux can deal with many types of printer. Each of these
-types require a different setup.
-
-
-If your printer is directly connected to your computer, select
-\"Local printer\". You will then have to tell which port your
-printer is connected to, and select the appropriate filter.
-
-
-If you want to access a printer located on a remote Unix machine,
-you will have to select \"Remote lpd queue\". In order to make
-it work, no username or password is required, but you will need
-to know the name of the printing queue on this server.
+configureXmain =>
+ __("If something is wrong in X configuration, use these options to correctly
+configure the X Window System."),
 
+configureXxdm =>
+ __("If you prefer to use a graphical login, select \"Yes\". Otherwise, select
+\"No\"."),
 
-If you want to access a SMB printer (which means, a printer located
-on a remote Windows 9x/NT machine), you will have to specify its
-SMB name (which is not its TCP/IP name), and possibly its IP address,
-plus the username, workgroup and password required in order to
-access the printer, and of course the name of the printer.The same goes
-for a NetWare printer, except that you need no workgroup information."),
-
-setRootPassword =>
- __("You must now enter the root password for your Linux-Mandrake
-system. The password must be entered twice to verify that both
-password entries are identical.
-
-
-Root is the administrator of the system, and is the only user
-allowed to modify the system configuration. Therefore, choose
-this password carefully! Unauthorized use of the root account can
-be extremely dangerous to the integrity of the system and its data,
-and other systems connected to it. The password should be a
-mixture of alphanumeric characters and a least 8 characters long. It
-should *never* be written down. Do not make the password too long or
-complicated, though: you must be able to remember without too much
-effort."),
-
-addUser =>
- __("You may now create one or more \"regular\" user account(s), as
-opposed to the \"priviledged\" user account, root. You can create
-one or more account(s) for each person you want to allow to use
-the computer. Note that each user account will have its own
-preferences (graphical environment, program settings, etc.)
-and its own \"home directory\", in which these preferences are
-stored.
-
-
-First of all, create an account for yourself! Even if you will be the only user
-of the machine, you may NOT connect as root for daily use of the system: it's a
-very high security risk. Making the system unusable is very often a typo away.
-
-
-Therefore, you should connect to the system using the user account
-you will have created here, and login as root only for administration
-and maintenance purposes."),
-
-createBootdisk =>
- __("Please, please, answer \"Yes\" here! Just for example, when you
-reinstall Windows, it will overwrite the boot sector. Unless you have
-made the bootdisk as suggested, you won't be able to boot into Linux
-any more!"),
-
-setupBootloader =>
- __("You need to indicate where you wish
-to place the information required to boot to Linux.
+miscellaneous =>
+ __("You can now select some miscellaneous options for you system.
 
+  - Use hard drive optimizations: This option can improve hard disk
+accesses but is only for advanced users, it can ruin your hard drive if
+used incorrectly. Use it only if you know how.
 
-Unless you know exactly what you are doing, choose \"First sector of
-drive (MBR)\"."),
+  - Choose security level: You can choose a security level for your
+system.
+    Please refer to the manual for more information.
 
-configureX =>
- __("Now it's time to configure the X Window System, which is the
-core of the Linux GUI (Graphical User Interface). For this purpose,
-you must configure your video card and monitor. Most of these
-steps are automated, though, therefore your work may only consist
-of verifying what has been done and accept the settings :)
+  - Precise RAM size if needed: In some cases, Linux is unable to
+correctly detect all the installed RAM on  some systems. If this is the
+case, specify the correct quantity. Note: a difference of 2 or 4 Mb is
+normal.
 
+  - Removable media automounting: If you would prefer not to manually
+mount removable drives (CD-ROM, Floppy, Zip) by typing \"mount and
+\"umount\", select this option. 
 
-When the configuration is over, X will be started (unless you
-ask DrakX not to) so that you can check and see if the
-settings suit you. If they don't, you can come back and
-change them, as many times as necessary."),
+  - Enable Num Lock at startup: If you want Number Lock enabled after
+booting, select this option (Note: Num Lock will still not work under
+X)."),
 
 exitInstall =>
- __("Help"),
+ __("Your system is going to reboot.
+
+After rebooting, your new Linux Mandrake system will load automatically.
+If you want to boot into another existing operating system, please read
+the additional instructions."),
 );
+
+#-#- ################################################################################
+#-#- NO LONGER UP-TO-DATE...
+#-%steps_long = (
+#-selectLanguage =>
+#- __("Choose preferred language for install and system usage."),
+#-
+#-selectKeyboard =>
+#- __("Choose the layout corresponding to your keyboard from the list above"),
+#-
+#-selectPath =>
+#- __("Choose \"Installation\" if there are no previous versions of Linux
+#-installed, or if you wish to use multiple distributions or versions.
+#-
+#-
+#-Choose \"Update\" if you wish to update a previous version of Mandrake
+#-Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
+#-
+#-selectInstallClass =>
+#- __("Select:
+#-
+#-  - Beginner: If you have never installed Linux before, and wish to
+#-install the distribution elected \"Product of the year\" for 1999,
+#-click here.
+#-
+#-  - Developer: If you are familiar with Linux and will be using the
+#-computer primarily for software development, you will find happiness
+#-here.
+#-
+#-  - Server: If you wish to install a general purpose server, or the
+#-Linux distribution elected \"Distribution/Server\" for 1999, select
+#-this.
+#-
+#-  - Expert: If you are fluent with GNU/Linux and want to perform
+#-a highly customized installation, this Install Class is for you."),
+#-
+#-setupSCSI =>
+#- __("DrakX will attempt at first to look for one or more PCI
+#-SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
+#-to use, it will insert it (them)  automatically.
+#-
+#-If your SCSI adapter is ISA, or is PCI but DrakX doesn't know
+#-which driver to use for this card, or if you have no SCSI adapters
+#-at all, you will then be prompted on whether you have one or not.
+#-If you have none, answer \"No\". If you have one or more, answer
+#-\"Yes\". A list of drivers will then pop up, from which you will
+#-have to select one.
+#-
+#-After you have selected the driver, DrakX will ask if you
+#-want to specify options for it. First, try and let the driver
+#-probe for the hardware: it usually works fine.
+#-
+#-If not, do not forget the information on your hardware that you
+#-could get from you documentation or from Windows (if you have
+#-it on your system), as suggested by the installation guide.
+#-These are the options you will need to provide to the driver."),
+#-
+#-partitionDisks =>
+#- __("In this stage, you may choose what partition(s) use to install your
+#-Linux-Mandrake system."),
+#-
+#-#At this point, hard drive partitions must be defined. (Unless you
+#-#are overwriting a previous install of Linux and have already defined
+#-#your hard drive partitions as desired.) This operation consists of
+#-#logically dividing the computer's hard drive capacity into separate
+#-#areas for use.
+#-#
+#-#
+#-#Two common partition are: the root partition (/), which is the starting
+#-#point of the filesystem's directory hierarchy, and /boot, which contains
+#-#all files necessary to start the operating system when the
+#-#computer is first turned on.
+#-#
+#-#
+#-#Because the effects of this process are usually irreversible, partitioning
+#-#can be intimidating and stressful to the unexperienced. DiskDrake
+#-#simplifies the process so that it need not be. Consult the documentation
+#-#and take your time before proceeding."),
+#-
+#-formatPartitions =>
+#- __("Any partitions that have been newly defined must be formatted for
+#-use (formatting meaning creating a filesystem). At this time, you may
+#-wish to re-format some already existing partitions to erase the data
+#-they contain. Note: it is not necessary to re-format pre-existing
+#-partitions, particularly if they contain files or data you wish to keep.
+#-Typically retained are /home and /usr/local."),
+#-
+#-choosePackages =>
+#- __("You may now select the packages you wish to install.
+#-
+#-
+#-Please note that some packages require the installation of others.
+#-These are referred to as package dependencies. The packages you select,
+#-and the packages they require will be automatically selected for
+#-install. It is impossible to install a package without installing all
+#-of its dependencies.
+#-
+#-
+#-Information on each category and specific package is available in the
+#-area titled \"Info\",  located between list of packages and the five
+#-buttons \"Install\", \"Select more/less\" and \"Show more/less\"."),
+#-
+#-doInstallStep =>
+#- __("The packages selected are now being installed.
+#-
+#-
+#-This operation should take a few minutes."),
+#-
+#-selectMouse =>
+#- __("If DrakX failed to find your mouse, or if you want to
+#-check what it has done, you will be presented the list of mice
+#-above.
+#-
+#-
+#-If you agree with DrakX' settings, just jump to the section
+#-you want by clicking on it in the menu on the left. Otherwise,
+#-choose a mouse type in the menu which you think is the closest
+#-match for your mouse.
+#-
+#-In case of a serial mouse, you will also have to tell DrakX
+#-which serial port it is connected to."),
+#-
+#-configureNetwork =>
+#- __("This section is dedicated to configuring a local area network,
+#-or LAN. If you answer \"Yes\" here, DrakX will try to find an
+#-Ethernet adapter on your machine. PCI adapters should be found and
+#-initialized automatically. However, if your peripheral is ISA,
+#-autodetection will not work, and you will have to choose a driver
+#-from the list that will appear then.
+#-
+#-
+#-As for SCSI adapters, you can let the driver probe for the adapter
+#-in the first time, otherwise you will have to specify the options
+#-to the driver that you will have fetched from Windows' control
+#-panel.
+#-
+#-
+#-If you install a Linux-Mandrake system on a machine which is part
+#-of an already existing network, the network administrator will
+#-have given you all necessary information (IP address, network
+#-submask or netmask for short, and hostname). If you're setting
+#-up a private network at home for example, you should choose
+#-addresses "),
+#-
+#-configureTimezone =>
+#- __("Help"),
+#-
+#-configureServices =>
+#- __("Help"),
+#-
+#-configurePrinter =>
+#- __("Linux can deal with many types of printer. Each of these
+#-types require a different setup.
+#-
+#-
+#-If your printer is directly connected to your computer, select
+#-\"Local printer\". You will then have to tell which port your
+#-printer is connected to, and select the appropriate filter.
+#-
+#-
+#-If you want to access a printer located on a remote Unix machine,
+#-you will have to select \"Remote lpd queue\". In order to make
+#-it work, no username or password is required, but you will need
+#-to know the name of the printing queue on this server.
+#-
+#-
+#-If you want to access a SMB printer (which means, a printer located
+#-on a remote Windows 9x/NT machine), you will have to specify its
+#-SMB name (which is not its TCP/IP name), and possibly its IP address,
+#-plus the username, workgroup and password required in order to
+#-access the printer, and of course the name of the printer.The same goes
+#-for a NetWare printer, except that you need no workgroup information."),
+#-
+#-setRootPassword =>
+#- __("You must now enter the root password for your Linux-Mandrake
+#-system. The password must be entered twice to verify that both
+#-password entries are identical.
+#-
+#-
+#-Root is the administrator of the system, and is the only user
+#-allowed to modify the system configuration. Therefore, choose
+#-this password carefully! Unauthorized use of the root account can
+#-be extremely dangerous to the integrity of the system and its data,
+#-and other systems connected to it. The password should be a
+#-mixture of alphanumeric characters and a least 8 characters long. It
+#-should *never* be written down. Do not make the password too long or
+#-complicated, though: you must be able to remember without too much
+#-effort."),
+#-
+#-addUser =>
+#- __("You may now create one or more \"regular\" user account(s), as
+#-opposed to the \"privileged\" user account, root. You can create
+#-one or more account(s) for each person you want to allow to use
+#-the computer. Note that each user account will have its own
+#-preferences (graphical environment, program settings, etc.)
+#-and its own \"home directory\", in which these preferences are
+#-stored.
+#-
+#-
+#-First of all, create an account for yourself! Even if you will be the only user
+#-of the machine, you may NOT connect as root for daily use of the system: it's a
+#-very high security risk. Making the system unusable is very often a typo away.
+#-
+#-
+#-Therefore, you should connect to the system using the user account
+#-you will have created here, and login as root only for administration
+#-and maintenance purposes."),
+#-
+#-createBootdisk =>
+#- __("Please, please, answer \"Yes\" here! Just for example, when you
+#-reinstall Windows, it will overwrite the boot sector. Unless you have
+#-made the bootdisk as suggested, you won't be able to boot into Linux
+#-any more!"),
+#-
+#-setupBootloader =>
+#- __("You need to indicate where you wish
+#-to place the information required to boot to Linux.
+#-
+#-
+#-Unless you know exactly what you are doing, choose \"First sector of
+#-drive (MBR)\"."),
+#-
+#-configureX =>
+#- __("Now it's time to configure the X Window System, which is the
+#-core of the Linux GUI (Graphical User Interface). For this purpose,
+#-you must configure your video card and monitor. Most of these
+#-steps are automated, though, therefore your work may only consist
+#-of verifying what has been done and accept the settings :)
+#-
+#-
+#-When the configuration is over, X will be started (unless you
+#-ask DrakX not to) so that you can check and see if the
+#-settings suit you. If they don't, you can come back and
+#-change them, as many times as necessary."),
+#-
+#-exitInstall =>
+#- __("Help"),
+#-);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 824c28149..bb90b8dce 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -13,7 +13,6 @@ use vars qw($o);
 use common qw(:common :file :system :functional);
 use install_any qw(:all);
 use log;
-use help;
 use commands;
 use network;
 use lang;
@@ -38,7 +37,7 @@ use install_steps_interactive;
 my (%installSteps, @orderedInstallSteps);
 {    
     my @installStepsFields = qw(text redoable onError hidden needs); 
-    #entered reachable toBeDone help next done;
+    #entered reachable toBeDone next done;
     my @installSteps = (
   selectLanguage     => [ __("Choose your language"), 1, 1, '' ],
   selectInstallClass => [ __("Select installation class"), 1, 1, '' ],
@@ -65,7 +64,6 @@ my (%installSteps, @orderedInstallSteps);
 );
     for (my $i = 0; $i < @installSteps; $i += 2) {
 	my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] };
-	$h{help}    = $help::steps{$installSteps[$i]} || __("Help");
 	$h{previous}= $installSteps[$i - 2] if $i >= 2;
 	$h{next}    = $installSteps[$i + 2];
 	$h{entered} = 0;
@@ -627,7 +625,7 @@ sub main {
     install_any::lnx4win_postinstall($o->{prefix}) if $o->{lnx4win};
     install_any::killCardServices();
 
-    run_program::rooted($o->{prefix}, "kudzu", "-q"); # -q <=> fermetagueuleconnard
+#-    run_program::rooted($o->{prefix}, "kudzu", "-q"); # -q <=> fermetagueuleconnard
 
     #- have the really bleeding edge ddebug.log for this f*cking msec :-/
     eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d48c29a39..7495445cc 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -72,7 +72,7 @@ Continue at your own risk."), $@ ]) if $@;
 
 sub errorInStep($$) { print "error :(\n"; exit 1 }
 sub kill_action {}
-
+sub set_help { 1 }
 
 #-######################################################################################
 #- Steps Functions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index aa72c0527..3414c39af 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -681,12 +681,20 @@ sub create_help_window {
 #-		    1, createScrolledWindow($w_help = new Gtk::XmHTML)));
 		    1, createScrolledWindow($w_help = new Gtk::Text)));
 #-    $w_help->source($o->{step} ? translate($o->{steps}{$o->{step}}{help}) : '');
-    gtktext_insert($w_help, $o->{step} ? formatAlaTeX(translate($o->{steps}{$o->{step}}{help})) : '');
+    gtktext_insert($w_help, $o->{step} ? formatAlaTeX(translate($help::steps{$o->{step}})) : '');
 
     $w->show;
     $o->{help_window} = $w;
 }
 
+sub set_help { 
+    shift;
+    gtktext_insert($w_help, 
+		   formatAlaTeX(join "\n", 
+				map { translate($help::steps{$_}) } @_));
+    1;
+}
+
 #------------------------------------------------------------------------------
 sub create_steps_window {
     my ($o) = @_;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 804eadd5c..a428682a3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -131,12 +131,15 @@ sub selectMouse {
 	$name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name);
 	$o->{mouse} = mouse::name2mouse($name);
     }
-    $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3 && (!$::expert || $o->ask_yesorno('', _("Emulate third button?"), 1));
-
-    $o->{mouse}{device} = mouse::serial_ports_names2dev(
-	$o->ask_from_list(_("Mouse Port"),
-			  _("Which serial port is your mouse connected to?"),
-			  [ mouse::serial_ports_names() ])) if $o->{mouse}{device} eq "ttyS";
+    $o->{mouse}{XEMU3} = 'yes'; #- if $o->{mouse}{nbuttons} < 3 && $o->ask_yesorno('', _("Emulate third button?"), 1);
+
+    if ($o->{mouse}{device} eq "ttyS") {
+	$o->set_help('selectSerialPort');
+	$o->{mouse}{device} = mouse::serial_ports_names2dev(
+	  $o->ask_from_list(_("Mouse Port"),
+			    _("Which serial port is your mouse connected to?"),
+			    [ mouse::serial_ports_names() ]));
+    }
 
     $o->setup_thiskind('serial_usb', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";
 
@@ -327,6 +330,7 @@ sub configureNetworkIntf {
     delete $intf->{NETWORK};
     delete $intf->{BROADCAST};
     my @fields = qw(IPADDR NETMASK);
+    $o->set_help('configureNetworkIP');
     $o->ask_from_entries_ref(_("Configuring network device %s", $intf->{DEVICE}),
 _("Please enter the IP configuration for this machine.
 Each item should be entered as an IP address in dotted-decimal
@@ -382,10 +386,12 @@ sub pppConfig {
 	}
     }
 
-    $m->{device} ||= mouse::serial_ports_names2dev(
+    $m->{device} ||= $o->set_help('selectSerialPort') && 
+                     mouse::serial_ports_names2dev(
 	$o->ask_from_list('', _("Which serial port is your modem connected to?"),
 			  [ mouse::serial_ports_names ]));
 
+    $o->set_help('configureNetworkISP');
     install_steps::pppConfig($o) if $o->ask_from_entries_refH('',
 							      _("Dialup options"), [
 _("Connection name") => \$m->{connection},
@@ -472,6 +478,10 @@ sub setRootPassword($) {
 
     return if $o->{security} < 1 && !$clicked;
 
+    $o->set_help("setRootPassword", 
+		 $o->{installClass} eq "server" || $::expert ? "setRootPasswordMd5" : (),
+		 $::beginner ? () : "setRootPasswordNIS");
+
     $o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 2 ? () : _("No password")],
 			 _("Set root password"), [
 _("Password") => { val => \$sup->{password},  hidden => 1 },
@@ -596,14 +606,17 @@ sub setupBootloader {
     if ($::beginner && $more == 1) {
 	my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition"));
 
+	$o->set_help('setupBootloaderBeginner');
 	my $boot = $o->{hds}[0]{device};
 	my $onmbr = "/dev/$boot" eq $b->{boot};
 	$b->{boot} = "/dev/$boot" if $o->ask_from_list_(_("LILO Installation"),
 			     _("Where do you want to install the bootloader?"),
 			     \@l, $l[!$onmbr]) eq $l[0];
     } elsif ($more || !$::beginner) {
+	$o->set_help("setupBootloaderGeneral");
+
 	$::expert and $o->ask_yesorno('', _("Do you want to use LILO?"), 1) || return;
-    
+
 	my @l = (
 _("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } @{$o->{hds}}, @{$o->{fstab}}), detect_devices::floppies ], not_edit => !$::expert },
 _("Linear (needed for some SCSI drives)") => { val => \$b->{linear}, type => "bool", text => _("linear") },
@@ -629,9 +642,10 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
     }
 
     until ($::beginner && $more <= 1) {
+	$o->set_help('setupBootloaderAddEntry');
 	my $c = $o->ask_from_list_([''], 
 _("Here are the following entries in LILO.
-You can add some more or change the existent ones."),
+You can add some more or change the existing ones."),
 		[ (sort @{[map_each { "$::b->{label} ($::a)" . ($b->{default} eq $::b->{label} && "  *") } %{$b->{entries}}]}), __("Add"), __("Done") ],
 	);
 	$c eq "Done" and last;
@@ -713,6 +727,7 @@ sub miscellaneousNetwork {
     my ($o, $clicked) = @_;
     my $u = $o->{miscellaneous} ||= {};
 
+    $o->set_help('configureNetworkProxy');
     !$::beginner || $clicked and $o->ask_from_entries_ref('',
        _("Proxies configuration"),
        [ _("HTTP proxy"),
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 823f9171d..161bef2c0 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -453,8 +453,8 @@ mailcap                                        5     0     4
 mailx                                         46    99    41
 make                                          50     0    94
 MAKEDEV                                       10    99    96
-mandrake_desk                                 82     0    70
-mandrake_doc                                  82     0    70
+mandrake_desk                                 88     0    88
+mandrake_doc                                  88     0    88
 MandrakeUpdate                                82    80    80
 man-pages                                     90     0    72
 man-pages-cs                                  20     0    20
@@ -611,7 +611,7 @@ slang-devel                                   10     0    70
 sliplogin                                      0    43     7
 slocate                                       99    99    99
 slrn                                          42     0    50
-sndconfig                                     90     0     0
+sndconfig                                     90     0    90
 sox                                           41    32    80
 sox-devel                                     13     0    70
 space_sounds                                  52     0    55
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index a5475ab2b..be18fc846 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-20 14:43+0100\n"
+"POT-Creation-Date: 1999-12-21 02:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,28 +232,28 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:773
+#: ../Xconfigurator.pm_.c:774
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:780
+#: ../Xconfigurator.pm_.c:781
 msgid "Forget the changes?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:795
+#: ../Xconfigurator.pm_.c:796
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:811
+#: ../Xconfigurator.pm_.c:812
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:813
+#: ../Xconfigurator.pm_.c:815
 msgid "X at startup"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:814
+#: ../Xconfigurator.pm_.c:816
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -411,8 +411,8 @@ msgstr ""
 msgid "Save on floppy"
 msgstr ""
 
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:517
-#: ../install_steps_interactive.pm_.c:635 ../standalone/adduserdrake_.c:26
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:527
+#: ../install_steps_interactive.pm_.c:649 ../standalone/adduserdrake_.c:26
 msgid "Done"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgstr ""
 msgid "Formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:210
+#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:213
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
@@ -759,9 +759,8 @@ msgstr ""
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:531 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:328
-#: ../install_steps_gtk.pm_.c:377
+#: ../diskdrake.pm_.c:531 ../install_steps_gtk.pm_.c:328
+#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
 msgid "MB"
 msgstr ""
 
@@ -876,11 +875,11 @@ msgstr ""
 msgid "You don't have any partitions!"
 msgstr ""
 
-#: ../help.pm_.c:7 ../help.pm_.c:280
+#: ../help.pm_.c:7
 msgid "Choose preferred language for install and system usage."
 msgstr ""
 
-#: ../help.pm_.c:10 ../help.pm_.c:283
+#: ../help.pm_.c:10
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr ""
 
@@ -891,10 +890,11 @@ msgid ""
 "\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."
+"Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1\n"
+"(Helios) or Gold 2000."
 msgstr ""
 
-#: ../help.pm_.c:21
+#: ../help.pm_.c:22
 msgid ""
 "Select:\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "be able to select the usage of your installed system as for \"Customized\"."
 msgstr ""
 
-#: ../help.pm_.c:39
+#: ../help.pm_.c:40
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -940,7 +940,7 @@ msgid ""
 "are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../help.pm_.c:63
+#: ../help.pm_.c:64
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -969,7 +969,7 @@ msgid ""
 "and take your time before proceeding."
 msgstr ""
 
-#: ../help.pm_.c:89 ../help.pm_.c:355
+#: ../help.pm_.c:90
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -979,7 +979,7 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../help.pm_.c:97
+#: ../help.pm_.c:98
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -1002,7 +1002,7 @@ msgid ""
 "button \"Install\" to start the installation."
 msgstr ""
 
-#: ../help.pm_.c:118
+#: ../help.pm_.c:119
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1010,7 +1010,7 @@ msgid ""
 "upgrade starts."
 msgstr ""
 
-#: ../help.pm_.c:124 ../help.pm_.c:384
+#: ../help.pm_.c:125
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1026,7 +1026,13 @@ msgid ""
 "which serial port it is connected to."
 msgstr ""
 
-#: ../help.pm_.c:138
+#: ../help.pm_.c:139
+msgid ""
+"Please select the correct port. For example, the COM1 port in MS Windows\n"
+"is named ttyS0 in Linux."
+msgstr ""
+
+#: ../help.pm_.c:143
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1058,7 +1064,33 @@ msgid ""
 "your modem is connected to."
 msgstr ""
 
-#: ../help.pm_.c:168
+#: ../help.pm_.c:173
+msgid ""
+"Enter:\n"
+"\n"
+"  - IP address: if you don't know it, ask your network administrator.\n"
+"\n"
+"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
+"sure, ask your network administrator.\n"
+"\n"
+"  - Automatic IP: If your network uses bootp or dhcpd protocol, select \n"
+"this option. If selected, no value is needed in \"IP address\". If you are\n"
+"not sure, ask your network administrator.\n"
+msgstr ""
+
+#: ../help.pm_.c:186
+msgid ""
+"You may now enter dialup options. If you're not sure what to enter, the\n"
+"correct information can be obtained from your ISP."
+msgstr ""
+
+#: ../help.pm_.c:190
+msgid ""
+"If you will use proxies, please configure them now. If you don't know if\n"
+"you will use proxies, ask your network administrator or your ISP."
+msgstr ""
+
+#: ../help.pm_.c:194
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1069,7 +1101,7 @@ msgid ""
 "to your legislation."
 msgstr ""
 
-#: ../help.pm_.c:175
+#: ../help.pm_.c:202
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1078,12 +1110,11 @@ msgid ""
 "in local time according to the time zone you have selected."
 msgstr ""
 
-#: ../help.pm_.c:182 ../help.pm_.c:420 ../help.pm_.c:423 ../help.pm_.c:511
-#: ../install2.pm_.c:68
+#: ../help.pm_.c:209
 msgid "Help"
 msgstr ""
 
-#: ../help.pm_.c:185
+#: ../help.pm_.c:212
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1108,7 +1139,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../help.pm_.c:208
+#: ../help.pm_.c:235
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1126,10 +1157,22 @@ msgid ""
 "effort."
 msgstr ""
 
-#: ../help.pm_.c:224 ../help.pm_.c:465
+#: ../help.pm_.c:251
+msgid ""
+"To enable a more secure system, you should select \"Use shadow file\" and\n"
+"\"Use MD5 passwords\"."
+msgstr ""
+
+#: ../help.pm_.c:255
+msgid ""
+"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
+"network administrator."
+msgstr ""
+
+#: ../help.pm_.c:259
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"priviledged\" user account, root. You can create\n"
+"opposed to the \"privileged\" user account, root. You can create\n"
 "one or more account(s) for each person you want to allow to use\n"
 "the computer. Note that each user account will have its own\n"
 "preferences (graphical environment, program settings, etc.)\n"
@@ -1150,15 +1193,15 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../help.pm_.c:243 ../help.pm_.c:484
+#: ../help.pm_.c:278
 msgid ""
-"Please, please, answer \"Yes\" here! Just for example, when you\n"
-"reinstall Windows, it will overwrite the boot sector. Unless you have\n"
-"made the bootdisk as suggested, you won't be able to boot into Linux\n"
-"any more!"
+"It is strongly recommended that you answer \"Yes\" here. If you install\n"
+"Microsoft Windows at a later date it will overwrite the boot sector.\n"
+"Unless you have made a bootdisk as suggested, you will not be able to\n"
+"boot into Linux any more."
 msgstr ""
 
-#: ../help.pm_.c:249 ../help.pm_.c:490
+#: ../help.pm_.c:284
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1168,286 +1211,223 @@ msgid ""
 "drive (MBR)\"."
 msgstr ""
 
-#: ../help.pm_.c:257 ../help.pm_.c:498
+#: ../help.pm_.c:292
 msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
-"\n"
-"\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
-msgstr ""
-
-#: ../help.pm_.c:270
-msgid "You can now select some miscellaneous options for your system."
+"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+"(the master drive on the primary channel)."
 msgstr ""
 
-#: ../help.pm_.c:273
-msgid "Exit Linux-Mandrake installation to reboot your system."
-msgstr ""
-
-#: ../help.pm_.c:286
+#: ../help.pm_.c:296
 msgid ""
-"Choose \"Installation\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
-"\n"
+"LILO (the LInux LOader) can boot Linux and other operating systems.\n"
+"Normally they are correctly detected during installation. If you don't\n"
+"see yours detected, you can add one or more now.\n"
 "\n"
-"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+"If you won't everybody can assess at one of them, you can remove it now\n"
+"(a boot disk will be needed to boot it)."
 msgstr ""
 
-#: ../help.pm_.c:294
+#: ../help.pm_.c:304
 msgid ""
-"Select:\n"
+"LILO main options are:\n"
+"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+"partition) that contains the boot sector. Unless you know specifically\n"
+"otherwise, choose \"/dev/hda\".\n"
 "\n"
-"  - Beginner: If you have never installed Linux before, and wish to\n"
-"install the distribution elected \"Product of the year\" for 1999,\n"
-"click here.\n"
+"  - Linear: Generate linear sector addresses instead of\n"
+"sector/head/cylinder addresses. Linear addresses are translated at run\n"
+"time and do not depend on disk geometry. Note that boot disks may not be\n"
+"portable if \"linear\" is used, because the BIOS service to determine the\n"
+"disk geometry does not work reliably for floppy  disks. When using\n"
+"\"linear\" with large disks, /sbin/lilo may generate references to\n"
+"inaccessible disk areas, because 3D sector addresses are not known\n"
+"before boot time.\n"
 "\n"
-"  - Developer: If you are familiar with Linux and will be using the\n"
-"computer primarily for software development, you will find happiness\n"
-"here.\n"
+"  - Compact: Tries to merge read requests for adjacent sectors into a\n"
+"single read request. This drastically reduces load time and keeps the\n"
+"map smaller. Using \"compact\" is especially recommended when booting from\n"
+"a floppy disk.\n"
 "\n"
-"  - Server: If you wish to install a general purpose server, or the\n"
-"Linux distribution elected \"Distribution/Server\" for 1999, select\n"
-"this.\n"
+"  - Delay before booting default image: Specifies the number in tenths\n"
+"of a second the boot loader should wait before booting the first image.\n"
+"This is useful on systems that immediately boot from the hard disk after\n"
+"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+"omitted or is set to zero.\n"
 "\n"
-"  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you."
+"  - Video mode: This specifies the VGA text mode that should be selected\n"
+"when booting. The following values are available: \n"
+"    * normal: select normal 80x25 text mode.\n"
+"    * <number>:  use the corresponding text mode."
 msgstr ""
 
-#: ../help.pm_.c:312
+#: ../help.pm_.c:335
 msgid ""
-"DrakX will attempt at first to look for one or more PCI\n"
-"SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
-"to use, it will insert it (them)  automatically.\n"
-"\n"
-"If your SCSI adapter is ISA, or is PCI but DrakX doesn't know\n"
-"which driver to use for this card, or if you have no SCSI adapters\n"
-"at all, you will then be prompted on whether you have one or not.\n"
-"If you have none, answer \"No\". If you have one or more, answer\n"
-"\"Yes\". A list of drivers will then pop up, from which you will\n"
-"have to select one.\n"
-"\n"
-"After you have selected the driver, DrakX will ask if you\n"
-"want to specify options for it. First, try and let the driver\n"
-"probe for the hardware: it usually works fine.\n"
-"\n"
-"If not, do not forget the information on your hardware that you\n"
-"could get from you documentation or from Windows (if you have\n"
-"it on your system), as suggested by the installation guide.\n"
-"These are the options you will need to provide to the driver."
-msgstr ""
-
-#: ../help.pm_.c:333
-msgid ""
-"In this stage, you may choose what partition(s) use to install your\n"
-"Linux-Mandrake system."
-msgstr ""
-
-#: ../help.pm_.c:363
-msgid ""
-"You may now select the packages you wish to install.\n"
-"\n"
-"\n"
-"Please note that some packages require the installation of others.\n"
-"These are referred to as package dependencies. The packages you select,\n"
-"and the packages they require will be automatically selected for\n"
-"install. It is impossible to install a package without installing all\n"
-"of its dependencies.\n"
+"Now it's time to configure the X Window System, which is the\n"
+"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
+"you must configure your video card and monitor. Most of these\n"
+"steps are automated, though, therefore your work may only consist\n"
+"of verifying what has been done and accept the settings :)\n"
 "\n"
 "\n"
-"Information on each category and specific package is available in the\n"
-"area titled \"Info\",  located between list of packages and the five\n"
-"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+"When the configuration is over, X will be started (unless you\n"
+"ask DrakX not to) so that you can check and see if the\n"
+"settings suit you. If they don't, you can come back and\n"
+"change them, as many times as necessary."
 msgstr ""
 
-#: ../help.pm_.c:378
+#: ../help.pm_.c:348
 msgid ""
-"The packages selected are now being installed.\n"
-"\n"
-"\n"
-"This operation should take a few minutes."
+"If something is wrong in X configuration, use these options to correctly\n"
+"configure the X Window System."
 msgstr ""
 
-#: ../help.pm_.c:398
+#: ../help.pm_.c:352
 msgid ""
-"This section is dedicated to configuring a local area network,\n"
-"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
-"Ethernet adapter on your machine. PCI adapters should be found and\n"
-"initialized automatically. However, if your peripheral is ISA,\n"
-"autodetection will not work, and you will have to choose a driver\n"
-"from the list that will appear then.\n"
-"\n"
-"\n"
-"As for SCSI adapters, you can let the driver probe for the adapter\n"
-"in the first time, otherwise you will have to specify the options\n"
-"to the driver that you will have fetched from Windows' control\n"
-"panel.\n"
-"\n"
-"\n"
-"If you install a Linux-Mandrake system on a machine which is part\n"
-"of an already existing network, the network administrator will\n"
-"have given you all necessary information (IP address, network\n"
-"submask or netmask for short, and hostname). If you're setting\n"
-"up a private network at home for example, you should choose\n"
-"addresses "
+"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
+"\"No\"."
 msgstr ""
 
-#: ../help.pm_.c:426
+#: ../help.pm_.c:356
 msgid ""
-"Linux can deal with many types of printer. Each of these\n"
-"types require a different setup.\n"
-"\n"
+"You can now select some miscellaneous options for you system.\n"
 "\n"
-"If your printer is directly connected to your computer, select\n"
-"\"Local printer\". You will then have to tell which port your\n"
-"printer is connected to, and select the appropriate filter.\n"
+"  - Use hard drive optimizations: This option can improve hard disk\n"
+"accesses but is only for advanced users, it can ruin your hard drive if\n"
+"used incorrectly. Use it only if you know how.\n"
 "\n"
+"  - Choose security level: You can choose a security level for your\n"
+"system.\n"
+"    Please refer to the manual for more information.\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine,\n"
-"you will have to select \"Remote lpd queue\". In order to make\n"
-"it work, no username or password is required, but you will need\n"
-"to know the name of the printing queue on this server.\n"
+"  - Precise RAM size if needed: In some cases, Linux is unable to\n"
+"correctly detect all the installed RAM on  some systems. If this is the\n"
+"case, specify the correct quantity. Note: a difference of 2 or 4 Mb is\n"
+"normal.\n"
 "\n"
+"  - Removable media automounting: If you would prefer not to manually\n"
+"mount removable drives (CD-ROM, Floppy, Zip) by typing \"mount and\n"
+"\"umount\", select this option. \n"
 "\n"
-"If you want to access a SMB printer (which means, a printer located\n"
-"on a remote Windows 9x/NT machine), you will have to specify its\n"
-"SMB name (which is not its TCP/IP name), and possibly its IP address,\n"
-"plus the username, workgroup and password required in order to\n"
-"access the printer, and of course the name of the printer.The same goes\n"
-"for a NetWare printer, except that you need no workgroup information."
+"  - Enable Num Lock at startup: If you want Number Lock enabled after\n"
+"booting, select this option (Note: Num Lock will still not work under\n"
+"X)."
 msgstr ""
 
-#: ../help.pm_.c:449
+#: ../help.pm_.c:380
 msgid ""
-"You must now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
-"\n"
+"Your system is going to reboot.\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should *never* be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"After rebooting, your new Linux Mandrake system will load automatically.\n"
+"If you want to boot into another existing operating system, please read\n"
+"the additional instructions."
 msgstr ""
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:42
 msgid "Choose your language"
 msgstr ""
 
-#: ../install2.pm_.c:44
+#: ../install2.pm_.c:43
 msgid "Select installation class"
 msgstr ""
 
-#: ../install2.pm_.c:45
+#: ../install2.pm_.c:44
 msgid "Setup SCSI"
 msgstr ""
 
-#: ../install2.pm_.c:46
+#: ../install2.pm_.c:45
 msgid "Choose install or upgrade"
 msgstr ""
 
-#: ../install2.pm_.c:47
+#: ../install2.pm_.c:46
 msgid "Configure mouse"
 msgstr ""
 
-#: ../install2.pm_.c:48
+#: ../install2.pm_.c:47
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../install2.pm_.c:49
+#: ../install2.pm_.c:48
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../install2.pm_.c:50
+#: ../install2.pm_.c:49
 msgid "Setup filesystems"
 msgstr ""
 
-#: ../install2.pm_.c:51
+#: ../install2.pm_.c:50
 msgid "Format partitions"
 msgstr ""
 
-#: ../install2.pm_.c:52
+#: ../install2.pm_.c:51
 msgid "Choose packages to install"
 msgstr ""
 
-#: ../install2.pm_.c:53
+#: ../install2.pm_.c:52
 msgid "Install system"
 msgstr ""
 
-#: ../install2.pm_.c:54
+#: ../install2.pm_.c:53
 msgid "Configure networking"
 msgstr ""
 
-#: ../install2.pm_.c:55
+#: ../install2.pm_.c:54
 msgid "Cryptographic"
 msgstr ""
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:55
 msgid "Configure timezone"
 msgstr ""
 
-#: ../install2.pm_.c:58
+#: ../install2.pm_.c:57
 msgid "Configure printer"
 msgstr ""
 
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:475
-#: ../install_steps_interactive.pm_.c:476
+#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:486
 msgid "Set root password"
 msgstr ""
 
-#: ../install2.pm_.c:60
+#: ../install2.pm_.c:59
 msgid "Add a user"
 msgstr ""
 
-#: ../install2.pm_.c:61
+#: ../install2.pm_.c:60
 msgid "Create a bootdisk"
 msgstr ""
 
-#: ../install2.pm_.c:62
+#: ../install2.pm_.c:61
 msgid "Install bootloader"
 msgstr ""
 
-#: ../install2.pm_.c:63
+#: ../install2.pm_.c:62
 msgid "Configure X"
 msgstr ""
 
-#: ../install2.pm_.c:64
+#: ../install2.pm_.c:63
 msgid "Exit install"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "beginner"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "developer"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "expert"
 msgstr ""
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "server"
 msgstr ""
 
-#: ../install2.pm_.c:309
+#: ../install2.pm_.c:307
 msgid "Partitioning failed: no root filesystem"
 msgstr ""
 
-#: ../install2.pm_.c:323
+#: ../install2.pm_.c:321
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
@@ -1504,7 +1484,7 @@ msgstr ""
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: ../install_steps.pm_.c:508
+#: ../install_steps.pm_.c:502
 msgid "No floppy drive available"
 msgstr ""
 
@@ -1513,123 +1493,119 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:292
+#: ../install_steps_gtk.pm_.c:258
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first run scandisk "
+"(and\n"
+"optionally run defrag) on this partition and backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:276
+msgid "Automatic resizing failed"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:292 ../unused/install_steps_graphical.pm_.c:255
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:294
+#: ../install_steps_gtk.pm_.c:294 ../unused/install_steps_graphical.pm_.c:258
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:328
+#: ../install_steps_gtk.pm_.c:325
+#, c-format
+msgid "Going to install %d MB. You can choose to install more programs"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:326
+msgid "You will be able to choose more precisely in next step"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:328
 msgid "Choose the size you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:377
+#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:389
+#: ../install_steps_gtk.pm_.c:389 ../unused/install_steps_graphical.pm_.c:284
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:390
+#: ../install_steps_gtk.pm_.c:390 ../unused/install_steps_graphical.pm_.c:285
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:505
+#: ../install_steps_gtk.pm_.c:505 ../unused/install_steps_graphical.pm_.c:421
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:508
+#: ../install_steps_gtk.pm_.c:508 ../unused/install_steps_graphical.pm_.c:424
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:516
-#: ../install_steps_interactive.pm_.c:80
+#: ../install_steps_gtk.pm_.c:516 ../install_steps_interactive.pm_.c:80
+#: ../unused/install_steps_graphical.pm_.c:432
 msgid "Install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:535
-#: ../install_steps_interactive.pm_.c:249
+#: ../install_steps_gtk.pm_.c:535 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:451
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:542
+#: ../install_steps_gtk.pm_.c:538
+msgid "Estimating"
+msgstr ""
+
+#: ../install_steps_gtk.pm_.c:542 ../unused/install_steps_graphical.pm_.c:457
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:544
+#: ../install_steps_gtk.pm_.c:544 ../unused/install_steps_graphical.pm_.c:459
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:545
+#: ../install_steps_gtk.pm_.c:545 ../unused/install_steps_graphical.pm_.c:460
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:550
-#: ../install_steps_interactive.pm_.c:249
+#: ../install_steps_gtk.pm_.c:550 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:465
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:565
+#: ../install_steps_gtk.pm_.c:560
 #, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:779
-msgid "Use existing configuration for X11?"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:258
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
+msgid "%d packages"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:276
-msgid "Automatic resizing failed"
+#: ../install_steps_gtk.pm_.c:560
+msgid ", %U MB"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:325
+#: ../install_steps_gtk.pm_.c:565 ../unused/install_steps_graphical.pm_.c:486
 #, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:326
-msgid "You will be able to choose more precisely in next step"
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:538
-msgid "Estimating"
+msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:560
-#, c-format
-msgid "%d packages"
+#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
+msgid "Go on anyway?"
 msgstr ""
 
-#: ../install_steps_gtk.pm_.c:560
-msgid ", %U MB"
+#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
+msgid "There was an error ordering packages:"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:36
@@ -1709,140 +1685,136 @@ msgstr ""
 msgid "What is the type of your mouse?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:134 ../standalone/mousedrake_.c:35
-msgid "Emulate third button?"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:137 ../standalone/mousedrake_.c:38
+#: ../install_steps_interactive.pm_.c:139 ../standalone/mousedrake_.c:38
 msgid "Mouse Port"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:138 ../standalone/mousedrake_.c:39
+#: ../install_steps_interactive.pm_.c:140 ../standalone/mousedrake_.c:39
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:153
+#: ../install_steps_interactive.pm_.c:156
 msgid "no available partitions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:155
+#: ../install_steps_interactive.pm_.c:158
 #, c-format
 msgid "(%dMb)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:162
+#: ../install_steps_interactive.pm_.c:165
 msgid "Which partition do you want to use as your root partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:169
+#: ../install_steps_interactive.pm_.c:172
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:181
+#: ../install_steps_interactive.pm_.c:184
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:200
+#: ../install_steps_interactive.pm_.c:203
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:219
+#: ../install_steps_interactive.pm_.c:222
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:228
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:234
+#: ../install_steps_interactive.pm_.c:237
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:258
+#: ../install_steps_interactive.pm_.c:261
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:267
+#: ../install_steps_interactive.pm_.c:270
 msgid "Post install configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:278
+#: ../install_steps_interactive.pm_.c:281
 msgid "Keep the current IP configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:279
+#: ../install_steps_interactive.pm_.c:282
 msgid "Reconfigure network now"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:280
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:295
 msgid "Do not set up networking"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:282
-#: ../install_steps_interactive.pm_.c:290
+#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:293
 msgid "Network Configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:286
 msgid "Local networking has already been configured. Do you want to:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:291
+#: ../install_steps_interactive.pm_.c:294
 msgid "Do you want to configure networking for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:295
 msgid "Dialup with modem"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:295
 msgid "Local LAN"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:301
+#: ../install_steps_interactive.pm_.c:304
 msgid "no network card found"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:330
+#: ../install_steps_interactive.pm_.c:334
 #, c-format
 msgid "Configuring network device %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:335
 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 ""
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "Automatic IP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "IP address:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "Netmask:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:335
+#: ../install_steps_interactive.pm_.c:339
 msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:341 ../printerdrake.pm_.c:149
+#: ../install_steps_interactive.pm_.c:345 ../printerdrake.pm_.c:149
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:359
+#: ../install_steps_interactive.pm_.c:363
 msgid "Configuring network"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:360
+#: ../install_steps_interactive.pm_.c:364
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -1850,236 +1822,236 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "DNS server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Host name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:377
+#: ../install_steps_interactive.pm_.c:381
 msgid "Try to find a modem?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:386
+#: ../install_steps_interactive.pm_.c:391
 msgid "Which serial port is your modem connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:396
 msgid "Dialup options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:391
+#: ../install_steps_interactive.pm_.c:397
 msgid "Connection name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:398
 msgid "Phone number"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:393
+#: ../install_steps_interactive.pm_.c:399
 msgid "Login ID"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:394
-#: ../install_steps_interactive.pm_.c:477
-#: ../install_steps_interactive.pm_.c:523
-#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:32
+#: ../install_steps_interactive.pm_.c:400
+#: ../install_steps_interactive.pm_.c:487
+#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:627 ../standalone/adduserdrake_.c:32
 msgid "Password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Authentication"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "CHAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "PAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Script-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Terminal-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:396
+#: ../install_steps_interactive.pm_.c:402
 msgid "Domain name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:397
+#: ../install_steps_interactive.pm_.c:403
 msgid "First DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:404
 msgid "Second DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:411
+#: ../install_steps_interactive.pm_.c:417
 msgid "Bringing up the network"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:432
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:431
+#: ../install_steps_interactive.pm_.c:437
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:435
+#: ../install_steps_interactive.pm_.c:441
 msgid "Which packages do you want to install"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:437
+#: ../install_steps_interactive.pm_.c:443
 msgid "Downloading cryptographic packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:453
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:448
+#: ../install_steps_interactive.pm_.c:454
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:458
+#: ../install_steps_interactive.pm_.c:464
 msgid "Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:459
+#: ../install_steps_interactive.pm_.c:465
 msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:475
+#: ../install_steps_interactive.pm_.c:485
 msgid "No password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:475
-#: ../install_steps_interactive.pm_.c:685 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:699 ../interactive.pm_.c:74
 #: ../interactive.pm_.c:84 ../interactive.pm_.c:163
 #: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
-#: ../my_gtk.pm_.c:523
+#: ../my_gtk.pm_.c:523 ../unused/install_steps_graphical.pm_.c:608
 msgid "Ok"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:478
-#: ../install_steps_interactive.pm_.c:524 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:33
 msgid "Password (again)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:480
+#: ../install_steps_interactive.pm_.c:490
 msgid "Use shadow file"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:480
+#: ../install_steps_interactive.pm_.c:490
 msgid "shadow"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:491
 msgid "MD5"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:491
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:483
+#: ../install_steps_interactive.pm_.c:493
 msgid "Use NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:483
+#: ../install_steps_interactive.pm_.c:493
 msgid "yellow pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:487
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
 msgid "Please try again"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:487
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:536 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:499
+#: ../install_steps_interactive.pm_.c:546 ../standalone/adduserdrake_.c:45
 msgid "This password is too simple"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:506
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:507
 msgid "NIS Domain"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:507
 msgid "NIS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:517 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:527 ../standalone/adduserdrake_.c:26
 msgid "Accept user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:517 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:527 ../standalone/adduserdrake_.c:26
 msgid "Add user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:518 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:528 ../standalone/adduserdrake_.c:27
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:518 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:528 ../standalone/adduserdrake_.c:27
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:520 ../standalone/adduserdrake_.c:29
+#: ../install_steps_interactive.pm_.c:530 ../standalone/adduserdrake_.c:29
 msgid "Real name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:521 ../standalone/adduserdrake_.c:30
+#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:30
 msgid "User name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:526 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:536 ../standalone/adduserdrake_.c:35
 msgid "Shell"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:537 ../standalone/adduserdrake_.c:46
+#: ../install_steps_interactive.pm_.c:547 ../standalone/adduserdrake_.c:46
 msgid "Please give a user name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:538 ../standalone/adduserdrake_.c:47
+#: ../install_steps_interactive.pm_.c:548 ../standalone/adduserdrake_.c:47
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:539 ../standalone/adduserdrake_.c:48
+#: ../install_steps_interactive.pm_.c:549 ../standalone/adduserdrake_.c:48
 msgid "This user name is already added"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:560
+#: ../install_steps_interactive.pm_.c:570
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -2093,266 +2065,267 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:579
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:572
+#: ../install_steps_interactive.pm_.c:582
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:573
+#: ../install_steps_interactive.pm_.c:583
 msgid "Skip"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:577
+#: ../install_steps_interactive.pm_.c:587
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:578
+#: ../install_steps_interactive.pm_.c:588
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:585
+#: ../install_steps_interactive.pm_.c:595
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:597
+#: ../install_steps_interactive.pm_.c:607
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:597
+#: ../install_steps_interactive.pm_.c:607
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:601
+#: ../install_steps_interactive.pm_.c:612
 msgid "LILO Installation"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:602
+#: ../install_steps_interactive.pm_.c:613
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:605
+#: ../install_steps_interactive.pm_.c:618
 msgid "Do you want to use LILO?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:621
 msgid "Boot device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:622
 msgid "Linear (needed for some SCSI drives)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:622
 msgid "linear"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:610
+#: ../install_steps_interactive.pm_.c:623
 msgid "Compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:610
+#: ../install_steps_interactive.pm_.c:623
 msgid "compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:624
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:612
+#: ../install_steps_interactive.pm_.c:625
 msgid "Video mode"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:628
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:628
 msgid "restrict"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:634
 msgid "LILO main options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:624
+#: ../install_steps_interactive.pm_.c:637
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:647
 msgid ""
 "Here are the following entries in LILO.\n"
-"You can add some more or change the existent ones."
+"You can add some more or change the existing ones."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:649
 msgid "Add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Linux"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Which type of entry do you want to add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:678
 msgid "Image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:665
-#: ../install_steps_interactive.pm_.c:673
+#: ../install_steps_interactive.pm_.c:679
+#: ../install_steps_interactive.pm_.c:687
 msgid "Root"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:666
+#: ../install_steps_interactive.pm_.c:680
 msgid "Append"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:667
+#: ../install_steps_interactive.pm_.c:681
 msgid "Initrd"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:668
+#: ../install_steps_interactive.pm_.c:682
 msgid "Read-write"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:688
 msgid "Table"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:689
 msgid "Unsafe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:694
 msgid "Label"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:696
 msgid "Default"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:685
+#: ../install_steps_interactive.pm_.c:699
 msgid "Remove entry"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:702
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:703
 msgid "This label is already in use"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:690
+#: ../install_steps_interactive.pm_.c:704
 #, c-format
 msgid "A entry %s already exists"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:718
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:717
+#: ../install_steps_interactive.pm_.c:732
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:718
+#: ../install_steps_interactive.pm_.c:733
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:719
+#: ../install_steps_interactive.pm_.c:734
 msgid "FTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:725
+#: ../install_steps_interactive.pm_.c:740
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:741
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:736 ../standalone/draksec_.c:20
-msgid "Windows(TM)"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:737 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:752 ../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:738 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:753 ../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:739 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:740 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:741 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:769
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:770
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:770
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:29
+#: ../install_steps_interactive.pm_.c:771 ../standalone/draksec_.c:29
 msgid "Choose security level"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:757
+#: ../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:758
+#: ../install_steps_interactive.pm_.c:773
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:760
+#: ../install_steps_interactive.pm_.c:775
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:763
+#: ../install_steps_interactive.pm_.c:778
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:791
-#: ../install_steps_interactive.pm_.c:904
-msgid "Try to find PCI devices?"
+#: ../install_steps_interactive.pm_.c:794
+#: ../unused/install_steps_graphical.pm_.c:535
+msgid "Use existing configuration for X11?"
 msgstr ""
 
 #: ../install_steps_interactive.pm_.c:806
+#: ../install_steps_interactive.pm_.c:919
+msgid "Try to find PCI devices?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:821
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:813
+#: ../install_steps_interactive.pm_.c:828
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2365,26 +2338,26 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:822
+#: ../install_steps_interactive.pm_.c:837
 msgid "Shutting down"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:836
+#: ../install_steps_interactive.pm_.c:851
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:837
+#: ../install_steps_interactive.pm_.c:852
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:847
+#: ../install_steps_interactive.pm_.c:862
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:855
+#: ../install_steps_interactive.pm_.c:870
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2396,20 +2369,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:860
+#: ../install_steps_interactive.pm_.c:875
 msgid "Autoprobe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:860
+#: ../install_steps_interactive.pm_.c:875
 msgid "Specify options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:864
+#: ../install_steps_interactive.pm_.c:879
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:870
+#: ../install_steps_interactive.pm_.c:885
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2417,54 +2390,54 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:873
+#: ../install_steps_interactive.pm_.c:888
 msgid "Module options:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:883
+#: ../install_steps_interactive.pm_.c:898
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:896
+#: ../install_steps_interactive.pm_.c:911
 msgid "Try to find PCMCIA cards?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:912
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:912
 msgid "PCMCIA"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:908
+#: ../install_steps_interactive.pm_.c:923
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:909
+#: ../install_steps_interactive.pm_.c:924
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:910
+#: ../install_steps_interactive.pm_.c:925
 #, c-format
 msgid "Do you have any %s interface?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:912 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
 #: ../my_gtk.pm_.c:422 ../printerdrake.pm_.c:176
 msgid "No"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:912 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
 #: ../my_gtk.pm_.c:422
 msgid "Yes"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:913
+#: ../install_steps_interactive.pm_.c:928
 msgid "See hardware info"
 msgstr ""
 
@@ -3079,6 +3052,10 @@ msgstr ""
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
+#: ../standalone/draksec_.c:20
+msgid "Windows(TM)"
+msgstr ""
+
 #: ../standalone/draksec_.c:30
 msgid "Setting security level"
 msgstr ""
@@ -3094,3 +3071,15 @@ msgstr ""
 #: ../standalone/mousedrake_.c:30
 msgid "no serial_usb found\n"
 msgstr ""
+
+#: ../standalone/mousedrake_.c:35
+msgid "Emulate third button?"
+msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:433
+msgid "Show less"
+msgstr ""
+
+#: ../unused/install_steps_graphical.pm_.c:434
+msgid "Show more"
+msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index f91617e21..ae3f5a59a 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-12-20 14:43+0100\n"
+"POT-Creation-Date: 1999-12-21 02:28+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -251,28 +251,28 @@ msgstr "Test igjen"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../Xconfigurator.pm_.c:773
+#: ../Xconfigurator.pm_.c:774
 msgid "What do you want to do?"
 msgstr "Hva vil du gjøre?"
 
-#: ../Xconfigurator.pm_.c:780
+#: ../Xconfigurator.pm_.c:781
 msgid "Forget the changes?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:795
+#: ../Xconfigurator.pm_.c:796
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Vennligst logg inn i %s på nytt for å aktivere endringene"
 
-#: ../Xconfigurator.pm_.c:811
+#: ../Xconfigurator.pm_.c:812
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk så Ctrl-Alt-BackSpace"
 
-#: ../Xconfigurator.pm_.c:813
+#: ../Xconfigurator.pm_.c:815
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../Xconfigurator.pm_.c:814
+#: ../Xconfigurator.pm_.c:816
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -432,8 +432,8 @@ msgstr "Gjenopprett fra diskett"
 msgid "Save on floppy"
 msgstr "Lagre på diskett"
 
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:517
-#: ../install_steps_interactive.pm_.c:635 ../standalone/adduserdrake_.c:26
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:527
+#: ../install_steps_interactive.pm_.c:649 ../standalone/adduserdrake_.c:26
 msgid "Done"
 msgstr "Ferdig"
 
@@ -734,7 +734,7 @@ msgstr "formatering"
 msgid "Formatting"
 msgstr "Formatering"
 
-#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:210
+#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:213
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
@@ -797,9 +797,8 @@ msgstr "endrer størrelse"
 msgid "Choose the new size"
 msgstr "Velg den nye størrelsen"
 
-#: ../diskdrake.pm_.c:531 ../install_steps_graphical.pm_.c:287
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:328
-#: ../install_steps_gtk.pm_.c:377
+#: ../diskdrake.pm_.c:531 ../install_steps_gtk.pm_.c:328
+#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
 msgid "MB"
 msgstr "MB"
 
@@ -920,22 +919,24 @@ msgstr ""
 msgid "You don't have any partitions!"
 msgstr "Du har ingen partisjoner!"
 
-#: ../help.pm_.c:7 ../help.pm_.c:280
+#: ../help.pm_.c:7
 msgid "Choose preferred language for install and system usage."
 msgstr "Velg ønsket språk for installering og systembruk."
 
-#: ../help.pm_.c:10 ../help.pm_.c:283
+#: ../help.pm_.c:10
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor"
 
 #: ../help.pm_.c:13
+#, fuzzy
 msgid ""
 "Choose \"Install\" if there are no previous versions of Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
 "\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."
+"Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1\n"
+"(Helios) or Gold 2000."
 msgstr ""
 "Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
 "av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
@@ -947,7 +948,7 @@ msgstr ""
 "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) eller 6.1 "
 "(Helios)."
 
-#: ../help.pm_.c:21
+#: ../help.pm_.c:22
 msgid ""
 "Select:\n"
 "\n"
@@ -984,7 +985,7 @@ msgstr ""
 "egendefinert installasjon så er dette installasjonsvalget for deg. Du vil\n"
 "kunne velge bruk av systemet som skal installeres som med \"Egendefinert\"."
 
-#: ../help.pm_.c:39
+#: ../help.pm_.c:40
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1032,7 +1033,7 @@ msgstr ""
 "som foreslått i installasjonsguiden. Dette er opsjonene du vil trenge å\n"
 "gi til driveren."
 
-#: ../help.pm_.c:63
+#: ../help.pm_.c:64
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1087,7 +1088,7 @@ msgstr ""
 "DiskDrake forenkler prosessen så den ikke trenger å være det. Les\n"
 "dokumentasjonen og ta deg god tid før du begynner."
 
-#: ../help.pm_.c:89 ../help.pm_.c:355
+#: ../help.pm_.c:90
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1103,7 +1104,7 @@ msgstr ""
 "eksisterende partisjoner, især hvis de inneholder filer eller data som du\n"
 "ønsker å beholde. Typiske å beholde er: /home og /usr/local."
 
-#: ../help.pm_.c:97
+#: ../help.pm_.c:98
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -1144,7 +1145,7 @@ msgstr ""
 "kalt \"Info\", som du finner mellom listen over pakker og knappen\n"
 "\"Installer\" for å starte installasjonen."
 
-#: ../help.pm_.c:118
+#: ../help.pm_.c:119
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1156,7 +1157,7 @@ msgstr ""
 "eksisterende system. I så tilfelle kan det ta lengre tid også før\n"
 "oppgraderingen starter."
 
-#: ../help.pm_.c:124 ../help.pm_.c:384
+#: ../help.pm_.c:125
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1183,7 +1184,13 @@ msgstr ""
 "Hvis du har en seriell mus, må du også fortelle DrakX hvilken\n"
 "serie-port den er koblet til."
 
-#: ../help.pm_.c:138
+#: ../help.pm_.c:139
+msgid ""
+"Please select the correct port. For example, the COM1 port in MS Windows\n"
+"is named ttyS0 in Linux."
+msgstr ""
+
+#: ../help.pm_.c:143
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1241,7 +1248,33 @@ msgstr ""
 "hvis dette mislykkes må du velge den riktige serieporten hvor\n"
 "modemet ditt er tilkoblet."
 
-#: ../help.pm_.c:168
+#: ../help.pm_.c:173
+msgid ""
+"Enter:\n"
+"\n"
+"  - IP address: if you don't know it, ask your network administrator.\n"
+"\n"
+"  - Netmask: \"255.255.255.0\" is generally a good choice. If you are not\n"
+"sure, ask your network administrator.\n"
+"\n"
+"  - Automatic IP: If your network uses bootp or dhcpd protocol, select \n"
+"this option. If selected, no value is needed in \"IP address\". If you are\n"
+"not sure, ask your network administrator.\n"
+msgstr ""
+
+#: ../help.pm_.c:186
+msgid ""
+"You may now enter dialup options. If you're not sure what to enter, the\n"
+"correct information can be obtained from your ISP."
+msgstr ""
+
+#: ../help.pm_.c:190
+msgid ""
+"If you will use proxies, please configure them now. If you don't know if\n"
+"you will use proxies, ask your network administrator or your ISP."
+msgstr ""
+
+#: ../help.pm_.c:194
 msgid ""
 "You can install cryptographic package if your internet connection has been\n"
 "set up correctly. First choose a mirror where you wish to download packages "
@@ -1258,7 +1291,7 @@ msgstr ""
 "\n"
 "Mer at du må velge speil og kryptografikk ihht. din lovgivning."
 
-#: ../help.pm_.c:175
+#: ../help.pm_.c:202
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1273,12 +1306,11 @@ msgstr ""
 "den til lokal tid som stemmer overens med den tidssonen du har valgt."
 
 # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#: ../help.pm_.c:182 ../help.pm_.c:420 ../help.pm_.c:423 ../help.pm_.c:511
-#: ../install2.pm_.c:68
+#: ../help.pm_.c:209
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../help.pm_.c:185
+#: ../help.pm_.c:212
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1325,7 +1357,7 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../help.pm_.c:208
+#: ../help.pm_.c:235
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1356,10 +1388,23 @@ msgstr ""
 "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
 "du må kunne klare å huske det."
 
-#: ../help.pm_.c:224 ../help.pm_.c:465
+#: ../help.pm_.c:251
+msgid ""
+"To enable a more secure system, you should select \"Use shadow file\" and\n"
+"\"Use MD5 passwords\"."
+msgstr ""
+
+#: ../help.pm_.c:255
+msgid ""
+"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
+"network administrator."
+msgstr ""
+
+#: ../help.pm_.c:259
+#, fuzzy
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"priviledged\" user account, root. You can create\n"
+"opposed to the \"privileged\" user account, root. You can create\n"
 "one or more account(s) for each person you want to allow to use\n"
 "the computer. Note that each user account will have its own\n"
 "preferences (graphical environment, program settings, etc.)\n"
@@ -1399,19 +1444,20 @@ msgstr ""
 "du vil ha opprettet her, og bare logge inn som root for administrasjon-\n"
 "og vedlikeholdsformål."
 
-#: ../help.pm_.c:243 ../help.pm_.c:484
+#: ../help.pm_.c:278
+#, fuzzy
 msgid ""
-"Please, please, answer \"Yes\" here! Just for example, when you\n"
-"reinstall Windows, it will overwrite the boot sector. Unless you have\n"
-"made the bootdisk as suggested, you won't be able to boot into Linux\n"
-"any more!"
+"It is strongly recommended that you answer \"Yes\" here. If you install\n"
+"Microsoft Windows at a later date it will overwrite the boot sector.\n"
+"Unless you have made a bootdisk as suggested, you will not be able to\n"
+"boot into Linux any more."
 msgstr ""
 "Vær så snill, bare svar \"Ja\" her! Som et eksempel, når du\n"
 "re-installerer Windows, vil denne overskrive oppstartsektoren. Hvis du\n"
 "ikke har opprettet oppstartsdisketten som foreslått, vil du ikke kunne\n"
 "starte Linux mer!"
 
-#: ../help.pm_.c:249 ../help.pm_.c:490
+#: ../help.pm_.c:284
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1427,7 +1473,56 @@ msgstr ""
 "Med mindre du vet akkurat hva du gjør, velg \"Første sektor av\n"
 "disken (MBR)\"."
 
-#: ../help.pm_.c:257 ../help.pm_.c:498
+#: ../help.pm_.c:292
+msgid ""
+"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
+"(the master drive on the primary channel)."
+msgstr ""
+
+#: ../help.pm_.c:296
+msgid ""
+"LILO (the LInux LOader) can boot Linux and other operating systems.\n"
+"Normally they are correctly detected during installation. If you don't\n"
+"see yours detected, you can add one or more now.\n"
+"\n"
+"If you won't everybody can assess at one of them, you can remove it now\n"
+"(a boot disk will be needed to boot it)."
+msgstr ""
+
+#: ../help.pm_.c:304
+msgid ""
+"LILO main options are:\n"
+"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
+"partition) that contains the boot sector. Unless you know specifically\n"
+"otherwise, choose \"/dev/hda\".\n"
+"\n"
+"  - Linear: Generate linear sector addresses instead of\n"
+"sector/head/cylinder addresses. Linear addresses are translated at run\n"
+"time and do not depend on disk geometry. Note that boot disks may not be\n"
+"portable if \"linear\" is used, because the BIOS service to determine the\n"
+"disk geometry does not work reliably for floppy  disks. When using\n"
+"\"linear\" with large disks, /sbin/lilo may generate references to\n"
+"inaccessible disk areas, because 3D sector addresses are not known\n"
+"before boot time.\n"
+"\n"
+"  - Compact: Tries to merge read requests for adjacent sectors into a\n"
+"single read request. This drastically reduces load time and keeps the\n"
+"map smaller. Using \"compact\" is especially recommended when booting from\n"
+"a floppy disk.\n"
+"\n"
+"  - Delay before booting default image: Specifies the number in tenths\n"
+"of a second the boot loader should wait before booting the first image.\n"
+"This is useful on systems that immediately boot from the hard disk after\n"
+"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
+"omitted or is set to zero.\n"
+"\n"
+"  - Video mode: This specifies the VGA text mode that should be selected\n"
+"when booting. The following values are available: \n"
+"    * normal: select normal 80x25 text mode.\n"
+"    * <number>:  use the corresponding text mode."
+msgstr ""
+
+#: ../help.pm_.c:335
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1453,382 +1548,159 @@ msgstr ""
 "passer deg. Hvis de ikke gjør det, kan du komme tilbake og endre\n"
 "disse så mange ganger som det måtte behøves."
 
-#: ../help.pm_.c:270
-msgid "You can now select some miscellaneous options for your system."
-msgstr "Du kan nå velge noen forskjellige opsjoner for systemet ditt."
-
-#: ../help.pm_.c:273
-msgid "Exit Linux-Mandrake installation to reboot your system."
-msgstr "Avslutt Linux-Mandrake installasjonen for å starte systemet på nytt."
-
-#: ../help.pm_.c:286
-msgid ""
-"Choose \"Installation\" if there are no previous versions of Linux\n"
-"installed, or if you wish to use multiple distributions or versions.\n"
-"\n"
-"\n"
-"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
-msgstr ""
-"Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
-"av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
-"versjoner.\n"
-"\n"
-"\n"
-"Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
-
-#: ../help.pm_.c:294
-msgid ""
-"Select:\n"
-"\n"
-"  - Beginner: If you have never installed Linux before, and wish to\n"
-"install the distribution elected \"Product of the year\" for 1999,\n"
-"click here.\n"
-"\n"
-"  - Developer: If you are familiar with Linux and will be using the\n"
-"computer primarily for software development, you will find happiness\n"
-"here.\n"
-"\n"
-"  - Server: If you wish to install a general purpose server, or the\n"
-"Linux distribution elected \"Distribution/Server\" for 1999, select\n"
-"this.\n"
-"\n"
-"  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you."
-msgstr ""
-"Velg:\n"
-"\n"
-"  - Nybegynner: Hvis du ikke har installert Linux før, eller ønsker å\n"
-"installere distribusjonen valgt til \"Product of the year\" for 1999,\n"
-"klikk her.\n"
-"\n"
-"  - Utvikler: hvis du kjent med Linux og primært vil bruke datamaskinen\n"
-"din til å utvikle programvare vil du finne lykken her.\n"
-"\n"
-"  - Tjener: Hvis du ønsker å installere en tjener, eller Linux-\n"
-"distribusjonen valgt til \"Distribution/Server\" for 1999, velg denne.\n"
-"\n"
-"  - Ekspert: Hvis du allerede kjenner GNU/Linux og ønsker å gjøre en\n"
-"egendefinert installasjon, så er dette installasjonsvalget for deg."
-
-#: ../help.pm_.c:312
-msgid ""
-"DrakX will attempt at first to look for one or more PCI\n"
-"SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
-"to use, it will insert it (them)  automatically.\n"
-"\n"
-"If your SCSI adapter is ISA, or is PCI but DrakX doesn't know\n"
-"which driver to use for this card, or if you have no SCSI adapters\n"
-"at all, you will then be prompted on whether you have one or not.\n"
-"If you have none, answer \"No\". If you have one or more, answer\n"
-"\"Yes\". A list of drivers will then pop up, from which you will\n"
-"have to select one.\n"
-"\n"
-"After you have selected the driver, DrakX will ask if you\n"
-"want to specify options for it. First, try and let the driver\n"
-"probe for the hardware: it usually works fine.\n"
-"\n"
-"If not, do not forget the information on your hardware that you\n"
-"could get from you documentation or from Windows (if you have\n"
-"it on your system), as suggested by the installation guide.\n"
-"These are the options you will need to provide to the driver."
-msgstr ""
-"DrakX vil først forsøke å se etter et eller flere PCI\n"
-"SCSI-adapter(ere). Hvis den finner det (eller dem) og vet hvilken\n"
-"driver(ere) som skal brukes, vil denne (disse) bli lagt inn automatisk.\n"
-"\n"
-"Hvis SCSI-adapteret ditt er ISA, eller PCI, men DrakX ikke vet\n"
-"hvilken driver som skal brukes for dette kortet, eller hvis du ikke\n"
-"har noen SCSI-adapterere i det hele tatt, vil du bli spurt om du\n"
-"har noen eller ikke. Hvis du ikke har noen, svar \"Nei\". Hvis du\n"
-"har et eller fler, svar \"Ja\". En liste over drivere vil så komme\n"
-"opp, som du må velge en driver fra.\n"
-"\n"
-"Etter at du har valgt driveren vil DrakX spørre deg om du ønsker\n"
-"å spesifisere opsjonene for denne. Først, prøv å la driveren søke\n"
-"etter maskinvare: Dette fungerer vanligvis fint.\n"
-"\n"
-"Hvis ikke, glem ikke informasjonen om maskinvaren din som du kan få\n"
-"fra dokumentasjonen din eller fra Windows (hvis du har denne på systemet\n"
-"ditt), som foreslått i installasjonsguiden. Dette er opsjonene du vil\n"
-"trenge å gi til driveren."
-
-#: ../help.pm_.c:333
-msgid ""
-"In this stage, you may choose what partition(s) use to install your\n"
-"Linux-Mandrake system."
-msgstr ""
-"På dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n"
-"å installere Linux-Mandrake systemet ditt."
-
-#: ../help.pm_.c:363
-msgid ""
-"You may now select the packages you wish to install.\n"
-"\n"
-"\n"
-"Please note that some packages require the installation of others.\n"
-"These are referred to as package dependencies. The packages you select,\n"
-"and the packages they require will be automatically selected for\n"
-"install. It is impossible to install a package without installing all\n"
-"of its dependencies.\n"
-"\n"
-"\n"
-"Information on each category and specific package is available in the\n"
-"area titled \"Info\",  located between list of packages and the five\n"
-"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
-msgstr ""
-"Du kan nå velge de pakkene du ønsker å installere.\n"
-"\n"
-"\n"
-"Vennligst merk at noen pakker er avhengige av installasjon av andre pakker.\n"
-"Disse blir referert til som pakkeavhengigheter. Pakkene du velger, og\n"
-"pakkene disse trenger vil automatisk bli valgt for installering.\n"
-"Det er ikke mulig å installere en pakke uten å installere alle dens\n"
-"avhengigheter.\n"
-"\n"
-"\n"
-"Informasjon om hver kategori og spesifikke pakker er tilgjengelig i området\n"
-"kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n"
-"\"Installer\", \"Velg flere/færre\" og \"Vis flere/færre\"."
-
-#: ../help.pm_.c:378
+#: ../help.pm_.c:348
 msgid ""
-"The packages selected are now being installed.\n"
-"\n"
-"\n"
-"This operation should take a few minutes."
+"If something is wrong in X configuration, use these options to correctly\n"
+"configure the X Window System."
 msgstr ""
-"Pakkene som er valgt blir nå installert.\n"
-"\n"
-"\n"
-"Denne operasjonen burde ta noen minutter."
 
-#: ../help.pm_.c:398
+#: ../help.pm_.c:352
 msgid ""
-"This section is dedicated to configuring a local area network,\n"
-"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
-"Ethernet adapter on your machine. PCI adapters should be found and\n"
-"initialized automatically. However, if your peripheral is ISA,\n"
-"autodetection will not work, and you will have to choose a driver\n"
-"from the list that will appear then.\n"
-"\n"
-"\n"
-"As for SCSI adapters, you can let the driver probe for the adapter\n"
-"in the first time, otherwise you will have to specify the options\n"
-"to the driver that you will have fetched from Windows' control\n"
-"panel.\n"
-"\n"
-"\n"
-"If you install a Linux-Mandrake system on a machine which is part\n"
-"of an already existing network, the network administrator will\n"
-"have given you all necessary information (IP address, network\n"
-"submask or netmask for short, and hostname). If you're setting\n"
-"up a private network at home for example, you should choose\n"
-"addresses "
+"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
+"\"No\"."
 msgstr ""
-"Denne seksjonen er dedikert til konfigurering av et lokalt nettverk,\n"
-"eller LAN. Hvis du svarer \"Ja\" her, vil DrakX forsøke å finne\n"
-"et Ethernet-adapter i maskinen din. PCI-adaptere burde bli funnet og\n"
-"initialisert automatisk. Men, hvis det er et ISA, vil ikke automatisk\n"
-"oppdaging virke, og du må velge en driver fra listen som så vil vises.\n"
-"\n"
-"\n"
-"For SCSI-adaptere kan du la driveren søke etter adapteret første\n"
-"gangen, ellers må du spesifisere opsjonene for driveren som du\n"
-"har innhentet fra Windows sitt kontrollpanel.\n"
-"\n"
-"\n"
-"Hvis du installerer et Linux-Mandrake system på en maskin som er en del\n"
-"av et allerede eksisterende nettverk, vil nettverks-administratoren\n"
-"ha gitt deg all nødvendig informasjon (IP-adresse, nettverks-\n"
-"submask eller netmask, og vertsnavn). Hvis du f.eks. setter\n"
-"opp et privat nettverk hjemme, burde du velge adresser."
 
-#: ../help.pm_.c:426
+#: ../help.pm_.c:356
 msgid ""
-"Linux can deal with many types of printer. Each of these\n"
-"types require a different setup.\n"
+"You can now select some miscellaneous options for you system.\n"
 "\n"
+"  - Use hard drive optimizations: This option can improve hard disk\n"
+"accesses but is only for advanced users, it can ruin your hard drive if\n"
+"used incorrectly. Use it only if you know how.\n"
 "\n"
-"If your printer is directly connected to your computer, select\n"
-"\"Local printer\". You will then have to tell which port your\n"
-"printer is connected to, and select the appropriate filter.\n"
+"  - Choose security level: You can choose a security level for your\n"
+"system.\n"
+"    Please refer to the manual for more information.\n"
 "\n"
+"  - Precise RAM size if needed: In some cases, Linux is unable to\n"
+"correctly detect all the installed RAM on  some systems. If this is the\n"
+"case, specify the correct quantity. Note: a difference of 2 or 4 Mb is\n"
+"normal.\n"
 "\n"
-"If you want to access a printer located on a remote Unix machine,\n"
-"you will have to select \"Remote lpd queue\". In order to make\n"
-"it work, no username or password is required, but you will need\n"
-"to know the name of the printing queue on this server.\n"
+"  - Removable media automounting: If you would prefer not to manually\n"
+"mount removable drives (CD-ROM, Floppy, Zip) by typing \"mount and\n"
+"\"umount\", select this option. \n"
 "\n"
-"\n"
-"If you want to access a SMB printer (which means, a printer located\n"
-"on a remote Windows 9x/NT machine), you will have to specify its\n"
-"SMB name (which is not its TCP/IP name), and possibly its IP address,\n"
-"plus the username, workgroup and password required in order to\n"
-"access the printer, and of course the name of the printer.The same goes\n"
-"for a NetWare printer, except that you need no workgroup information."
+"  - Enable Num Lock at startup: If you want Number Lock enabled after\n"
+"booting, select this option (Note: Num Lock will still not work under\n"
+"X)."
 msgstr ""
-"Linux kan håndtere mange typer av skrivere. Hver av disse\n"
-"trenger forskjellige oppsett.\n"
-"\n"
-"\n"
-"Hvis skriveren din er direkte koblet til maskinen din, velg\n"
-"\"Lokal skriver\". Du må så fortelle hvilken port skriveren\n"
-"din er koblet til, og velge passende filter.\n"
-"\n"
-"\n"
-"Hvis du ønsker tilgang til en skriver lokalisert på en fjern Unix-maskin,\n"
-"må du velge \"Fjern-lpd-kø\". For at dette skal virke trengs ikke\n"
-"brukernavn eller passord, men du må vite navnet på skriverkøen på\n"
-"denne tjeneren.\n"
-"\n"
-"\n"
-"Hvis du ønsker tilgang en SMB-skriver (som betyr en skriver lokalisert\n"
-"på en fjern Windows 9x/NT maskin), må du spesifisere dens SMB-navn\n"
-"(som ikke er dens TCP/IP-navn), og muligens dens IP-adresse, pluss\n"
-"brukernavn, arbeidsgruppe og passord som behøves for å få tilgang til\n"
-"skriveren, og selvfølgelig navnet på skriveren. Det samme gjelder for\n"
-"en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
-"informasjon."
 
-#: ../help.pm_.c:449
+#: ../help.pm_.c:380
 msgid ""
-"You must now enter the root password for your Linux-Mandrake\n"
-"system. The password must be entered twice to verify that both\n"
-"password entries are identical.\n"
-"\n"
+"Your system is going to reboot.\n"
 "\n"
-"Root is the administrator of the system, and is the only user\n"
-"allowed to modify the system configuration. Therefore, choose\n"
-"this password carefully! Unauthorized use of the root account can\n"
-"be extremely dangerous to the integrity of the system and its data,\n"
-"and other systems connected to it. The password should be a\n"
-"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should *never* be written down. Do not make the password too long or\n"
-"complicated, though: you must be able to remember without too much\n"
-"effort."
+"After rebooting, your new Linux Mandrake system will load automatically.\n"
+"If you want to boot into another existing operating system, please read\n"
+"the additional instructions."
 msgstr ""
-"Du må nå entre root-passordet for Linux-Mandrake systemet ditt.\n"
-"Passordet må entres to ganger for å verifisere at begge passord-\n"
-"inntastingene er identiske.\n"
-"\n"
-"\n"
-"Root er administratoren av systemet, og er den eneste brukeren som\n"
-"har adgang til å modifisere systemkonfigurasjonen. Velg derfor dette\n"
-"passordet med forsiktighet! Ikke-autorisert bruk av root-kontoen kan\n"
-"være ekstremt farlig for integriteten til systemet, dataene det inneholder,\n"
-"og andre systemer tilkoblet dette. Passordet bør være en miks av\n"
-"alfanumeriske tegn og være minst åtte tegn langt. Passordet bør *aldri*\n"
-"bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
-"du må kunne klare å huske det."
 
-#: ../install2.pm_.c:43
+#: ../install2.pm_.c:42
 msgid "Choose your language"
 msgstr "Velg språk"
 
-#: ../install2.pm_.c:44
+#: ../install2.pm_.c:43
 msgid "Select installation class"
 msgstr "Velg installasjonsklasse"
 
-#: ../install2.pm_.c:45
+#: ../install2.pm_.c:44
 msgid "Setup SCSI"
 msgstr "Oppsett SCSI"
 
-#: ../install2.pm_.c:46
+#: ../install2.pm_.c:45
 msgid "Choose install or upgrade"
 msgstr "Velg installer eller oppgrader"
 
-#: ../install2.pm_.c:47
+#: ../install2.pm_.c:46
 msgid "Configure mouse"
 msgstr "Konfigurer mus"
 
-#: ../install2.pm_.c:48
+#: ../install2.pm_.c:47
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../install2.pm_.c:49
+#: ../install2.pm_.c:48
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: ../install2.pm_.c:50
+#: ../install2.pm_.c:49
 msgid "Setup filesystems"
 msgstr "Oppsett filsystemer"
 
-#: ../install2.pm_.c:51
+#: ../install2.pm_.c:50
 msgid "Format partitions"
 msgstr "Formater partisjoner"
 
-#: ../install2.pm_.c:52
+#: ../install2.pm_.c:51
 msgid "Choose packages to install"
 msgstr "Velg pakker for installering"
 
-#: ../install2.pm_.c:53
+#: ../install2.pm_.c:52
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../install2.pm_.c:54
+#: ../install2.pm_.c:53
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../install2.pm_.c:55
+#: ../install2.pm_.c:54
 msgid "Cryptographic"
 msgstr "Kryptografikk"
 
-#: ../install2.pm_.c:56
+#: ../install2.pm_.c:55
 msgid "Configure timezone"
 msgstr "Konfigurer tidssone"
 
-#: ../install2.pm_.c:58
+#: ../install2.pm_.c:57
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:475
-#: ../install_steps_interactive.pm_.c:476
+#: ../install2.pm_.c:58 ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:486
 msgid "Set root password"
 msgstr "Sett root-passord"
 
-#: ../install2.pm_.c:60
+#: ../install2.pm_.c:59
 msgid "Add a user"
 msgstr "Legg til en bruker"
 
-#: ../install2.pm_.c:61
+#: ../install2.pm_.c:60
 msgid "Create a bootdisk"
 msgstr "Opprett en oppstartdiskett"
 
-#: ../install2.pm_.c:62
+#: ../install2.pm_.c:61
 msgid "Install bootloader"
 msgstr "Installer oppstartslaster"
 
-#: ../install2.pm_.c:63
+#: ../install2.pm_.c:62
 msgid "Configure X"
 msgstr "Konfigurer X"
 
-#: ../install2.pm_.c:64
+#: ../install2.pm_.c:63
 msgid "Exit install"
 msgstr "Avslutt installering"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "beginner"
 msgstr "nybegynner"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "developer"
 msgstr "utvikler"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "expert"
 msgstr "ekspert"
 
-#: ../install2.pm_.c:84
+#: ../install2.pm_.c:82
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:309
+#: ../install2.pm_.c:307
 msgid "Partitioning failed: no root filesystem"
 msgstr "Partisjonering feilet: intet root-filsystem"
 
-#: ../install2.pm_.c:323
+#: ../install2.pm_.c:321
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Ikke nok vekslingsplass til å fullføre installasjonen, vennligst legg til mer"
@@ -1893,7 +1765,7 @@ msgstr ""
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../install_steps.pm_.c:508
+#: ../install_steps.pm_.c:502
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
@@ -1902,11 +1774,37 @@ msgstr "Ingen diskettstasjon tilgjengelig"
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%s'\n"
 
-#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:292
+#: ../install_steps_gtk.pm_.c:258
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first run scandisk "
+"(and\n"
+"optionally run defrag) on this partition and backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"ADVARSEL!\n"
+"\n"
+"DrakX trenger nå å endre størrelsen på Windows partisjonen din. Vær "
+"forsiktig: denne operasjonen er\n"
+"farlig. Hvis du ikke allerede har gjort det burde du kjøre scandisk først "
+"(og\n"
+"som en opsjon kjøre defrag) på denne partisjonen og ta sikkerhetskopi av "
+"dine\n"
+"data.\n"
+"Når du er sikker, trykk Ok."
+
+#: ../install_steps_gtk.pm_.c:276
+msgid "Automatic resizing failed"
+msgstr "Automatisk endring av størrelse mislykket"
+
+#: ../install_steps_gtk.pm_.c:292 ../unused/install_steps_graphical.pm_.c:255
 msgid "You must have a swap partition"
 msgstr "Du må ha en vekslingspartisjon"
 
-#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:294
+#: ../install_steps_gtk.pm_.c:294 ../unused/install_steps_graphical.pm_.c:258
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -1916,124 +1814,94 @@ msgstr ""
 "\n"
 "Fortsette likevel?"
 
-#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:328
+#: ../install_steps_gtk.pm_.c:325
+#, c-format
+msgid "Going to install %d MB. You can choose to install more programs"
+msgstr "%d MB vil bli installert. Du kan velge å installere flere programmer"
+
+#: ../install_steps_gtk.pm_.c:326
+msgid "You will be able to choose more precisely in next step"
+msgstr "Du vil kunne velge mere presist i neste trinn"
+
+#: ../install_steps_gtk.pm_.c:328
 msgid "Choose the size you want to install"
 msgstr "Velg størrelsen du ønsker å installere"
 
-#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:377
+#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
 msgid "Total size: "
 msgstr "Total størrelse: "
 
-#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:389
+#: ../install_steps_gtk.pm_.c:389 ../unused/install_steps_graphical.pm_.c:284
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versjon: %s\n"
 
-#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:390
+#: ../install_steps_gtk.pm_.c:390 ../unused/install_steps_graphical.pm_.c:285
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Størrelse: %d KB\n"
 
-#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:505
+#: ../install_steps_gtk.pm_.c:505 ../unused/install_steps_graphical.pm_.c:421
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:508
+#: ../install_steps_gtk.pm_.c:508 ../unused/install_steps_graphical.pm_.c:424
 msgid "Info"
 msgstr "Info"
 
-#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:516
-#: ../install_steps_interactive.pm_.c:80
+#: ../install_steps_gtk.pm_.c:516 ../install_steps_interactive.pm_.c:80
+#: ../unused/install_steps_graphical.pm_.c:432
 msgid "Install"
 msgstr "Installer"
 
-#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:535
-#: ../install_steps_interactive.pm_.c:249
+#: ../install_steps_gtk.pm_.c:535 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:451
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:542
+#: ../install_steps_gtk.pm_.c:538
+msgid "Estimating"
+msgstr "Beregner"
+
+#: ../install_steps_gtk.pm_.c:542 ../unused/install_steps_graphical.pm_.c:457
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:544
+#: ../install_steps_gtk.pm_.c:544 ../unused/install_steps_graphical.pm_.c:459
 msgid "Time remaining "
 msgstr "Tid som gjenstår "
 
-#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:545
+#: ../install_steps_gtk.pm_.c:545 ../unused/install_steps_graphical.pm_.c:460
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:550
-#: ../install_steps_interactive.pm_.c:249
+#: ../install_steps_gtk.pm_.c:550 ../install_steps_interactive.pm_.c:252
+#: ../unused/install_steps_graphical.pm_.c:465
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:565
+#: ../install_steps_gtk.pm_.c:560
+#, c-format
+msgid "%d packages"
+msgstr "%d pakker"
+
+#: ../install_steps_gtk.pm_.c:560
+msgid ", %U MB"
+msgstr ", %U MB"
+
+#: ../install_steps_gtk.pm_.c:565 ../unused/install_steps_graphical.pm_.c:486
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
+#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
 msgid "Go on anyway?"
 msgstr "Fortsette uansett?"
 
-#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:590
+#: ../install_steps_gtk.pm_.c:590 ../unused/install_steps_graphical.pm_.c:511
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:779
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
-#: ../install_steps_gtk.pm_.c:258
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first run scandisk "
-"(and\n"
-"optionally run defrag) on this partition and backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"ADVARSEL!\n"
-"\n"
-"DrakX trenger nå å endre størrelsen på Windows partisjonen din. Vær "
-"forsiktig: denne operasjonen er\n"
-"farlig. Hvis du ikke allerede har gjort det burde du kjøre scandisk først "
-"(og\n"
-"som en opsjon kjøre defrag) på denne partisjonen og ta sikkerhetskopi av "
-"dine\n"
-"data.\n"
-"Når du er sikker, trykk Ok."
-
-#: ../install_steps_gtk.pm_.c:276
-msgid "Automatic resizing failed"
-msgstr "Automatisk endring av størrelse mislykket"
-
-#: ../install_steps_gtk.pm_.c:325
-#, c-format
-msgid "Going to install %d MB. You can choose to install more programs"
-msgstr "%d MB vil bli installert. Du kan velge å installere flere programmer"
-
-#: ../install_steps_gtk.pm_.c:326
-msgid "You will be able to choose more precisely in next step"
-msgstr "Du vil kunne velge mere presist i neste trinn"
-
-#: ../install_steps_gtk.pm_.c:538
-msgid "Estimating"
-msgstr "Beregner"
-
-#: ../install_steps_gtk.pm_.c:560
-#, c-format
-msgid "%d packages"
-msgstr "%d pakker"
-
-#: ../install_steps_gtk.pm_.c:560
-msgid ", %U MB"
-msgstr ", %U MB"
-
 #: ../install_steps_interactive.pm_.c:36
 msgid "An error occurred"
 msgstr "En feil oppsto"
@@ -2111,58 +1979,54 @@ msgstr "Hva slags bruk ønsker du?"
 msgid "What is the type of your mouse?"
 msgstr "Hva slags type er musen din?"
 
-#: ../install_steps_interactive.pm_.c:134 ../standalone/mousedrake_.c:35
-msgid "Emulate third button?"
-msgstr "Emulere tredje knapp?"
-
-#: ../install_steps_interactive.pm_.c:137 ../standalone/mousedrake_.c:38
+#: ../install_steps_interactive.pm_.c:139 ../standalone/mousedrake_.c:38
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../install_steps_interactive.pm_.c:138 ../standalone/mousedrake_.c:39
+#: ../install_steps_interactive.pm_.c:140 ../standalone/mousedrake_.c:39
 msgid "Which serial port is your mouse connected to?"
 msgstr "Hvilken serieport er musen din koblet til?"
 
-#: ../install_steps_interactive.pm_.c:153
+#: ../install_steps_interactive.pm_.c:156
 msgid "no available partitions"
 msgstr "ingen tilgjengelige partisjoner"
 
-#: ../install_steps_interactive.pm_.c:155
+#: ../install_steps_interactive.pm_.c:158
 #, c-format
 msgid "(%dMb)"
 msgstr "(%dMb)"
 
-#: ../install_steps_interactive.pm_.c:162
+#: ../install_steps_interactive.pm_.c:165
 msgid "Which partition do you want to use as your root partition"
 msgstr "Hvilken partisjon vil du bruke som din root-partisjon"
 
-#: ../install_steps_interactive.pm_.c:169
+#: ../install_steps_interactive.pm_.c:172
 msgid "Choose the mount points"
 msgstr "Velg monteringspunkter"
 
-#: ../install_steps_interactive.pm_.c:181
+#: ../install_steps_interactive.pm_.c:184
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen\n"
 "skal tre i kraft"
 
-#: ../install_steps_interactive.pm_.c:200
+#: ../install_steps_interactive.pm_.c:203
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du ønsker å formatere"
 
-#: ../install_steps_interactive.pm_.c:219
+#: ../install_steps_interactive.pm_.c:222
 msgid "Looking for available packages"
 msgstr "Ser etter tilgjengelige pakker"
 
-#: ../install_steps_interactive.pm_.c:225
+#: ../install_steps_interactive.pm_.c:228
 msgid "Finding packages to upgrade"
 msgstr "Finner pakker å oppgradere"
 
-#: ../install_steps_interactive.pm_.c:234
+#: ../install_steps_interactive.pm_.c:237
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../install_steps_interactive.pm_.c:258
+#: ../install_steps_interactive.pm_.c:261
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -2170,54 +2034,54 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../install_steps_interactive.pm_.c:267
+#: ../install_steps_interactive.pm_.c:270
 msgid "Post install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: ../install_steps_interactive.pm_.c:278
+#: ../install_steps_interactive.pm_.c:281
 msgid "Keep the current IP configuration"
 msgstr "Behold nåværende IP-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:279
+#: ../install_steps_interactive.pm_.c:282
 msgid "Reconfigure network now"
 msgstr "Rekonfigurer nettverket nå"
 
-#: ../install_steps_interactive.pm_.c:280
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:295
 msgid "Do not set up networking"
 msgstr "Ikke sett opp nettverk"
 
-#: ../install_steps_interactive.pm_.c:282
-#: ../install_steps_interactive.pm_.c:290
+#: ../install_steps_interactive.pm_.c:285
+#: ../install_steps_interactive.pm_.c:293
 msgid "Network Configuration"
 msgstr "Nettverks-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:283
+#: ../install_steps_interactive.pm_.c:286
 msgid "Local networking has already been configured. Do you want to:"
 msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
 
-#: ../install_steps_interactive.pm_.c:291
+#: ../install_steps_interactive.pm_.c:294
 msgid "Do you want to configure networking for your system?"
 msgstr "Vil du konfigurere nettverk for systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:295
 msgid "Dialup with modem"
 msgstr "Oppringt med modem"
 
-#: ../install_steps_interactive.pm_.c:292
+#: ../install_steps_interactive.pm_.c:295
 msgid "Local LAN"
 msgstr "Lokalt LAN"
 
-#: ../install_steps_interactive.pm_.c:301
+#: ../install_steps_interactive.pm_.c:304
 msgid "no network card found"
 msgstr "ingen nettverkskort funnet"
 
-#: ../install_steps_interactive.pm_.c:330
+#: ../install_steps_interactive.pm_.c:334
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Konfigurerer nettverksenhet %s"
 
-#: ../install_steps_interactive.pm_.c:331
+#: ../install_steps_interactive.pm_.c:335
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -2227,31 +2091,31 @@ msgstr ""
 "Hvert element bør entres som en IP-adresse i punkt-desimal\n"
 "notasjon (f.eks, 1.2.3.4)."
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "IP address:"
 msgstr "IP-adresse:"
 
-#: ../install_steps_interactive.pm_.c:334
+#: ../install_steps_interactive.pm_.c:338
 msgid "Netmask:"
 msgstr "Nettmaske:"
 
-#: ../install_steps_interactive.pm_.c:335
+#: ../install_steps_interactive.pm_.c:339
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../install_steps_interactive.pm_.c:341 ../printerdrake.pm_.c:149
+#: ../install_steps_interactive.pm_.c:345 ../printerdrake.pm_.c:149
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bør være i format 1.2.3.4"
 
-#: ../install_steps_interactive.pm_.c:359
+#: ../install_steps_interactive.pm_.c:363
 msgid "Configuring network"
 msgstr "Konfigurerer nettverk"
 
-#: ../install_steps_interactive.pm_.c:360
+#: ../install_steps_interactive.pm_.c:364
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -2263,204 +2127,204 @@ msgstr ""
 "så som ``minboks.mittlab.mittfirma.no''.\n"
 "Du kan også entre IP-adressen til gateway'en hvis du har en"
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "DNS server:"
 msgstr "DNS-tjener:"
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway device:"
 msgstr "Gateway-enhet:"
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:368
 msgid "Host name:"
 msgstr "Vertsnavn:"
 
-#: ../install_steps_interactive.pm_.c:377
+#: ../install_steps_interactive.pm_.c:381
 msgid "Try to find a modem?"
 msgstr "Prøve å finne et modem?"
 
-#: ../install_steps_interactive.pm_.c:386
+#: ../install_steps_interactive.pm_.c:391
 msgid "Which serial port is your modem connected to?"
 msgstr "Hvilken serieport er modemet ditt koblet til?"
 
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:396
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../install_steps_interactive.pm_.c:391
+#: ../install_steps_interactive.pm_.c:397
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
-#: ../install_steps_interactive.pm_.c:392
+#: ../install_steps_interactive.pm_.c:398
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../install_steps_interactive.pm_.c:393
+#: ../install_steps_interactive.pm_.c:399
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../install_steps_interactive.pm_.c:394
-#: ../install_steps_interactive.pm_.c:477
-#: ../install_steps_interactive.pm_.c:523
-#: ../install_steps_interactive.pm_.c:614 ../standalone/adduserdrake_.c:32
+#: ../install_steps_interactive.pm_.c:400
+#: ../install_steps_interactive.pm_.c:487
+#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:627 ../standalone/adduserdrake_.c:32
 msgid "Password"
 msgstr "Passord"
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "PAP"
 msgstr "PAP"
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../install_steps_interactive.pm_.c:395
+#: ../install_steps_interactive.pm_.c:401
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../install_steps_interactive.pm_.c:396
+#: ../install_steps_interactive.pm_.c:402
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../install_steps_interactive.pm_.c:397
+#: ../install_steps_interactive.pm_.c:403
 msgid "First DNS Server"
 msgstr "Første DNS-tjener"
 
-#: ../install_steps_interactive.pm_.c:398
+#: ../install_steps_interactive.pm_.c:404
 msgid "Second DNS Server"
 msgstr "Andre DNS-tjener"
 
-#: ../install_steps_interactive.pm_.c:411
+#: ../install_steps_interactive.pm_.c:417
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:432
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../install_steps_interactive.pm_.c:431
+#: ../install_steps_interactive.pm_.c:437
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter speilet for å få en liste over tilgjengelige pakker"
 
-#: ../install_steps_interactive.pm_.c:435
+#: ../install_steps_interactive.pm_.c:441
 msgid "Which packages do you want to install"
 msgstr "Hvilke pakker ønsker du å installere"
 
-#: ../install_steps_interactive.pm_.c:437
+#: ../install_steps_interactive.pm_.c:443
 msgid "Downloading cryptographic packages"
 msgstr "Laster ned kryptografiske pakker"
 
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:453
 msgid "Which is your timezone?"
 msgstr "Hvilken er tidsonen din?"
 
-#: ../install_steps_interactive.pm_.c:448
+#: ../install_steps_interactive.pm_.c:454
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er maskinvareklokken din satt til GMT?"
 
-#: ../install_steps_interactive.pm_.c:458
+#: ../install_steps_interactive.pm_.c:464
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../install_steps_interactive.pm_.c:459
+#: ../install_steps_interactive.pm_.c:465
 msgid "Would you like to configure a printer?"
 msgstr "Ønsker du å konfigurere en skriver?"
 
-#: ../install_steps_interactive.pm_.c:475
+#: ../install_steps_interactive.pm_.c:485
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../install_steps_interactive.pm_.c:475
-#: ../install_steps_interactive.pm_.c:685 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:699 ../interactive.pm_.c:74
 #: ../interactive.pm_.c:84 ../interactive.pm_.c:163
 #: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
 #: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
-#: ../my_gtk.pm_.c:523
+#: ../my_gtk.pm_.c:523 ../unused/install_steps_graphical.pm_.c:608
 msgid "Ok"
 msgstr "Ok"
 
-#: ../install_steps_interactive.pm_.c:478
-#: ../install_steps_interactive.pm_.c:524 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:488
+#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:33
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../install_steps_interactive.pm_.c:480
+#: ../install_steps_interactive.pm_.c:490
 msgid "Use shadow file"
 msgstr "Bruk skyggefil"
 
-#: ../install_steps_interactive.pm_.c:480
+#: ../install_steps_interactive.pm_.c:490
 msgid "shadow"
 msgstr "skygge"
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:491
 msgid "MD5"
 msgstr "MD5"
 
-#: ../install_steps_interactive.pm_.c:481
+#: ../install_steps_interactive.pm_.c:491
 msgid "Use MD5 passwords"
 msgstr "Bruk MD5 passord"
 
-#: ../install_steps_interactive.pm_.c:483
+#: ../install_steps_interactive.pm_.c:493
 msgid "Use NIS"
 msgstr "Bruk NIS"
 
-#: ../install_steps_interactive.pm_.c:483
+#: ../install_steps_interactive.pm_.c:493
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../install_steps_interactive.pm_.c:487
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
 msgid "Please try again"
 msgstr "Vennligst prøv igjen"
 
-#: ../install_steps_interactive.pm_.c:487
-#: ../install_steps_interactive.pm_.c:535 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../install_steps_interactive.pm_.c:489
-#: ../install_steps_interactive.pm_.c:536 ../standalone/adduserdrake_.c:45
+#: ../install_steps_interactive.pm_.c:499
+#: ../install_steps_interactive.pm_.c:546 ../standalone/adduserdrake_.c:45
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:506
 msgid "Authentification NIS"
 msgstr "Autentifikasjon NIS"
 
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:507
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../install_steps_interactive.pm_.c:497
+#: ../install_steps_interactive.pm_.c:507
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../install_steps_interactive.pm_.c:517 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:527 ../standalone/adduserdrake_.c:26
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../install_steps_interactive.pm_.c:517 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:527 ../standalone/adduserdrake_.c:26
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../install_steps_interactive.pm_.c:518 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:528 ../standalone/adduserdrake_.c:27
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../install_steps_interactive.pm_.c:518 ../standalone/adduserdrake_.c:27
+#: ../install_steps_interactive.pm_.c:528 ../standalone/adduserdrake_.c:27
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -2469,32 +2333,32 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../install_steps_interactive.pm_.c:520 ../standalone/adduserdrake_.c:29
+#: ../install_steps_interactive.pm_.c:530 ../standalone/adduserdrake_.c:29
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../install_steps_interactive.pm_.c:521 ../standalone/adduserdrake_.c:30
+#: ../install_steps_interactive.pm_.c:531 ../standalone/adduserdrake_.c:30
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:526 ../standalone/adduserdrake_.c:35
+#: ../install_steps_interactive.pm_.c:536 ../standalone/adduserdrake_.c:35
 msgid "Shell"
 msgstr "Skall"
 
-#: ../install_steps_interactive.pm_.c:537 ../standalone/adduserdrake_.c:46
+#: ../install_steps_interactive.pm_.c:547 ../standalone/adduserdrake_.c:46
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../install_steps_interactive.pm_.c:538 ../standalone/adduserdrake_.c:47
+#: ../install_steps_interactive.pm_.c:548 ../standalone/adduserdrake_.c:47
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde små bokstaver, tall, `-' og `_'"
 
-#: ../install_steps_interactive.pm_.c:539 ../standalone/adduserdrake_.c:48
+#: ../install_steps_interactive.pm_.c:549 ../standalone/adduserdrake_.c:48
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../install_steps_interactive.pm_.c:560
+#: ../install_steps_interactive.pm_.c:570
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -2518,262 +2382,264 @@ msgstr ""
 "systemsvikt.\n"
 "Ønsker du å opprette en oppstartsdiskett for systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:569
+#: ../install_steps_interactive.pm_.c:579
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../install_steps_interactive.pm_.c:572
+#: ../install_steps_interactive.pm_.c:582
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du ønsker å bruke for å lage oppstartsdisketten"
 
-#: ../install_steps_interactive.pm_.c:573
+#: ../install_steps_interactive.pm_.c:583
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../install_steps_interactive.pm_.c:577
+#: ../install_steps_interactive.pm_.c:587
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../install_steps_interactive.pm_.c:578
+#: ../install_steps_interactive.pm_.c:588
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../install_steps_interactive.pm_.c:585
+#: ../install_steps_interactive.pm_.c:595
 msgid "Preparing bootloader"
 msgstr "Klargjør oppstartslaster"
 
-#: ../install_steps_interactive.pm_.c:597
+#: ../install_steps_interactive.pm_.c:607
 msgid "First sector of boot partition"
 msgstr "Første sektor av oppstartspartisjon"
 
-#: ../install_steps_interactive.pm_.c:597
+#: ../install_steps_interactive.pm_.c:607
 msgid "First sector of drive (MBR)"
 msgstr "Første sektor av disk (MBR)"
 
-#: ../install_steps_interactive.pm_.c:601
+#: ../install_steps_interactive.pm_.c:612
 msgid "LILO Installation"
 msgstr "LILO-installasjon"
 
-#: ../install_steps_interactive.pm_.c:602
+#: ../install_steps_interactive.pm_.c:613
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor vil du installere oppstartslasteren?"
 
-#: ../install_steps_interactive.pm_.c:605
+#: ../install_steps_interactive.pm_.c:618
 msgid "Do you want to use LILO?"
 msgstr "Ønsker du å bruke LILO?"
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:621
 msgid "Boot device"
 msgstr "Oppstartsenhet"
 
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:622
 msgid "Linear (needed for some SCSI drives)"
 msgstr "Lineær (behøves av noen SCSI-disker)"
 
-#: ../install_steps_interactive.pm_.c:609
+#: ../install_steps_interactive.pm_.c:622
 msgid "linear"
 msgstr "lineær"
 
-#: ../install_steps_interactive.pm_.c:610
+#: ../install_steps_interactive.pm_.c:623
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../install_steps_interactive.pm_.c:610
+#: ../install_steps_interactive.pm_.c:623
 msgid "compact"
 msgstr "kompakt"
 
-#: ../install_steps_interactive.pm_.c:611
+#: ../install_steps_interactive.pm_.c:624
 msgid "Delay before booting default image"
 msgstr "Forsinkelse før oppstart av standard bilde"
 
-#: ../install_steps_interactive.pm_.c:612
+#: ../install_steps_interactive.pm_.c:625
 msgid "Video mode"
 msgstr "Skjerm-modus"
 
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:628
 msgid "Restrict command line options"
 msgstr "Begrense kommandolinje-opsjoner"
 
-#: ../install_steps_interactive.pm_.c:615
+#: ../install_steps_interactive.pm_.c:628
 msgid "restrict"
 msgstr "begrense"
 
-#: ../install_steps_interactive.pm_.c:621
+#: ../install_steps_interactive.pm_.c:634
 msgid "LILO main options"
 msgstr "LILO hovedopsjoner"
 
-#: ../install_steps_interactive.pm_.c:624
+#: ../install_steps_interactive.pm_.c:637
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../install_steps_interactive.pm_.c:633
+#: ../install_steps_interactive.pm_.c:647
+#, fuzzy
 msgid ""
 "Here are the following entries in LILO.\n"
-"You can add some more or change the existent ones."
+"You can add some more or change the existing ones."
 msgstr ""
 "Her er følgende oppføringer i LILO\n"
 "Du kan legge til noen flere eller endre de eksisterende."
 
-#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:649
 msgid "Add"
 msgstr "Legg til"
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Linux"
 msgstr "Linux"
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Other OS (windows...)"
 msgstr "Andre OS (windows...)"
 
-#: ../install_steps_interactive.pm_.c:644
+#: ../install_steps_interactive.pm_.c:658
 msgid "Which type of entry do you want to add"
 msgstr "Hvilken inngangstype vil du legge til"
 
-#: ../install_steps_interactive.pm_.c:664
+#: ../install_steps_interactive.pm_.c:678
 msgid "Image"
 msgstr "Bilde"
 
-#: ../install_steps_interactive.pm_.c:665
-#: ../install_steps_interactive.pm_.c:673
+#: ../install_steps_interactive.pm_.c:679
+#: ../install_steps_interactive.pm_.c:687
 msgid "Root"
 msgstr "Root"
 
-#: ../install_steps_interactive.pm_.c:666
+#: ../install_steps_interactive.pm_.c:680
 msgid "Append"
 msgstr "Tilføye"
 
-#: ../install_steps_interactive.pm_.c:667
+#: ../install_steps_interactive.pm_.c:681
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../install_steps_interactive.pm_.c:668
+#: ../install_steps_interactive.pm_.c:682
 msgid "Read-write"
 msgstr "Les-skriv"
 
-#: ../install_steps_interactive.pm_.c:674
+#: ../install_steps_interactive.pm_.c:688
 msgid "Table"
 msgstr "Tabell"
 
-#: ../install_steps_interactive.pm_.c:675
+#: ../install_steps_interactive.pm_.c:689
 msgid "Unsafe"
 msgstr "Usikker"
 
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:694
 msgid "Label"
 msgstr "Etikett"
 
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:696
 msgid "Default"
 msgstr "Standard"
 
-#: ../install_steps_interactive.pm_.c:685
+#: ../install_steps_interactive.pm_.c:699
 msgid "Remove entry"
 msgstr "Fjern inngang"
 
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:702
 msgid "Empty label not allowed"
 msgstr "Tom etikett er ikke tillatt"
 
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:703
 msgid "This label is already in use"
 msgstr "Denne etiketten er allerede i bruk"
 
-#: ../install_steps_interactive.pm_.c:690
+#: ../install_steps_interactive.pm_.c:704
 #, c-format
 msgid "A entry %s already exists"
 msgstr "En inngang %s eksisterer ellerede"
 
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:718
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:"
 
-#: ../install_steps_interactive.pm_.c:717
+#: ../install_steps_interactive.pm_.c:732
 msgid "Proxies configuration"
 msgstr "Proxy-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:718
+#: ../install_steps_interactive.pm_.c:733
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: ../install_steps_interactive.pm_.c:719
+#: ../install_steps_interactive.pm_.c:734
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: ../install_steps_interactive.pm_.c:725
+#: ../install_steps_interactive.pm_.c:740
 msgid "Proxy should be http://..."
 msgstr "Proxy burde være http://..."
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:741
 msgid "Proxy should be ftp://..."
 msgstr "Proxy burde være ftp://..."
 
-#: ../install_steps_interactive.pm_.c:736 ../standalone/draksec_.c:20
-msgid "Windows(TM)"
-msgstr "Windows(TM)"
-
-#: ../install_steps_interactive.pm_.c:737 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:752 ../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Dårlig"
 
-#: ../install_steps_interactive.pm_.c:738 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:753 ../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lav"
 
-#: ../install_steps_interactive.pm_.c:739 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../install_steps_interactive.pm_.c:740 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:24
 msgid "High"
 msgstr "Høy"
 
-#: ../install_steps_interactive.pm_.c:741 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../install_steps_interactive.pm_.c:754
+#: ../install_steps_interactive.pm_.c:769
 msgid "Miscellaneous questions"
 msgstr "Forskjellige spørsmål"
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:770
 msgid "(may cause data corruption)"
 msgstr "(kan forårsake korrupsjon av data)"
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:770
 msgid "Use hard drive optimisations?"
 msgstr "Bruk harddisk-optimisering?"
 
-#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:29
+#: ../install_steps_interactive.pm_.c:771 ../standalone/draksec_.c:29
 msgid "Choose security level"
 msgstr "Velg sikkerhetsnivå"
 
-#: ../install_steps_interactive.pm_.c:757
+#: ../install_steps_interactive.pm_.c:772
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-størrelse hvis det trengs (funnet %d MB)"
 
-#: ../install_steps_interactive.pm_.c:758
+#: ../install_steps_interactive.pm_.c:773
 msgid "Removable media automounting"
 msgstr "Fjernbart media automonterer"
 
-#: ../install_steps_interactive.pm_.c:760
+#: ../install_steps_interactive.pm_.c:775
 msgid "Enable num lock at startup"
 msgstr "Slå på num lock ved oppstart"
 
-#: ../install_steps_interactive.pm_.c:763
+#: ../install_steps_interactive.pm_.c:778
 msgid "Give the ram size in Mb"
 msgstr "Oppgi ram-størrelsen i Mb"
 
-#: ../install_steps_interactive.pm_.c:791
-#: ../install_steps_interactive.pm_.c:904
+#: ../install_steps_interactive.pm_.c:794
+#: ../unused/install_steps_graphical.pm_.c:535
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
+#: ../install_steps_interactive.pm_.c:806
+#: ../install_steps_interactive.pm_.c:919
 msgid "Try to find PCI devices?"
 msgstr "Prøve å finne PCI-enheter?"
 
-#: ../install_steps_interactive.pm_.c:806
+#: ../install_steps_interactive.pm_.c:821
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -2783,7 +2649,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å slutte nå?"
 
-#: ../install_steps_interactive.pm_.c:813
+#: ../install_steps_interactive.pm_.c:828
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2805,26 +2671,26 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Linux Mandrake User's Guide."
 
-#: ../install_steps_interactive.pm_.c:822
+#: ../install_steps_interactive.pm_.c:837
 msgid "Shutting down"
 msgstr "Stenger av"
 
-#: ../install_steps_interactive.pm_.c:836
+#: ../install_steps_interactive.pm_.c:851
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../install_steps_interactive.pm_.c:837
+#: ../install_steps_interactive.pm_.c:852
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
-#: ../install_steps_interactive.pm_.c:847
+#: ../install_steps_interactive.pm_.c:862
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Hvilken %s driver skal jeg prøve?"
 
-#: ../install_steps_interactive.pm_.c:855
+#: ../install_steps_interactive.pm_.c:870
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2844,20 +2710,20 @@ msgstr ""
 "forårsake\n"
 "noen skade."
 
-#: ../install_steps_interactive.pm_.c:860
+#: ../install_steps_interactive.pm_.c:875
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../install_steps_interactive.pm_.c:860
+#: ../install_steps_interactive.pm_.c:875
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../install_steps_interactive.pm_.c:864
+#: ../install_steps_interactive.pm_.c:879
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan nå gi dens opsjoner til modul %s."
 
-#: ../install_steps_interactive.pm_.c:870
+#: ../install_steps_interactive.pm_.c:885
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2868,11 +2734,11 @@ msgstr ""
 "Opsjonene er i format ``name=value name2=value2 ...''.\n"
 "F.eks., ``io=0x300 irq=7''"
 
-#: ../install_steps_interactive.pm_.c:873
+#: ../install_steps_interactive.pm_.c:888
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../install_steps_interactive.pm_.c:883
+#: ../install_steps_interactive.pm_.c:898
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -2881,43 +2747,43 @@ msgstr ""
 "Lasting av modul %s feilet.\n"
 "Ønsker du å prøve igjen med andre parametere?"
 
-#: ../install_steps_interactive.pm_.c:896
+#: ../install_steps_interactive.pm_.c:911
 msgid "Try to find PCMCIA cards?"
 msgstr "Prøve å finne PCMCIA-kort?"
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:912
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurerer PCMCIA-kort..."
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:912
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../install_steps_interactive.pm_.c:908
+#: ../install_steps_interactive.pm_.c:923
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../install_steps_interactive.pm_.c:909
+#: ../install_steps_interactive.pm_.c:924
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../install_steps_interactive.pm_.c:910
+#: ../install_steps_interactive.pm_.c:925
 #, c-format
 msgid "Do you have any %s interface?"
 msgstr "Har du noen %s grensesnitt?"
 
-#: ../install_steps_interactive.pm_.c:912 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
 #: ../my_gtk.pm_.c:422 ../printerdrake.pm_.c:176
 msgid "No"
 msgstr "Nei"
 
-#: ../install_steps_interactive.pm_.c:912 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
 #: ../my_gtk.pm_.c:422
 msgid "Yes"
 msgstr "Ja"
 
-#: ../install_steps_interactive.pm_.c:913
+#: ../install_steps_interactive.pm_.c:928
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
@@ -3567,6 +3433,10 @@ msgstr "Kan ikke skrive fil $fil"
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ikke nok partisjoner for RAID nivå %d\n"
 
+#: ../standalone/draksec_.c:20
+msgid "Windows(TM)"
+msgstr "Windows(TM)"
+
 #: ../standalone/draksec_.c:30
 msgid "Setting security level"
 msgstr "Setter sikkerhetsnivå"
@@ -3583,6 +3453,279 @@ msgstr "Velg hvilke tjenester som skal startes automatisk ved oppstart"
 msgid "no serial_usb found\n"
 msgstr "ingen serie_usb funnet\n"
 
+#: ../standalone/mousedrake_.c:35
+msgid "Emulate third button?"
+msgstr "Emulere tredje knapp?"
+
+#: ../unused/install_steps_graphical.pm_.c:433
+#, fuzzy
+msgid "Show less"
+msgstr "Vis alle"
+
+#: ../unused/install_steps_graphical.pm_.c:434
+msgid "Show more"
+msgstr ""
+
+#~ msgid "You can now select some miscellaneous options for your system."
+#~ msgstr "Du kan nå velge noen forskjellige opsjoner for systemet ditt."
+
+#~ msgid "Exit Linux-Mandrake installation to reboot your system."
+#~ msgstr ""
+#~ "Avslutt Linux-Mandrake installasjonen for å starte systemet på nytt."
+
+#~ msgid ""
+#~ "Choose \"Installation\" if there are no previous versions of Linux\n"
+#~ "installed, or if you wish to use multiple distributions or versions.\n"
+#~ "\n"
+#~ "\n"
+#~ "Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+#~ "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+#~ msgstr ""
+#~ "Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
+#~ "av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
+#~ "versjoner.\n"
+#~ "\n"
+#~ "\n"
+#~ "Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
+#~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ "  - Beginner: If you have never installed Linux before, and wish to\n"
+#~ "install the distribution elected \"Product of the year\" for 1999,\n"
+#~ "click here.\n"
+#~ "\n"
+#~ "  - Developer: If you are familiar with Linux and will be using the\n"
+#~ "computer primarily for software development, you will find happiness\n"
+#~ "here.\n"
+#~ "\n"
+#~ "  - Server: If you wish to install a general purpose server, or the\n"
+#~ "Linux distribution elected \"Distribution/Server\" for 1999, select\n"
+#~ "this.\n"
+#~ "\n"
+#~ "  - Expert: If you are fluent with GNU/Linux and want to perform\n"
+#~ "a highly customized installation, this Install Class is for you."
+#~ msgstr ""
+#~ "Velg:\n"
+#~ "\n"
+#~ "  - Nybegynner: Hvis du ikke har installert Linux før, eller ønsker å\n"
+#~ "installere distribusjonen valgt til \"Product of the year\" for 1999,\n"
+#~ "klikk her.\n"
+#~ "\n"
+#~ "  - Utvikler: hvis du kjent med Linux og primært vil bruke datamaskinen\n"
+#~ "din til å utvikle programvare vil du finne lykken her.\n"
+#~ "\n"
+#~ "  - Tjener: Hvis du ønsker å installere en tjener, eller Linux-\n"
+#~ "distribusjonen valgt til \"Distribution/Server\" for 1999, velg denne.\n"
+#~ "\n"
+#~ "  - Ekspert: Hvis du allerede kjenner GNU/Linux og ønsker å gjøre en\n"
+#~ "egendefinert installasjon, så er dette installasjonsvalget for deg."
+
+#~ msgid ""
+#~ "DrakX will attempt at first to look for one or more PCI\n"
+#~ "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
+#~ "to use, it will insert it (them)  automatically.\n"
+#~ "\n"
+#~ "If your SCSI adapter is ISA, or is PCI but DrakX doesn't know\n"
+#~ "which driver to use for this card, or if you have no SCSI adapters\n"
+#~ "at all, you will then be prompted on whether you have one or not.\n"
+#~ "If you have none, answer \"No\". If you have one or more, answer\n"
+#~ "\"Yes\". A list of drivers will then pop up, from which you will\n"
+#~ "have to select one.\n"
+#~ "\n"
+#~ "After you have selected the driver, DrakX will ask if you\n"
+#~ "want to specify options for it. First, try and let the driver\n"
+#~ "probe for the hardware: it usually works fine.\n"
+#~ "\n"
+#~ "If not, do not forget the information on your hardware that you\n"
+#~ "could get from you documentation or from Windows (if you have\n"
+#~ "it on your system), as suggested by the installation guide.\n"
+#~ "These are the options you will need to provide to the driver."
+#~ msgstr ""
+#~ "DrakX vil først forsøke å se etter et eller flere PCI\n"
+#~ "SCSI-adapter(ere). Hvis den finner det (eller dem) og vet hvilken\n"
+#~ "driver(ere) som skal brukes, vil denne (disse) bli lagt inn automatisk.\n"
+#~ "\n"
+#~ "Hvis SCSI-adapteret ditt er ISA, eller PCI, men DrakX ikke vet\n"
+#~ "hvilken driver som skal brukes for dette kortet, eller hvis du ikke\n"
+#~ "har noen SCSI-adapterere i det hele tatt, vil du bli spurt om du\n"
+#~ "har noen eller ikke. Hvis du ikke har noen, svar \"Nei\". Hvis du\n"
+#~ "har et eller fler, svar \"Ja\". En liste over drivere vil så komme\n"
+#~ "opp, som du må velge en driver fra.\n"
+#~ "\n"
+#~ "Etter at du har valgt driveren vil DrakX spørre deg om du ønsker\n"
+#~ "å spesifisere opsjonene for denne. Først, prøv å la driveren søke\n"
+#~ "etter maskinvare: Dette fungerer vanligvis fint.\n"
+#~ "\n"
+#~ "Hvis ikke, glem ikke informasjonen om maskinvaren din som du kan få\n"
+#~ "fra dokumentasjonen din eller fra Windows (hvis du har denne på systemet\n"
+#~ "ditt), som foreslått i installasjonsguiden. Dette er opsjonene du vil\n"
+#~ "trenge å gi til driveren."
+
+#~ msgid ""
+#~ "In this stage, you may choose what partition(s) use to install your\n"
+#~ "Linux-Mandrake system."
+#~ msgstr ""
+#~ "På dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n"
+#~ "å installere Linux-Mandrake systemet ditt."
+
+#~ msgid ""
+#~ "You may now select the packages you wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "Please note that some packages require the installation of others.\n"
+#~ "These are referred to as package dependencies. The packages you select,\n"
+#~ "and the packages they require will be automatically selected for\n"
+#~ "install. It is impossible to install a package without installing all\n"
+#~ "of its dependencies.\n"
+#~ "\n"
+#~ "\n"
+#~ "Information on each category and specific package is available in the\n"
+#~ "area titled \"Info\",  located between list of packages and the five\n"
+#~ "buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+#~ msgstr ""
+#~ "Du kan nå velge de pakkene du ønsker å installere.\n"
+#~ "\n"
+#~ "\n"
+#~ "Vennligst merk at noen pakker er avhengige av installasjon av andre pakker.\n"
+#~ "Disse blir referert til som pakkeavhengigheter. Pakkene du velger, og\n"
+#~ "pakkene disse trenger vil automatisk bli valgt for installering.\n"
+#~ "Det er ikke mulig å installere en pakke uten å installere alle dens\n"
+#~ "avhengigheter.\n"
+#~ "\n"
+#~ "\n"
+#~ "Informasjon om hver kategori og spesifikke pakker er tilgjengelig i området\n"
+#~ "kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n"
+#~ "\"Installer\", \"Velg flere/færre\" og \"Vis flere/færre\"."
+
+#~ msgid ""
+#~ "The packages selected are now being installed.\n"
+#~ "\n"
+#~ "\n"
+#~ "This operation should take a few minutes."
+#~ msgstr ""
+#~ "Pakkene som er valgt blir nå installert.\n"
+#~ "\n"
+#~ "\n"
+#~ "Denne operasjonen burde ta noen minutter."
+
+#~ msgid ""
+#~ "This section is dedicated to configuring a local area network,\n"
+#~ "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
+#~ "Ethernet adapter on your machine. PCI adapters should be found and\n"
+#~ "initialized automatically. However, if your peripheral is ISA,\n"
+#~ "autodetection will not work, and you will have to choose a driver\n"
+#~ "from the list that will appear then.\n"
+#~ "\n"
+#~ "\n"
+#~ "As for SCSI adapters, you can let the driver probe for the adapter\n"
+#~ "in the first time, otherwise you will have to specify the options\n"
+#~ "to the driver that you will have fetched from Windows' control\n"
+#~ "panel.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you install a Linux-Mandrake system on a machine which is part\n"
+#~ "of an already existing network, the network administrator will\n"
+#~ "have given you all necessary information (IP address, network\n"
+#~ "submask or netmask for short, and hostname). If you're setting\n"
+#~ "up a private network at home for example, you should choose\n"
+#~ "addresses "
+#~ msgstr ""
+#~ "Denne seksjonen er dedikert til konfigurering av et lokalt nettverk,\n"
+#~ "eller LAN. Hvis du svarer \"Ja\" her, vil DrakX forsøke å finne\n"
+#~ "et Ethernet-adapter i maskinen din. PCI-adaptere burde bli funnet og\n"
+#~ "initialisert automatisk. Men, hvis det er et ISA, vil ikke automatisk\n"
+#~ "oppdaging virke, og du må velge en driver fra listen som så vil vises.\n"
+#~ "\n"
+#~ "\n"
+#~ "For SCSI-adaptere kan du la driveren søke etter adapteret første\n"
+#~ "gangen, ellers må du spesifisere opsjonene for driveren som du\n"
+#~ "har innhentet fra Windows sitt kontrollpanel.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hvis du installerer et Linux-Mandrake system på en maskin som er en del\n"
+#~ "av et allerede eksisterende nettverk, vil nettverks-administratoren\n"
+#~ "ha gitt deg all nødvendig informasjon (IP-adresse, nettverks-\n"
+#~ "submask eller netmask, og vertsnavn). Hvis du f.eks. setter\n"
+#~ "opp et privat nettverk hjemme, burde du velge adresser."
+
+#~ msgid ""
+#~ "Linux can deal with many types of printer. Each of these\n"
+#~ "types require a different setup.\n"
+#~ "\n"
+#~ "\n"
+#~ "If your printer is directly connected to your computer, select\n"
+#~ "\"Local printer\". You will then have to tell which port your\n"
+#~ "printer is connected to, and select the appropriate filter.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a printer located on a remote Unix machine,\n"
+#~ "you will have to select \"Remote lpd queue\". In order to make\n"
+#~ "it work, no username or password is required, but you will need\n"
+#~ "to know the name of the printing queue on this server.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you want to access a SMB printer (which means, a printer located\n"
+#~ "on a remote Windows 9x/NT machine), you will have to specify its\n"
+#~ "SMB name (which is not its TCP/IP name), and possibly its IP address,\n"
+#~ "plus the username, workgroup and password required in order to\n"
+#~ "access the printer, and of course the name of the printer.The same goes\n"
+#~ "for a NetWare printer, except that you need no workgroup information."
+#~ msgstr ""
+#~ "Linux kan håndtere mange typer av skrivere. Hver av disse\n"
+#~ "trenger forskjellige oppsett.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hvis skriveren din er direkte koblet til maskinen din, velg\n"
+#~ "\"Lokal skriver\". Du må så fortelle hvilken port skriveren\n"
+#~ "din er koblet til, og velge passende filter.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hvis du ønsker tilgang til en skriver lokalisert på en fjern Unix-maskin,\n"
+#~ "må du velge \"Fjern-lpd-kø\". For at dette skal virke trengs ikke\n"
+#~ "brukernavn eller passord, men du må vite navnet på skriverkøen på\n"
+#~ "denne tjeneren.\n"
+#~ "\n"
+#~ "\n"
+#~ "Hvis du ønsker tilgang en SMB-skriver (som betyr en skriver lokalisert\n"
+#~ "på en fjern Windows 9x/NT maskin), må du spesifisere dens SMB-navn\n"
+#~ "(som ikke er dens TCP/IP-navn), og muligens dens IP-adresse, pluss\n"
+#~ "brukernavn, arbeidsgruppe og passord som behøves for å få tilgang til\n"
+#~ "skriveren, og selvfølgelig navnet på skriveren. Det samme gjelder for\n"
+#~ "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
+#~ "informasjon."
+
+#~ msgid ""
+#~ "You must now enter the root password for your Linux-Mandrake\n"
+#~ "system. The password must be entered twice to verify that both\n"
+#~ "password entries are identical.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root is the administrator of the system, and is the only user\n"
+#~ "allowed to modify the system configuration. Therefore, choose\n"
+#~ "this password carefully! Unauthorized use of the root account can\n"
+#~ "be extremely dangerous to the integrity of the system and its data,\n"
+#~ "and other systems connected to it. The password should be a\n"
+#~ "mixture of alphanumeric characters and a least 8 characters long. It\n"
+#~ "should *never* be written down. Do not make the password too long or\n"
+#~ "complicated, though: you must be able to remember without too much\n"
+#~ "effort."
+#~ msgstr ""
+#~ "Du må nå entre root-passordet for Linux-Mandrake systemet ditt.\n"
+#~ "Passordet må entres to ganger for å verifisere at begge passord-\n"
+#~ "inntastingene er identiske.\n"
+#~ "\n"
+#~ "\n"
+#~ "Root er administratoren av systemet, og er den eneste brukeren som\n"
+#~ "har adgang til å modifisere systemkonfigurasjonen. Velg derfor dette\n"
+#~ "passordet med forsiktighet! Ikke-autorisert bruk av root-kontoen kan\n"
+#~ "være ekstremt farlig for integriteten til systemet, dataene det inneholder,\n"
+#~ "og andre systemer tilkoblet dette. Passordet bør være en miks av\n"
+#~ "alfanumeriske tegn og være minst åtte tegn langt. Passordet bør *aldri*\n"
+#~ "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
+#~ "du må kunne klare å huske det."
+
 #~ msgid ""
 #~ "Is this correct? Printing status:\n"
 #~ "%s"
diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc
index dd6e5e283..ea9bc22d5 100644
--- a/perl-install/share/themes-marble3d.rc
+++ b/perl-install/share/themes-marble3d.rc
@@ -1,9 +1,46 @@
+style "checkradiobutton" {
+  engine "pixmap" {
+    image 
+      {
+        function        = CHECK
+	recolorable     = TRUE
+	shadow          = OUT
+	overlay_file    = "marble3d-check1.png"
+	overlay_stretch = FALSE
+      }
+    image 
+      {
+        function        = CHECK
+	recolorable     = TRUE
+	shadow          = IN
+	overlay_file    = "marble3d-check2.png"
+	overlay_stretch = FALSE
+      }
+    image 
+      {
+        function        = FOCUS
+	recolorable     = TRUE
+	overlay_file    = "focus.png"
+	overlay_border  = { 4, 4, 4, 4 }
+	overlay_stretch = TRUE
+      }
+  }
+}
+
 style "button"
 {
   engine "pixmap" 
     {
     image 
       {
+        function        = FOCUS
+	recolorable     = TRUE
+	overlay_file    = "focus.png"
+	overlay_border  = { 4, 4, 4, 4 }
+	overlay_stretch = TRUE
+      }
+    image 
+      {
         function        = BOX
 	recolorable     = TRUE
 	state           = NORMAL
@@ -144,3 +181,6 @@ widget_class "*Gtk*List*" style "entry"
 widget_class "*GtkNotebook*" style "notebook"
 widget "*GtkButton" style "button"
 widget "*background*" style "background"
+
+class "GtkRadioButton" style "checkradiobutton"
+class "GtkCheckButton" style "checkradiobutton"
diff --git a/perl-install/share/themes/focus.png b/perl-install/share/themes/focus.png
new file mode 100644
index 000000000..70afb1797
--- /dev/null
+++ b/perl-install/share/themes/focus.png
diff --git a/perl-install/share/themes/marble3d-check1.png b/perl-install/share/themes/marble3d-check1.png
new file mode 100644
index 000000000..f3c31d09c
--- /dev/null
+++ b/perl-install/share/themes/marble3d-check1.png
diff --git a/perl-install/share/themes/marble3d-check2.png b/perl-install/share/themes/marble3d-check2.png
new file mode 100644
index 000000000..5261472f9
--- /dev/null
+++ b/perl-install/share/themes/marble3d-check2.png