new help

3 files changed, 541 insertions, 315 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index a2e930fff..0b0e8da44 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -3,169 +3,218 @@ use common;
 %steps = (
 empty => '',
 
-acceptLicense => 
-__("Before going further, you should read carefully the terms of the license. It
-covers the whole Mandrake Linux distribution, and if you do not agree with all
-the terms in it, click on the Refuse button. That'll immediately terminate the
-installation. To follow on with the installation, click the Accept button."),
-
 addUser => 
 __("GNU/Linux is a multiuser system, and this means that each user can have his own
-preferences, his own files and so on. You can read the User Guide to learn more.
-But unlike Root, which is the administrator, the users which you will add here
+preferences, his own files and so on. You can read the ``User Guide'' to learn
+more. But unlike root, which is the administrator, the users you will add here
 will not be entitled to change anything except their own files and their own
 configuration. You will have to create at least one regular user for yourself.
 That account is where you should log in for routine use. Although it is very
-practical to log in as Root everyday, it may also be very dangerous! The
+practical to log in as root everyday, it may also be very dangerous! The
 slightest mistake could mean that your system would not work any more. If you
 make a serious mistake as a regular user, you may only lose some information,
 but not the entire system.
 
-First you have to enter your real name. This is not mandatory, of course as you
-can actually enter whatever you want. drakX will then take the first word you
-have entered in the box and will bring it over to the User name. This is the
-name that this particular user will use to log into the system. You can change
-it. You then have to enter a password here. A non-privileged (regular) user's
-password is not as crucial as that of Root from a security point of view, but
-that is no reason to neglect it after all, they are your files at risk.
+First, you have to enter your real name. This is not mandatory, of course - as
+you can actually enter whatever you want. DrakX will then take the first word
+you have entered in the box and will bring it over to the User name. This is the
+name this particular user will use to log into the system. You can change it.
+You then have to enter a password here. A non-privileged (regular) user's
+password is not as crucial as that of root from a security point of view, but
+that is no reason to neglect it - after all, your files are at risk.
 
 If you click on Accept user, you can then add as many as you want. Add a user
-for each of your friends: your father or your sister, for example. When you have
-added all the users you want, select Done.
+for each one of your friends: your father or your sister, for example. When you
+finish adding all the users you want, select Done.
 
-Clicking the Advanced button allows you to change the default Shell for that
+Clicking the Advanced button allows you to change the default shell for that
 user (bash by default)."),
 
+ask_mntpoint_s => 
+__("Listed above are the existing Linux partitions detected on your hard drive. You
+can keep the choices made by the wizard, they are good for most common installs.
+If you make any changes, you must at least define a root partition (\"/\"). Do
+not choose too small a partition or you will not be able to install enough
+software. If you want to store your data on a separate partition, you will also
+need to create a partition for /home (only possible if you have more than one
+Linux partition available).
+
+Each partition is listed as follows: \"Name\", \"Capacity\".
+
+\"Name\" is structured: \"hard drive type\", \"hard drive number\", \"partition
+number\" (for example, \"hda1\").
+
+\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and \"sd\"
+if it is a SCSI hard drive.
+
+\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE hard
+drives:
+
+ * \"a\" means \"master hard drive on the primary IDE controller\",
+
+ * \"b\" means \"slave hard drive on the primary IDE controller\",
+
+ * \"c\" means \"master hard drive on the secondary IDE controller\",
+
+ * \"d\" means \"slave hard drive on the secondary IDE controller\".
+
+With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means \"second
+lowest SCSI ID\", etc."),
+
+chooseCd => 
+__("The Mandrake Linux installation is spread out over several CDROMs. DrakX knows
+if a selected package is located on another CDROM and will eject the current CD
+and ask you to insert a different one as required."),
+
 choosePackages => 
 __("It is now time to specify which programs you wish to install on your system.
 There are thousands of packages available for Mandrake Linux, and you are not
 supposed to know them all by heart.
 
-If you are performing a standard installation from CDROM you will first be asked
-to specify the CDs you currently have. Check the boxes corresponding to the CDs
-you've got around and click OK.
+If you are performing a standard installation from CDROM, you will first be
+asked to specify the CDs you currently have. Check the CD labels and highlight
+the boxes corresponding to the CDs you have available for installation. Click OK
+when you are ready to continue.
 
 Packages are sorted in groups corresponding to a particular use of your machine.
-The groups themselves are sorted in four sections:
+The groups themselves are sorted into four sections:
 
- * Workstation: If your machine will be used as a workstation, select one or more
-of the corresponding groups.
+ * Workstation: if you plant to use your machine as a workstation, select one or
+more of the corresponding groups.
 
- * Graphical Environment: Select here your preferred graphical environment.
-Select one at least if you want to have a graphical workstation!
+ * Graphical Environment: this is where you will choose your preferred graphical
+environment. At least one must be selected if you want to have a graphical
+workstation!
 
- * Development: if the machine will be used for programming choose the desired
+ * Development: if the machine is to be used for programming, choose the desired
 group(s).
 
- * Server: Finally, if the machine is intended to be a server, you are able here
-to select the most common services that you wish to see installed on the
+ * Server: finally, if the machine is intended to be a server, you will be able
+to select which of the most common services you wish to see installed on the
 machine.
 
 Moving the mouse cursor over a group name will display a short explanatory text
-about this group.
+about that group.
 
-Clicking the Advanced button, will allow you to select the Individual package
-selection option. This is useful if you know well the packages offered or if you
-want to have total control on what will be installed.
+Clicking the Advanced button will allow you to select the Individual package
+selection option. This is useful if you are familiar with the packages being
+offered or if you want to have total control over what will be installed.
 
-If you have started the installation in ``Update'' mode, you can unselect all
-groups to avoid installing any new package and just repair or update the
-existing system.
+If you started the installation in \"Update\" mode, you can unselect all groups
+to avoid installing any new package. This is useful for repairing or updating an
+existing system."),
 
-Finally, depending whether you choose to select individual packages or not, you
-will be presented a tree containing all packages classified by groups and
-subgroups. While browsing the tree, you can select entire groups, subgroups, or
-simply packages.
+choosePackagesTree => 
+__("Finally, depending on your choice of whether or not to select individual
+packages, you will be presented a tree containing all packages classified by
+groups and subgroups. While browsing the tree, you can select entire groups,
+subgroups, or individual packages.
 
 Whenever you select a package on the tree, a description appears on the right.
-When you have finished with your selections, click the Install button. The
-installation itself then begins. If you have chosen to install a lot of
-packages, you can go and have a cup of coffee.
-
-!! If it happens that a server package has been selected either intentionnally
-or because it was part of a whole group; you will be asked to confirm that you
-really want those servers to be installed. Under Mandrake Linux, installed
-servers are started by default at boot time. Even if they are safe at the time
-the distribution was shipped, it may happen that security holes be discovered
-afterwards. In particular if you don't know what all that is about, simply click
-No here. Clickin Yes will install the listed services and they will be available
-by default. !!
-
-The Automatic dependencies option simply disable the warning dialog which
-appears whenever the installer automatically selects a package because it is a
-dependency of another package you just selected."),
+When your selection is finished, click the Install button which will then launch
+the installation process. Depending on the speed of your hardware and the number
+of packages that need to be installed, it may take a while to complete the
+process. A time to complete estimate is displayed on the screen to help you
+gauge if there is sufficient time to enjoy a cup of coffee.
+
+!! If a server package has been selected either intentionally or because it was
+part of a whole group, you will be asked to confirm that you really want those
+servers to be installed. Under Mandrake Linux, any installed servers are started
+by default at boot time. Even if they are safe and have no known issues at the
+time the distribution was shipped, it may happen that security holes are
+discovered after this version of Mandrake Linux was finalized. If you do not
+know what a particular service is supposed to do or why it is being installed,
+then click No. Clicking Yes will install the listed services and they will be
+started automatically by default. !!
+
+The Automatic dependencies option simply disables the warning dialog which
+appears whenever the installer automatically selects a package. This occurs
+because it has determined that it needs to satisfy a dependency with another
+package in order to successfully complete the installation.
+
+The tiny floppy disc icon at the bottom of the list allows to load the packages
+list chosen during a previous installation. Clicking on this icon will ask you
+to insert a floppy disk previously created at the end of another installation.
+See the second tip of last step on how to create such a floppy."),
 
 configureNetwork => 
-__("If you wish to connect your computer to the Internet or to a local network
+__("If you wish to connect your computer to the Internet or to a local network,
 please choose the correct option. Please turn on your device before choosing the
-correct option to let DrakX detect it automaticall.
-
-Mandrake Linux offers you to configure your Internet connection at install time.
-Available connections are: traditional modem, ISDN modem, ADSL connection, cable
-modem, and finally a simple LAN connection (Ethernet).
+correct option to let DrakX detect it automatically.
 
-We won't enter here into the details of each configuration. Simply make sure
-that you have all the parameters from your Internet Service Provider or system
-administrator.
+Mandrake Linux proposes the configuration of an Internet connection at
+installation time. Available connections are: traditional modem, ISDN modem,
+ADSL connection, cable modem, and finally a simple LAN connection (Ethernet).
 
-You can consult the chapter of the manual about Internet connection for details
-about the configuration, or simply wait until your system is installed and use
-the program described there to configure your connection.
+Here, we will not detail each configuration. Simply make sure that you have all
+the parameters from your Internet Service Provider or system administrator.
 
-If you do not have any connection to the Internet or a local network, choose
-\"Disable networking\".
+You can consult the manual chapter about Internet connections for details about
+the configuration, or simply wait until your system is installed and use the
+program described there to configure your connection.
 
 If you wish to configure the network later after installation or if you have
-finished to configure your network connection, choose \"Done\"."),
+finished configuring your network connection, click Cancel."),
 
 configureServices => 
-__("You may now choose which services you want to start at boot time.
+__("You may now choose which services you wish to start at boot time.
 
 Here are presented all the services available with the current installation.
-Review them carefully and uncheck those that are not always needed at boot time.
+Review them carefully and uncheck those which are not always needed at boot
+time.
+
+You can get a short explanatory text about a service by selecting a specific
+service. However, if you are not sure whether a service is useful or not, it is
+safer to leave the default behavior.
+
+At this stage, be very careful if you intend to use your machine as a server:
+you will probably not want to start any services that you do not need. Please
+remember that several services can be dangerous if they are enabled on a server.
+In general, select only the services you really need."),
 
-You can get a short explanatory text on a service by placing the mouse cursor on
-the service name. If you are not sure whether a service is useful or not, it is
-safer to leave the default behavior though.
+configureTimezoneGMT => 
+__("GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in local
+time according to the time zone you selected.
 
-Be very careful in this step if you intend to use your machine as a server: you
-will probably want not to start any services that you don't need. Please
-remember that several services can be dangerous if they are enable on a server.
-In general, select only the services that you really need."),
+If you use Microsoft Windows on this computer, choose No."),
 
 configureX => 
 __("X (for X Window System) is the heart of the GNU/Linux graphical interface on
 which all the graphics environments (KDE, Gnome, AfterStep, WindowMaker...)
-bundled with Mandrake Linux rely. In this section, drakX will try to configure X
+bundled with Mandrake Linux rely. In this section, DrakX will try to configure X
 automatically.
 
-It is extremely rare for it to fail. The only reason for it doing so is if the
-hardware is very old (or very new). If it succeeds, it will start X
-automatically with the best resolution possible depending on the size of the
-monitor. A window will then appear and ask you if you can see it.
+It is extremely rare for it to fail, unless the hardware is very old (or very
+new). If it succeeds, it will start X automatically with the best resolution
+possible depending on the size of the monitor. A window will then appear and ask
+you if you can see it.
 
 If you are doing an Expert install, you will enter the X configuration wizard.
 See the corresponding section of the manual for more information about this
 wizard.
 
-If you can see the message and answer Yes, then drakX will proceed to next step.
-If you cannot see the message, it simply means that the configuration was wrong
-and the test will automatically end after 10 seconds, restoring the screen.
+If you can see the message and answer Yes, then DrakX will proceed to the next
+step. If you cannot see the message, it simply means that the configuration was
+wrong and the test will automatically end after 10 seconds, restoring the
+screen."),
 
-It can happen that the first try isn't the best display (screen is too small,
-shifted left or right...). This is why, even if X starts up correctly, drakX
-will then ask you if the configuration suits you and will propose to change it
-by displaying a list of valid modes it could find, asking you to select one.
+configureXmain => 
+__("The first time you try the X configuration, you may not be very satisfied with
+its display (screen is too small, shifted left or right...). Hence, even if X
+starts up correctly, DrakX then asks you if the configuration suits you. It will
+also propose to change it by displaying a list of valid modes it could find,
+asking you to select one.
 
 As a last resort, if you still cannot get X to work, choose Change graphics
 card, select Unlisted card, and when prompted on which server you want, choose
 FBDev. This is a failsafe option which works with any modern graphics card. Then
-choose Test again to be sure.
+choose Test again to be sure."),
 
-Finally, you will be asked on whether you want to see the graphical interface at
-boot. Note that you will be asked this even if you chose not to test the
-configuration. Obviously, you want to answer No if your machine will act as a
-server or if you were not successful in getting the display configured."),
+configureXxdm => 
+__("Finally, you will be asked whether you want to see the graphical interface at
+boot. Note this question will be asked even if you chose not to test the
+configuration. Obviously, you want to answer No if your machine is to act as a
+server, or if you were not successful in getting the display configured."),
 
 createBootdisk => 
 __("The Mandrake Linux CDROM has a built-in rescue mode. You can access it by
@@ -173,7 +222,7 @@ booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at the
 prompt. But in case your computer cannot boot from the CDROM, you should come
 back to this step for help in at least two situations:
 
- * when installing the boot loader, drakX will rewrite the boot sector (MBR) of
+ * when installing the boot loader, DrakX will rewrite the boot sector (MBR) of
 your main disk (unless you are using another boot manager) so that you can start
 up with either Windows or GNU/Linux (assuming you have Windows in your system).
 If you need to reinstall Windows, the Microsoft install process will rewrite the
@@ -181,73 +230,73 @@ boot sector, and then you will not be able to start GNU/Linux!
 
  * if a problem arises and you cannot start up GNU/Linux from the hard disk, this
 floppy disk will be the only means of starting up GNU/Linux. It contains a fair
-number of system tools for restoring a system which has crashed due to a power
+number of system tools for restoring a system, which has crashed due to a power
 failure, an unfortunate typing error, a typo in a password, or any other reason.
 
 When you click on this step, you will be asked to enter a disk inside the drive.
-The floppy disk that you will insert must be empty or must only contain data
-which you do not need. You will not have to format it; drakX will rewrite the
-whole disk."),
+The floppy disk you will insert must be empty or contain data which you do not
+need. You will not have to format it since DrakX will rewrite the whole disk."),
 
 doPartitionDisks => 
-__("At this point, you need to choose where to install your Mandrake Linux operating
-system on your hard drive. If it is empty or if an existing operating system
-uses all the space available on it, you need to partition it. Basically,
-partitioning a hard drive consists of logically dividing it to create space to
-install your new Mandrake Linux system.
+__("At this point you need to choose where on your hard drive to install your
+Mandrake Linux operating system. If your hard drive is empty or if an existing
+operating system is using all the space available, you will need to partition
+it. Basically, partitioning a hard drive consists of logically dividing it to
+create space to install your new Mandrake Linux system.
 
 Because the effects of the partitioning process are usually irreversible,
 partitioning can be intimidating and stressful if you are an inexperienced user.
-Hopefully, there is a wizard which simplifies this process. Before beginning,
+Fortunately, there is a wizard which simplifies this process. Before beginning,
 please consult the manual and take your time.
 
-If you are running the install in Expert mode, you will enter the Mandrake Linux
-partitioning tool: DiskDrake;. It allows you to fine-tune your partitions. See
-the chapter DiskDrake of the manual; the usage is the same. You can use from the
-installation interface the wizards as described here by clicking the button
-Wizard from the interface.
+If you are running the install in Expert mode, you will enter DiskDrake, the
+Mandrake Linux partitioning tool, which allows you to fine-tune your partitions.
+See the DiskDrake chapter of the manual. From the installation interface, you
+can use the wizards as described here by clicking the Wizard button of the
+dialog.
 
-If partitions have been already defined (from a previous installation or from
-another partitioning tool), you just need choose those to use to install your
-Linux system.
+If partitions have already been defined, either from a previous installation or
+from another partitioning tool, simply select those to install your Linux
+system.
 
-If partitions haven't been already defined, you need to create them. To do that,
-use the wizard available above. Depending of your hard drive configuration,
-several options are available:
+If partitions are not defined, you will need to create them using the wizard.
+Depending on your hard drive configuration, several options are available:
 
- * Use free space: it will simply lead to an automatic partitioning of your blank
-drive(s); you won't need to worry any more about it.
+ * Use free space: this option will simply lead to an automatic partitioning of
+your blank drive(s). You will not be prompted further.
 
  * Use existing partition: the wizard has detected one or more existing Linux
-partitions on your hard drive. If you want to keep them, choose this option.
-
- * Erase entire disk: if you want delete all data and all partitions present on
-your hard drive and replace them by your new Mandrake Linux system, you can
-choose this option. Be careful with this solution, you will not be able to
-revert your choice after confirmation.
+partitions on your hard drive. If you want to use them, choose this option.
 
  * Use the free space on the Windows partition: if Microsoft Windows is installed
-on your hard drive and takes all space available on it, you have to create free
-space for Linux data. To do that you can delete your Microsoft Windows partition
-and data (see \"Erase entire disk\" or \"Expert mode\" solutions) or resize your
-Microsoft Windows partition. Resizing can be performed without loss of any data.
-This solution is recommended if you want use both Mandrake Linux and Microsoft
-Windows on same computer.
+on your hard drive and takes all the space available on it, you have to create
+free space for Linux data. To do that, you can delete your Microsoft Windows
+partition and data (see \"Erase entire disk\" or \"Expert mode\" solutions) or
+resize your Microsoft Windows partition. Resizing can be performed without the
+loss of any data. This solution is recommended if you want to use both Mandrake
+Linux and Microsoft Windows on same computer.
+
+   Before choosing this option, please understand that after this procedure, the
+size of your Microsoft Windows partition will be smaller than at the present
+time. You will have less free space under Microsoft Windows to store your data
+or to install new software.
+
+ * Erase entire disk: if you want to delete all data and all partitions present
+on your hard drive and replace them with your new Mandrake Linux system, choose
+this option. Be careful with this solution because you will not be able to
+revert your choice after confirmation.
 
-   Before choosing this solution, please understand that the size of your Microsoft
-Windows partition will be smaller than at present time. It means that you will
-have less free space under Microsoft Windows to store your data or install new
-software.
+   !! If you choose this option, all data on your disk will be lost. !!
 
- * Remove Windows: it will simply erase everything on the drive and begin fresh,
-partitioning from scratch. All data on your disk will be lost.
+ * Remove Windows: this will simply erase everything on the drive and begin
+fresh, partitioning everything from scratch. All data on your disk will be lost.
 
-   !! If you choose this option, All data on your disk will be lost. !!
+   !! If you choose this option, all data on your disk will be lost. !!
 
- * Expert mode: if you want to partition manually your hard drive, you can choose
-this option. Be careful before choosing this solution. It is powerful but it is
-very dangerous. You can lose all your data very easily. So, don't choose this
-solution unless you know what you are doing."),
+ * Expert mode: choose this option if you want to manually partition your hard
+drive. Be careful - it is a powerful but dangerous choice. You can very easily
+lose all your data. Hence, do not choose this unless you know what you are
+doing."),
 
 exitInstall => 
 __("There you are. Installation is now complete and your GNU/Linux system is ready
@@ -257,265 +306,429 @@ booted up again.
 
 The Advanced button shows two more buttons to:
 
- * Generate auto install floppy: to create an install floppy disk that will
+ * generate auto-install floppy: to create an installation floppy disk which will
 automatically perform a whole installation without the help of an operator,
 similar to the installation you just configured.
 
    Note that two different options are available after clicking the button:
 
-    * Replay: This is a partially automated install as the partitioning step (and
+    * Replay. This is a partially automated install as the partitioning step (and
 only this one) remains interactive.
 
-    * Automated: Fully automated install: the hard disk is completely rewritten, all
+    * Automated. Fully automated install: the hard disk is completely rewritten, all
 data is lost.
 
    This feature is very handy when installing a great number of similar machines.
-See the Auto install section at our WebSite.
+See the Auto install section at our web site.
 
  * Save packages selection(*): saves the packages selection as made previously.
-Then when doing another install, insert the floppy inside the driver and run the
-install going to the help screen F1, and issuing >>linux defcfg=\"floppy\"<<.
+Then, when doing another installation, insert the floppy inside the driver and
+run the installation going to the help screen by pressing on the F1 key, and by
+issuing >>linux defcfg=\"floppy\"<<.
 
-(*) You need a FAT formatted floppy (To create one under GNU/Linux type
+(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type
 \"mformat a:\")"),
 
 formatPartitions => 
 __("Any partitions that have been newly defined must be formatted for use
-(formatting meaning creating a filesystem).
+(formatting means creating a file system).
 
 At this time, you may wish to reformat some already existing partitions to erase
-the data they contain. If you wish do that, please also select the partitions
-you want to format.
+any data they contain. If you wish to do that, please select those partitions as
+well.
 
 Please note that it is not necessary to reformat all pre-existing partitions.
-You must reformat the partitions containing the operating system (such as \"/\",
-\"/usr\" or \"/var\") but you do not have to reformat partitions containing data
-that you wish to keep (typically /home).
+You must reformat the partitions containing the operating system (such as /,
+/usr or /var) but you do not have to reformat partitions containing data that
+you wish to keep (typically /home).
 
-Please be careful selecting partitions, after formatting, all data on the
+Please be careful when selecting partitions. After formatting, all data on the
 selected partitions will be deleted and you will not be able to recover any of
 them.
 
 Click on OK when you are ready to format partitions.
 
-Click on Cancel if you want to choose other partitions to install your new
-Mandrake Linux operating system.
+Click on Cancel if you want to choose another partition for your new Mandrake
+Linux operating system installation.
 
-Click on Advanced to select partitions on which you want to check for bad
-blocks."),
+Click on Advanced if you wish to select partitions that will be checked for bad
+blocks on the disc."),
 
 installPackages => 
-__("Your new Mandrake Linux operating system is currently being installed. This
-operation should take a few minutes (it depends on size you choose to install
-and the speed of your computer).
+__("Your new Mandrake Linux operating system is currently being installed. Depending
+on the number of packages you will be installing and the speed of your computer,
+this operation could take from a few minutes to a significant amount of time.
 
 Please be patient."),
 
+license => 
+__("Before continuing you should read carefully the terms of the license. It covers
+the whole Mandrake Linux distribution, and if you do not agree with all the
+terms in it, click on the Refuse button which will immediately terminate the
+installation. To continue with the installation, click the Accept button."),
+
 miscellaneous => 
-__("At this point, it is now time to choose the security level desired for that
-machine. As a rule of thumb, the more exposed is the machine, and the more the
-data stored in it is crucial the higher the security level should be. However a
+__("At this point, it is time to choose the security level desired for the machine.
+As a rule of thumb, the more exposed the machine is, and the more the data
+stored in it is crucial, the higher the security level should be. However, a
 higher security level is generally obtained at the expenses of easiness of use.
-Refer to the chapter MSEC of the Reference Manual; to get more information about
-the meaning of those levels.
+Refer to the MSEC chapter of the ``Reference Manual'' to get more information
+about the meaning of these levels.
+
+If you do not know what to choose, keep the default option."),
+
+partition_with_diskdrake => 
+__("At this point, you need to choose what partition(s) will be used for the
+installation of your Mandrake Linux system. If partitions have been already
+defined, either from a previous installation of GNU/Linux or from another
+partitioning tool, you can use existing partitions. Otherwise hard drive
+partitions must be defined.
+
+To create partitions, you must first select a hard drive. You can select the
+disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb\"
+for the second, \"sda\" for the first SCSI drive and so on.
+
+To partition the selected hard drive, you can use these options:
+
+ * Clear all: this option deletes all partitions on the selected hard drive.
+
+ * Auto allocate: this option allows you to automatically create Ext2 and swap
+partitions in free space of your hard drive.
+
+ * Rescue partition table: if your partition table is damaged, you can try to
+recover it using this option. Please be careful and remember that it can fail.
+
+ * Undo: use this option to cancel your changes.
+
+ * Reload: you can use this option if you wish to undo all changes and load your
+initial partitions table.
+
+ * Wizard: use this option if you wish to use a wizard to partition your hard
+drive. This is recommended if you do not have a good knowledge of partitioning.
+
+ * Restore from floppy: this option will allow you to restore a previously saved
+partition table from floppy disk.
+
+ * Save to floppy: saves the partition table to a floppy. Useful for later
+partition-table recovery if necessary. It is strongly recommended to perform
+this step.
+
+ * Done: when you have finished partitioning your hard drive, this will save your
+changes back to disc.
+
+Note: you can reach any option using the keyboard. Navigate through the
+partitions using Tab and Up/Down arrows.
+
+When a partition is selected, you can use:
+
+ * (*)(*) to create a new partition (when an empty partition is selected);
+
+ * (*)(*) to delete a partition;
+
+ * (*)(*) to set the mount point.
+
+If you are installing on a PPC machine, you will want to create a small HFS
+\"bootstrap\" partition of at least 1MB which will be used by the yaboot boot
+loader. If you opt to make the partition a bit larger, say 50MB, you may find it
+a useful place to store a spare kernel and ramdisk images for emergency boot
+situations."),
+
+resizeFATChoose => 
+__("More than one Microsoft Windows partition has been detected on your hard drive.
+Please choose the one you want resize in order to install your new Mandrake
+Linux operating system.
 
-If you don't know what to choose, keep the default option."),
+Each partition is listed as follows: \"Linux name\", \"Windows name\"
+\"Capacity\".
 
-multiCD => 
-__("The Mandrake Linux spreads among several CDROMs. It may be that drakX has
-selected packages on another CDROM than the installation CDROM, and when it
-needs that you put another one into the drive, it will eject the current CDROM
-and ask you for another one."),
+\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",
+\"partition number\" (for example, \"hda1\").
+
+\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd\"
+if it is a SCSI hard drive.
+
+\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE hard
+drives:
+
+ * \"a\" means \"master hard drive on the primary IDE controller\",
+
+ * \"b\" means \"slave hard drive on the primary IDE controller\",
+
+ * \"c\" means \"master hard drive on the secondary IDE controller\",
+
+ * \"d\" means \"slave hard drive on the secondary IDE controller\".
+
+With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means \"second
+lowest SCSI ID\", etc.
+
+\"Windows name\" is the letter of your hard drive under Windows (the first disk
+or partition is called \"C:\")."),
+
+resizeFATWait => 
+__("Please be patient. This operation can take several minutes."),
 
 selectInstallClass => 
-__("drakX now ask you what installation class you want. Here, you will also choose
-whether you want to perform an installation or an upgrade of an existing
-Mandrake Linux system. Choose what suits your situation. You can perform an
-installation over an existing system, wiping out the old system. You can also do
-an upgrade to repair an existing system.
+__("DrakX now needs to know if you want to perform a default (Recommended)
+installation or if you want to have greater control (Expert). You also have the
+choice of performing a new install or an upgrade of an existing Mandrake Linux
+system. Clicking Install will completely wipe out the old system. Select Upgrade
+if you are upgrading or repairing an existing system.
 
-Please choose \"Install\" if there are no previous version of Mandrake Linux
-installed or if you wish to use several operating systems.
+Please choose Install if there are no previous version of Mandrake Linux
+installed or if you wish to boot between various operating systems.
 
-Please choose \"Update\" if you wish to update an already installed version of
-Mandrake Linux.
+Please choose Update if you wish to update or repair an already installed
+version of Mandrake Linux.
 
-Depend of your knowledge in GNU/Linux, you can choose one of the following
-levels to install or update your Mandrake Linux operating system:
+Depending on your knowledge of GNU/Linux, please choose one of the following to
+install or update your Mandrake Linux operating system:
 
- * Recommended: if you have never installed a GNU/Linux operating system choose
-this. Installation will be be very easy and you will be asked only on few
+ * Recommended: choose this if you have never installed a GNU/Linux operating
+system. The installation will be very easy and you will only be asked a few
 questions.
 
- * Customized: if you are familiar enough with GNU/Linux, you may choose the
-primary usage (workstation, server, development) of your system. You will need
-to answer to more questions than in \"Recommended\" installation class, so you
-need to know how GNU/Linux works to choose this installation class.
-
- * Expert: if you have a good knowledge in GNU/Linux, you can choose this
-installation class. As in \"Customized\" installation class, you will be able to
-choose the primary usage (workstation, server, development). Be very careful
-before choose this installation class. You will be able to perform a higly
-customized installation. Answer to some questions can be very difficult if you
-haven't a good knowledge in GNU/Linux. So, don't choose this installation class
-unless you know what you are doing."),
+ * Expert: if you have a good knowledge of GNU/Linux, you can choose this
+installation class. The expert installation will allow you to perform a highly
+customized installation. Answering some of the questions can be difficult if you
+do not have a good knowledge of GNU/Linux so do not choose this unless you know
+what you are doing."),
 
 selectKeyboard => 
-__("Normally, drakX will have selected the right keyboard for you (depending on the
-language you have chosen) and you won't even see this step. However, you might
-not have a keyboard which corresponds exactly to your language: for example, if
-you are an English speaking Swiss person, you may still want your keyboard to be
-a Swiss keyboard. Or if you speak English but are located in Quebec, you may
-find yourself in the same situation. In both cases, you will have to go back to
-this installation step and select an appropriate keyboard from the list.
-
-All you need to do is select your preferred keyboard layout from the list which
-appears in front of you.
-
-If you have a keyboard from another language than the one used by default, click
-on the Advanced button. You will be presented the complete list of supported
+__("Normally, DrakX selects the right keyboard for you (depending on the language
+you have chosen) and you will not even see this step. However, you might not
+have a keyboard that corresponds exactly to your language: for example, if you
+are an English speaking Swiss person, you may still want your keyboard to be a
+Swiss keyboard. Or if you speak English but are located in Quebec, you may find
+yourself in the same situation. In both cases, you will have to go back to this
+installation step and select an appropriate keyboard from the list.
+
+Click on the More button to be presented with the complete list of supported
 keyboards."),
 
 selectLanguage => 
 __("Please choose your preferred language for installation and system usage.
 
-There is an Advanced button allowing you to select other languages, that will be
-installed in the machine so that you can use them later if you need them. If for
-example you will host people from Spain on your machine, select English as the
-main language in the tree view, and under the advanced section, check the box
+Clicking on the Advanced button will allow you to select other languages to be
+installed on your workstation. Selecting other languages will install the
+language-specific files for system documentation and applications. For example,
+if you will host users from Spain on your machine, select English as the main
+language in the tree view and in the Advanced section click on the grey star
 corresponding to Spanish|Spain.
 
-As soon as you have selected the language and confirmed with clicking the OK
-button, you will automatically go on to the next step."),
+Note that multiple languages may be installed. Once you have selected any
+additional locales click the OK button to continue."),
 
 selectMouse => 
-__("drakX just skips this test unless you purposely click on the corresponding step
-on the left. By default, drakX sees your mouse as a two-button mouse and
-emulates the third button, and knows whether it's PS/2, serial or USB.
+__("By default, DrakX assumes you have a two-button mouse and will set it up for
+third-button emulation. DrakX will automatically know whether it is a PS/2,
+serial or USB mouse.
 
-Perhaps this is not what you want. In that case, you just have to select the
-right type for your mouse in the list which appears.
+If you wish to specify a different type of mouse select the appropriate type
+from the list provided.
 
-You can now test your mouse. Use buttons and wheel to verify if settings are
-good. If not, you can click on \"Cancel\" to choose another driver."),
+If you choose a mouse other than the default you will be presented with a mouse
+test screen. Use the buttons and wheel to verify that the settings are good. If
+the mouse is not working correctly press the space bar or RETURN to \"Cancel\"
+and choose again."),
+
+selectSerialPort => 
+__("Please select the correct port. For example, the COM1 port under MS Windows is
+named ttyS0 under GNU/Linux."),
 
 setRootPassword => 
 __("This is the most crucial decision point for the security of your GNU/Linux
-system: you are going to have to enter the Root password. Root is the system
-administrator and is the only one authorized to make updates, add users, change
-the overall system configuration, and so on. In short, root can do everything!
-That is why you have to choose a password which is difficult to guess; drakX
-will tell you if it is too easy. As shown, you can choose not to enter a
-password, but we strongly advise you to enter one, if only for one reason: do
-not think that because you booted GNU/Linux, your other operating systems are
-safe from mistakes. That's not true since Root can overcome all limitations and
-unintentionally erase all data on partitions by carelessly accessing the
-partitions themselves!
+system: you have to enter the root password. root is the system administrator
+and is the only one authorized to make updates, add users, change the overall
+system configuration, and so on. In short, root can do everything! That is why
+you must choose a password that is difficult to guess - DrakX will tell you if
+it is too easy. As you can see, you can choose not to enter a password, but we
+strongly advise you against this if only for one reason: do not think that
+because you booted GNU/Linux that your other operating systems are safe from
+mistakes. Since root can overcome all limitations and unintentionally erase all
+data on partitions by carelessly accessing the partitions themselves, it is
+important for it to be difficult to become root.
 
 The password should be a mixture of alphanumeric characters and at least 8
-characters long. It should never be written down.
+characters long. Never write down the root password - it makes it too easy to
+compromise a system.
+
+However, please do not make the password too long or complicated because you
+must be able to remember it without too much effort.
+
+The password will not be displayed on screen as you type it in. Hence, you will
+have to type the password twice to reduce the chance of a typing error. If you
+do happen to make the same typing error twice, this \"incorrect\" password will
+have to be used the first time you connect.
 
-Do not make the password too long or complicated, though: you must be able to
-remember it without too much effort.
+In expert mode, you will be asked if you will be connecting to an authentication
+server, like NIS or LDAP.
 
-You will have to type the password twice a typing error in the first attempt
-could be a problem if you repeat it since the ``incorrect'' password is now
-required when you connect up to the system.
+If your network uses LDAP (or NIS) protocol for authentication, select LDAP (or
+NIS) as authentication. If you do not know, ask your network administrator.
 
-Depending on your local network configuration, you may or may not use NIS. If
-you don't know, ask your system administrator. If you use NIS, check the option
-Use NIS. When you press OK, you will then have to fill in the necessary
-information."),
+If your computer is not connected to any administrated network, you will want to
+choose Local files for authentication."),
 
 setupBootloader => 
-__("LILO and GRUB are boot loaders for GNU/Linux. This stage is normally totally
-automated. In fact, drakX will analyze the disk boot sector and will act
-accordingly depending on what it finds here:
+__("Unless you know specifically otherwise, the usual choice is /dev/hda (primary
+master IDE disk) or /dev/sda (first SCSI disk)."),
 
- * if it finds a Windows boot sector, it will replace it with a GRUB/LILO boot
-sector so that you can start GNU/Linux or Windows;
+setupBootloaderAddEntry => 
+__("LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot either
+GNU/Linux or any other operating system present on your computer. Normally,
+these other operating systems are correctly detected and installed. If this is
+not the case, you can add an entry by hand in this screen. Be careful to choose
+the correct parameters.
 
- * if it finds a GRUB or LILO boot sector, it will replace it with a new one;
+You may also not want to give access to these other operating systems to anyone.
+In which case, you can delete the corresponding entries. But then, you will need
+a boot disk in order to boot those other operating systems!"),
 
-If in doubt, drakX will display a dialog with various options.
+setupBootloaderBeginner => 
+__("You must indicate where you wish to place the information required to boot to
+GNU/Linux.
 
- * Bootloader to use: you get here three choices:
+Unless you know exactly what you are doing, choose First sector of drive (MBR)."),
 
-    * LILO with graphical menu: if you prefer LILO with its graphical interface.
+setupSCSI => 
+__("DrakX is now detecting any IDE devices present in your computer. It will also
+scan for one or more PCI SCSI card(s) on your system. If a SCSI card is found
+DrakX will automatically install the appropriate driver.
+
+Because hardware detection will sometimes not detect a piece of hardware DrakX
+will ask you to confirm if a PCI SCSI card is present. Click Yes if you know
+that there is a SCSI card installed in your machine. You will be presented a
+list of SCSI cards to choose from. Click No if you have no SCSI hardware. If you
+are unsure you can check the list of hardware detected in your machine by
+selecting See hardware info and clicking OK. Examine the list of hardware and
+then click on the OK button to return to the SCSI interface question.
 
-    * Grub: if you prefer GRUB (text menu).
+If you have to manually specify your adapter, DrakX will ask if you want to
+specify options for it. You should allow DrakX to probe the hardware for the
+card-specific options that the hardware needs to initialize. This usually works
+well.
 
-    * LILO with text menu: if you prefer LILO with its text menu interface.
+If DrakX is not able to probe for the options that need to be passed, you will
+need to manually provide options to the driver. Please review the ``User Guide''
+(chapter 3, section \"Collecting information on your hardware\") for hints on
+retrieving the parameters required from hardware documentation, from the
+manufacturer's web site (if you have Internet access) or from Microsoft Windows
+(if you used this hardware with Windows on your system)."),
 
- * Boot device: In most cases, you will not change the default (/dev/hda), but if
-you prefer, the bootloader can be installed on the second hard drive (/dev/hdb),
-or even on a floppy disk (/dev/fd0).
+setupYabootAddEntry => 
+__("You can add additional entries for yaboot, either for other operating systems,
+alternate kernels, or for an emergency boot image.
 
- * Delay before booting default image: When rebooting the computer, this is the
-delay granted to the user to choose in the boot loader menu, another boot entry
-than the default one.
+For other OS's, the entry consists only of a label and the root partition.
 
-!! Beware that if you choose not to install a bootloader (by selecting Cancel
-here), you must ensure that you have a way to boot your Mandrake Linux system!
-Also be sure about what you are doing if you change any of the options here. !!
+For Linux, there are a few possible options:
 
-Clicking the Advanced button in this dialog will offer many advanced options
-reserved to the expert user.
+ * Label: this is simply the name you will have to type at the yaboot prompt to
+select this boot option.
 
-Mandrake Linux installs its own bootloader, which will let you boot either
-GNU/Linux or any other operating systems which you have on your system.
+ * Image: this would be the name of the kernel to boot. Typically, vmlinux or a
+variation of vmlinux with an extension.
 
-If there is another operating system installed on your machine, it'll be
-automatically added to the boot menu. Here you can choose to fine-tune the
-existing options. Double-clicking on an existing entry allows you to change its
-parameters or remove it; Add creates a new entry; and Done goes onto next
-installation step."),
+ * Root: the root device or \"/\" for your Linux installation.
 
-setupSCSI => 
-__("drakX then goes on to detecting all hard disks present on your computer. It will
-also scan for one or more PCI SCSI card(s) on your system, if you have any. If
-such a device is found, drakX will automatically install the right driver.
+ * Append: on Apple hardware, the kernel append option is used quite often to
+assist in initializing video hardware, or to enable keyboard mouse button
+emulation for the often lacking 2nd and 3rd mouse buttons on a stock Apple
+mouse. The following are some examples:
 
-Should it fail, you are anyway asked whether you have a SCSI card or not. Answer
-Yes to choose your card in a list or No if you have no SCSI hardware. If you are
-not sure you can also check the list of hardware in your machine by selecting
-See hardware info and clicking OK.
+         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 hda=autotune
 
-If you have to manually specify your adapter, DrakX will ask if you want to
-specify options for it. You should allow DrakX to probe the hardware for the
-options. This usually works well.
+         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111
 
-If not, you will need to provide options to the driver. Please review the User
-Guide (chapter 3, section \"Collective informations on your hardware\") for
-hints on retrieving this information from hardware documentation, from the
-manufacturer's Web site (if you have Internet access) or from Microsoft Windows
-(if you have it on your system)."),
+ * Initrd: this option can be used either to load initial modules, before the
+boot device is available, or to load a ramdisk image for an emergency boot
+situation.
+
+ * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you need to
+allocate a large ramdisk, this option can be used.
+
+ * Read-write: normally the root partition is initially brought up in read-only,
+to allow a file system check before the system becomes \"live\". Here, you can
+override this option.
+
+ * NoVideo: should the Apple video hardware prove to be exceptionally
+problematic, you can select this option to boot in \"novideo\" mode, with native
+frame buffer support.
+
+ * Default: selects this entry as being the default Linux selection, selectable
+by just pressing ENTER at the yaboot prompt. This entry will also be highlighted
+with a \"*\", if you press Tab to see the boot selections."),
+
+setupYabootGeneral => 
+__("Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot
+either GNU/Linux, MacOS or MacOSX if present on your computer. Normally, these
+other operating systems are correctly detected and installed. If this is not the
+case, you can add an entry by hand in this screen. Be careful as to choose the
+correct parameters.
+
+Yaboot's main options are:
+
+ * Init Message: a simple text message that is displayed before the boot prompt.
+
+ * Boot Device: indicate where you want to place the information required to boot
+to GNU/Linux. Generally, you setup a bootstrap partition earlier to hold this
+information.
+
+ * Open Firmware Delay: unlike LILO, there are two delays available with yaboot.
+The first delay is measured in seconds and at this point, you can choose between
+CD, OF boot, MacOS or Linux.
+
+ * Kernel Boot Timeout: this timeout is similar to the LILO boot delay. After
+selecting Linux, you will have this delay in 0.1 second before your default
+kernel description is selected.
+
+ * Enable CD Boot?: checking this option allows you to choose \"C\" for CD at the
+first boot prompt.
+
+ * Enable OF Boot?: checking this option allows you to choose \"N\" for Open
+Firmware at the first boot prompt.
+
+ * Default OS: you can select which OS will boot by default when the Open
+Firmware Delay expires."),
 
 summary => 
-__("Here are presented various parameters related to your machine. Depending on your
-installed hardware you may or not, see the following entries:
+__("Here are presented various parameters concerning your machine. Depending on your
+installed hardware, you may - or not, see the following entries:
 
- * Mouse: mouse Check the current mouse configuration and click on the button to
+ * Mouse: mouse check the current mouse configuration and click on the button to
 change it if necessary.
 
- * Keyboard: keyboard Check the current keyboard map configuration and click on
+ * Keyboard: keyboard check the current keyboard map configuration and click on
 the button to change that if necessary.
 
- * Timezone: timezone DrakX, by default, guesses your timezone from the language
-you have chosen. But here again, as for the keyboard choice, you may not be in
-the country which the chosen language suggests, so you may need to click on the
-Timezone button so that you can configure the clock according to the time zone
-you are in.
+ * Timezone: time zoneDrakX, by default, guesses your time zone from the language
+you have chosen. But here again, as for the choice of a keyboard, you may not be
+in the country for which the chosen language should correspond. Hence, you may
+need to click on the Timezone button in order to configure the clock according
+to the time zone you are in.
 
- * Printer: Clicking on the No Printer button, will open the printer
-configuration wizard..
-
- * Sound card: If a sound card has been detected on your system, it is displayed
-here. No modification possible at installation time.
+ * Printer: clicking on the No Printer button will open the printer configuration
+wizard.
 
- * TV card: If a TV card has been detected on your system, it is displayed here.
+ * Sound card: if a sound card is detected on your system, it is displayed here.
 No modification possible at installation time.
 
- * ISDN card: If an ISDN card has been detected on your system, it is displayed
-here. You can click on the button to change the associated parameters."),
+ * TV card: if a TV card is detected on your system, it is displayed here. No
+modification possible at installation time.
+
+ * ISDN card: if an ISDN card is detected on your system, it is displayed here.
+You can click on the button to change the parameters associated to it."),
+
+takeOverHdChoose => 
+__("Choose the hard drive you want to erase to install your new Mandrake Linux
+partition. Be careful, all data present on it will be lost and will not be
+recoverable!"),
+
+takeOverHdConfirm => 
+__("Click on OK if you want to delete all data and partitions present on this hard
+drive. Be careful, after clicking on OK, you will not be able to recover any
+data and partitions present on this hard drive, including any Windows data.
+
+Click on Cancel to cancel this operation without losing any data and partitions
+present on this hard drive."),
 );
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 62daa8643..1d1a2d4ef 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -13,7 +13,7 @@ LOCALEDIR=$(DATADIR)/locale
 all: $(MOFILES)
 
 help:
-	wget -q -O drakx-help.xml "http://www.mandrakelinux.com/cgi-bin/cvsweb.cgi/~checkout~/doc/manual/literal/drakx/en/drakx-help.xml?rev=1.1&content-type=text/plain"
+	wget -q -O drakx-help.xml "http://www.mandrakelinux.com/cgi-bin/cvsweb.cgi/~checkout~/doc/manual/literal/drakx/en/drakx-help.xml?rev=1&content-type=text/plain"
 	./help_xml2pm.pl drakx-help.xml | LC_ALL=fr iconv -f utf8 -t ascii//TRANSLIT > ../../help.pm
 
 %.mo: %.po
diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl
index 9996c13d6..cf7f36167 100755
--- a/perl-install/share/po/help_xml2pm.pl
+++ b/perl-install/share/po/help_xml2pm.pl
@@ -38,8 +38,13 @@ sub rewrite1 {
 		s/\s+/ /gs;
 		s/"/\\"/g;
 	    }
+	    push @l, $tree
+	} elsif ($tag eq 'screen') {
+	    $tree->[1] eq '0' or die "screen tag contains non CDATA\n";
+	    push @l, $tree->[2];
+	} else {
+	    push @l, rewrite1($tag, $tree);
 	}
-	push @l, $tag eq '0' ? $tree : rewrite1($tag, $tree);
     }
     { attr => $attr, tag => $tag, children => \@l };
 }
@@ -60,6 +65,11 @@ sub rewrite2 {
     my ($tree) = @_;
     ref($tree) or return $tree;
 
+    if ($tree->{tag} eq 'screen') {
+	'';
+    }
+
+
     my $text = do {
 	my @l = map { rewrite2($_) } @{$tree->{children}};
 	my $text;
@@ -78,13 +88,13 @@ sub rewrite2 {
 	$text =~ s/^( ?\n)+//;
 	$text =~ s/\s+$//;
 	qq(\n$text\n);
-    } elsif ($tree->{tag} eq 'quote') {
+    } elsif (member($tree->{tag}, 'quote', 'citetitle')) {
 	qq(``$text'');
     } elsif ($tree->{tag} eq 'command') {
 	qq(\\"$text\\");
     } elsif ($tree->{tag} eq 'userinput') {
 	qq(>>$text<<);
-    } elsif ($tree->{tag} eq 'footnote') {
+    } elsif (member($tree->{tag}, 'footnote', 'keysym')) {
 	'(*)'
     } elsif ($tree->{tag} eq 'warning') {
 	$text =~ s/^(\s+)/$1!! /;
@@ -98,7 +108,8 @@ sub rewrite2 {
 
     } elsif (member($tree->{tag}, 'guibutton', 'guimenu', 'guilabel',
                     'emphasis', 'acronym', 'keycap', 'ulink', 'tip', 'note',
-		    'primary', 'indexterm',
+		    'primary', 'indexterm', 'application', 'keycombo', 
+		    'literal', 'superscript',
 		   )) {
 	# ignored tags
 	$text;
@@ -115,6 +126,8 @@ sub rewrite2 {
 	} find('footnote', $tree);
 	$help->{$tree->{attr}{id}} = aerate($text . join('', @footnotes));
 	'';
+    } elsif ($tree->{tag} eq 'screen') {
+	qq(\n$text\n);
     } else {
 	die "unknown tag $tree->{tag}\n";
     }