updated help file

1 files changed, 258 insertions, 254 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index d1be652b7..283f4464c 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -21,14 +21,14 @@ 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 -
+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
+name\". This is the name this particular user will use to log onto 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.
+non-privileged (regular) user's password is not as crucial as \"root\"' one
+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 one of your friends: your father or your sister, for
@@ -40,7 +40,7 @@ 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
+installations. 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\"
@@ -57,11 +57,11 @@ Each partition is listed as follows: \"Name\", \"Capacity\".
 \"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\",
+ * \"a\" means \"master hard drive on the primary IDE controller\";
 
- * \"b\" means \"slave 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\",
+ * \"c\" means \"master hard drive on the secondary IDE controller\";
 
  * \"d\" means \"slave hard drive on the secondary IDE controller\".
 
@@ -78,7 +78,7 @@ __("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 CD-ROM, you will first
+If you are performing a standard installation from a CD-ROM, you will first
 be asked to specify the CDs you currently have (in Expert mode only). 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.
@@ -87,14 +87,14 @@ Packages are sorted in groups corresponding to a particular use of your
 machine. The groups themselves are sorted into four sections:
 
  * \"Workstation\": if you plan to use your machine as a workstation, select
-one or more of the corresponding groups.
+one or more of the corresponding groups;
 
- * \"Development\": if the machine is to be used for programming, choose the
-desired group(s).
+ * \"Development\": if your machine is to be used for programming, choose
+the desired group(s);
 
- * \"Server\": 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.
+ * \"Server\": if your machine is intended to be a server, you will be able
+to select which of the most common services you wish to install on your
+machine;
 
  * \"Graphical Environment\": finally, this is where you will choose your
 preferred graphical environment. At least one must be selected if you want
@@ -102,17 +102,17 @@ to have a graphical workstation!
 
 Moving the mouse cursor over a group name will display a short explanatory
 text about that group. If you deselect all groups when performing a regular
-installation (by opposition to an upgrade), a dialog will popup proposing
+installation (by opposition to an upgrade), a dialog will pop up proposing
 different options for a minimal installation:
 
- * \"With X\" Install the fewer packages possible for having a working
+ * \"With X\": install the fewer packages possible to have a working
 graphical desktop;
 
- * \"With basic documentation\" Installs the base system plus basic
+ * \"With basic documentation\": installs the base system plus basic
 utilities and their documentation. This installation is suitable for
-setting up a server.
+setting up a server;
 
- * \"Truly minimal install\" Will install the strict minimum necessary to
+ * \"Truly minimal install\": will install the strict minimum necessary to
 get a working Linux system, in command line only. This installation is
 about 65Mb large.
 
@@ -125,21 +125,21 @@ groups to avoid installing any new package. This is useful for repairing or
 updating an existing system."),
 
 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.
+__("Finally, depending on whether or not you selected 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 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.
+a while to complete the process. An estimate of the time it will take to
+install everything 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
+!! 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
@@ -154,18 +154,18 @@ 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
+The tiny floppy disk icon at the bottom of the list allows to load the
+package 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 => 
-__("You are now proposed to setup your internet/network connection. If you wish
-to connect your computer to the Internet or to a local network, click
+__("You are now proposed to set up your Internet/network connection. If you
+wish to connect your computer to the Internet or to a local network, click
 \"OK\". The autodetection of network devices and modem will be launched. If
 this detection fails, uncheck the \"Use auto detection\" box next time. You
-may also choose not to configure the network, or do it later; in that case
+may also choose not to configure the network, or do it later; in that case,
 simply click the \"Cancel\" button.
 
 Available connections are: traditional modem, ISDN modem, ADSL connection,
@@ -175,12 +175,12 @@ Here, we will not detail each configuration. Simply make sure that you have
 all the parameters from your Internet Service Provider or system
 administrator.
 
-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.
+You can consult the ``User Guide'' 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 configuring your network connection, click \"Cancel\"."),
+If you wish to configure the network later after installation, or if you
+are finished configuring your network connection, click \"Cancel\"."),
 
 configureServices => 
 __("You may now choose which services you wish to start at boot time.
@@ -194,7 +194,7 @@ 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
+server: you will probably not want to start any services which 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.
 !!"),
@@ -207,26 +207,26 @@ hardware clock is the same as the system clock. This is useful when the
 machine is hosting another operating system like Windows.
 
 The \"Automatic time synchronization\" option will automatically regulate
-the clock by connecting to a remote time server on the internet. In the
+the clock by connecting to a remote time server on the Internet. In the
 list that is presented, choose a server located near you. Of course you
-must have a working internet connection for this feature to function. It
-will actually install on your machine a time server that can be optionally
-used by other machines on your local network."),
+must have a working Internet connection for this feature to work. It will
+actually install on your machine a time server which can be optionally used
+by other machines on your local network."),
 
 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
+on which all the graphical environments (KDE, GNOME, AfterStep,
+WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX
 will try to configure X automatically.
 
 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
+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 are doing an \"Expert\" installation, 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 during the test, and answer \"Yes\", then DrakX
 will proceed to the next step. If you cannot see the message, it simply
@@ -242,8 +242,8 @@ 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."),
+server, choose \"FBDev\". This is a failsafe option which works with any
+modern graphics card. Then choose \"Test again\" to be sure."),
 
 configureXxdm => 
 __("Finally, you will be asked whether you want to see the graphical interface
@@ -253,14 +253,14 @@ act as a server, or if you were not successful in getting the display
 configured."),
 
 createBootdisk => 
-__("The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by
+__("The Mandrake LinuxCD-ROM has a built-in rescue mode. You can access it by
 booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<
 at the prompt. But in case your computer cannot boot from the CD-ROM, 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 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
+ * when installing the bootloader, DrakX will rewrite the boot sector (MBR)
+of your main disk (unless you are using another boot manager), to allow you
+to 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 boot sector, and then you will not be able to
 start GNU/Linux!
@@ -277,22 +277,23 @@ 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 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,
+__("At this point, you need to choose where you want to install the Mandrake
+Linux operating system on your hard drive. If your hard drive is empty or
+if an existing operating system is using all the available space, 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 partitioning process' effects are usually irreversible,
 partitioning can be intimidating and stressful if you are an inexperienced
 user. 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 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 you are running the installation in Expert mode, you will enter
+DiskDrake, the Mandrake Linux partitioning tool, which allows you to
+fine-tune your partitions. See the DiskDrake section in the ``User Guide''.
+From the installation interface, you can use the wizards as described here
+by clicking the dialog's \"Wizard\" button.
 
 If partitions have already been defined, either from a previous
 installation or from another partitioning tool, simply select those to
@@ -303,42 +304,44 @@ wizard. Depending on your hard drive configuration, several options are
 available:
 
  * \"Use free space\": this option will simply lead to an automatic
-partitioning of your blank drive(s). You will not be prompted further.
+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 use them, choose this
-option.
+option;
 
- * \"Use the free space on the Windows partition\": if Microsoft Windows is
+ * \"Use the free space on the Windows; partition\": if MicrosoftWindows is
 installed 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.
+have to create free space for Linux data. To do so, you can delete your
+MicrosoftWindows partition and data (see ``Erase entire disk'' or ``Expert
+mode'' solutions) or resize your MicrosoftWindows partition. Resizing can
+be performed without the loss of any data, provided you previously
+defragment the Windows partition. Backing up your data won't hurt either..
+This solution is recommended if you want to use both Mandrake Linux and
+MicrosoftWindows on the 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.
+the size of your MicrosoftWindows partition will be smaller than at the
+present time. You will have less free space under MicrosoftWindows 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.
+not be able to revert your choice after you confirm;
 
    !! If you choose this option, 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.
+will be lost;
 
    !! If you choose this option, all data on your disk will be lost. !!
 
  * \"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."),
+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
@@ -354,18 +357,18 @@ 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 only this one) remains interactive.
+    * \"Replay\". This is a partially automated installation as the
+partitioning step (and only this one) remains interactive;
 
-    * \"Automated\". Fully automated install: the hard disk is completely
+    * \"Automated\". Fully automated installation: 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 web site.
+machines. See the Auto install section on our web site;
 
- * \"Save packages selection\"(*): saves the packages selection as made
+ * \"Save packages selection\"(*): saves the package selection as done
 previously. Then, when doing another installation, insert the floppy inside
-the driver and run the installation going to the help screen by pressing on
+the drive 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
@@ -373,7 +376,7 @@ the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.
 
 formatPartitions => 
 __("Any partitions that have been newly defined must be formatted for use
-(formatting means creating a file system).
+(formatting means creating a filesystem).
 
 At this time, you may wish to reformat some already existing partitions to
 erase any data they contain. If you wish to do that, please select those
@@ -387,7 +390,7 @@ reformat partitions containing data that you wish to keep (typically
 
 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.
+any of it.
 
 Click on \"OK\" when you are ready to format partitions.
 
@@ -395,7 +398,7 @@ Click on \"Cancel\" if you want to choose another partition for your new
 Mandrake Linux operating system installation.
 
 Click on \"Advanced\" if you wish to select partitions that will be checked
-for bad blocks on the disc."),
+for bad blocks on the disk."),
 
 installPackages => 
 __("Your new Mandrake Linux operating system is currently being installed.
@@ -407,84 +410,84 @@ Please be patient."),
 
 installUpdates => 
 __("At the time you are installing Mandrake Linux, it is likely that some
-packages have been updated since the initial release. Some bug-fixes may
-have been fixed, and security issues solved. To allow you to benefit from
-this updates you are now proposed to download them from the internet.
-Choose \"Yes\" if you have a working internet connection, or \"No\" if you
-prefer to install updated packages later.
+packages have been updated since the initial release. Some bugs may have
+been fixed, and security issues solved. To allow you to benefit from these
+updates, you are now proposed to download them from the Internet. Choose
+\"Yes\" if you have a working Internet connection, or \"No\" if you prefer
+to install updated packages later.
 
 Choosing \"Yes\" displays a list of places from which updates can be
-retrieved. Choose the one nearer to you. Then a packages selection tree
+retrieved. Choose the one nearest you. Then a package-selection tree
 appears: review the selection, and press \"Install\" to retrieve and
-install the selected package or \"Cancel\" to abort."),
+install the selected package(s), or \"Cancel\" to abort."),
 
 license => 
-__("Before continuing you should read carefully the terms of the license. It
+__("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
+terminate the installation. To continue with the installation, click on the
 \"Accept\" button."),
 
 miscellaneous => 
 __("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 MSEC chapter of the ``Reference Manual'' to
-get more information about the meaning of these levels.
+However, a higher security level is generally obtained at the expense of
+easiness of use. 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
+__("At this point, you need to choose which partition(s) will be used for the
+installation of your Mandrake Linux system. If partitions have already been
 defined, either from a previous installation of GNU/Linux or from another
-partitioning tool, you can use existing partitions. Otherwise hard drive
+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.
+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.
+drive;
 
- * \"Auto allocate\": this option allows you to automatically create Ext2
-and swap partitions in free space of your hard drive.
+ * \"Auto allocate\": this option enables to automatically create \"Ext2\"
+and swap partitions in free space of your hard drive;
 
  * \"More\": gives access to additional features:
 
     * \"Save partition table\": saves the partition table to a floppy. Useful
 for later partition-table recovery if necessary. It is strongly recommended
-to perform this step.
+to perform this step;
 
     * \"Restore partition table\": allows to restore a previously saved
-partition table from floppy disk.
+partition table from floppy disk;
 
     * \"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.
+can fail;
 
-    * \"Reload partition table\": discards all changes and load your initial
-partitions table.
+    * \"Reload partition table\": discards all changes and loads your initial
+partition table;
 
-    * \"removable media automounting\": unchecking this option will force users
+    * \"Removable media automounting\": unchecking this option will force users
 to manually mount and unmount removable medias such as floppies and
 CD-ROMs.
 
  * \"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.
+partitioning;
 
- * \"Undo\": use this option to cancel your changes.
+ * \"Undo\": use this option to cancel your changes;
 
  * \"Toggle to normal/expert mode\": allows additional actions on partitions
-(Type, options, format) and gives more information.
+(type, options, format) and gives more information;
 
- * \"Done\": when you have finished partitioning your hard drive, this will
-save your changes back to disc.
+ * \"Done\": when you are finished partitioning your hard drive, this will
+save your changes back to disk.
 
 Note: you can reach any option using the keyboard. Navigate through the
 partitions using [Tab] and [Up/Down] arrows.
@@ -498,18 +501,18 @@ When a partition is selected, you can use:
  * Ctrl-m to set the mount point.
 
 To get information about the different filesystem types available, please
-read the chapter ext2fs from the ``Reference Manual''.
+read the ext2fs chapter from the ``Reference Manual''.
 
 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
+``bootstrap'' partition of at least 1MB, which will be used by the yaboot
+bootloader. 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 to resize in order to install your
-new Mandrake Linux operating system.
+__("More than one Microsoft partition has been detected on your hard drive.
+Please choose the one you want to resize in order to install your new
+Mandrake Linux operating system.
 
 Each partition is listed as follows: \"Linux name\", \"Windows name\"
 \"Capacity\".
@@ -523,11 +526,11 @@ Each partition is listed as follows: \"Linux name\", \"Windows name\"
 \"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\",
+ * \"a\" means \"master hard drive on the primary IDE controller\";
 
- * \"b\" means \"slave 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\",
+ * \"c\" means \"master hard drive on the secondary IDE controller\";
 
  * \"d\" means \"slave hard drive on the secondary IDE controller\".
 
@@ -542,22 +545,22 @@ __("Please be patient. This operation can take several minutes."),
 
 selectInstallClass => 
 __("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:
+installation or if you want to have greater control (\"Expert\"). You can
+also choose to do a new install or an upgrade of an existing Mandrake Linux
+system:
 
- * \"Install\" Completely wipes out the old system. In fact, depending on
+ * \"Install\": completely wipes out the old system. In fact, depending on
 what currently holds your machine, you will be able to keep some old (Linux
-or other) partitions unchanged.
+or other) partitions unchanged;
 
- * \"Upgrade\" This installation class allows to simply update the packages
+ * \"Upgrade\": this installation class allows to simply update the packages
 currently installed on your Mandrake Linux system. It keeps the current
-partitions of your hard drives as well as users configuration. All other
-configuration steps remain available with respect to plain installation.
+partitions of your hard drives as well as user configurations. All other
+configuration steps remain available with respect to plain installation;
 
- * \"Upgrade Packages Only\" This brand new class allows to upgrade an
-existing Mandrake Linux system while keeping all system configuration
-unchanged. Adding new packages to the current installation will be also
+ * \"Upgrade Packages Only\": this brand new class allows to upgrade an
+existing Mandrake Linux system while keeping all system configurations
+unchanged. Adding new packages to the current installation is also
 possible.
 
 Upgrades should work fine for Mandrake Linux systems starting from \"8.1\"
@@ -568,17 +571,17 @@ choices:
 
  * 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.
+asked a few questions;
 
  * 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."),
+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 selects the right keyboard for you (depending on the
-language you have chosen) and you will not even see this step. However, you
+language you have chosen) and you won't 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
@@ -597,23 +600,24 @@ 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\".
+Advanced section click on the box corresponding to \"Spanish|Spain\".
 
 Note that multiple languages may be installed. Once you have selected any
-additional locales click the \"OK\" button to continue."),
+additional locales, click the \"OK\" button to continue."),
 
 selectMouse => 
-__("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.
+__("DrakX generally detects the number of buttons your mouse has. If not, it
+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.
 
 If you wish to specify a different type of mouse select the appropriate
-type from the list provided.
+type from the provided list.
 
-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."),
+If you choose a mouse other than the default, a test screen will be
+displayed. Use the buttons and wheel to verify that the settings are
+correct. If the mouse is not working well, press the space bar or [Return]
+to \"Cancel\" and choose again."),
 
 selectSerialPort => 
 __("Please select the correct port. For example, the \"COM1\" port under
@@ -625,16 +629,16 @@ 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\".
+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. Never write down the \"root\" password - it makes it too
+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
@@ -643,12 +647,12 @@ 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.
+``incorrect'' password will have to be used the first time you connect.
 
-In expert mode, you will be asked if you will be connecting to an
+In Expert mode, you will be asked if you will be connecting to an
 authentication server, like NIS or LDAP.
 
-If your network uses LDAP (or NIS) protocol for authentication, select
+If your network uses the LDAP (or NIS) protocol for authentication, select
 \"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your
 network administrator.
 
@@ -656,8 +660,8 @@ 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, normally, is
-totally automated. In fact, DrakX analyzes the disk boot sector and acts
+__("LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally
+automated. In fact, DrakX analyzes the disk boot sector and acts
 accordingly, depending on what it finds here:
 
  * if a Windows boot sector is found, it will replace it with a grub/LILO
@@ -665,11 +669,11 @@ boot sector. Hence, you will be able to load either GNU/Linux or another
 OS;
 
  * if a grub or LILO boot sector is found, it will replace it with a new
-one;
+one.
 
 If in doubt, DrakX will display a dialog with various options.
 
- * \"Boot loader to use\": you have three choices:
+ * \"Bootloader to use\": you have three choices:
 
     * \"GRUB\": if you prefer grub (text menu).
 
@@ -679,32 +683,32 @@ interface.
     * \"LILO with text menu\": if you prefer LILO with its text menu interface.
 
  * \"Boot device\": in most cases, you will not change the default
-(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the
-second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").
+(\"/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\");
 
  * \"Delay before booting the default image\": when rebooting the computer,
-this is the delay granted to the user to choose - in the boot loader menu,
+this is the delay granted to the user to choose in the bootloader menu,
 another boot entry than the default one.
 
-!! Beware that if you choose not to install a boot loader (by selecting
+!! 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 you know what you do before changing any of the
+Linux system! Also, be sure you know what you do before changing any of the
 options. !!
 
 Clicking the \"Advanced\" button in this dialog will offer many advanced
 options, which are reserved to the expert user.
 
-After you have configured the general boot-loader parameters, you are
-presented the list of boot options that will be available at boot time.
+After you have configured the general bootloader parameters, the list of
+boot options which will be available at boot time will be displayed.
 
-If there is another operating system installed on your machine, it will be
-automatically added to the boot menu. Here, you can choose to fine-tune the
-existing options. Select an entry and click \"Modify\" to modify or remove
-it; \"Add\" creates a new entry; and \"Done\" goes on to the next
+If there is another operating system installed on your machine, it will
+automatically be added to the boot menu. Here, you can choose to fine-tune
+the existing options. Select an entry and click \"Modify\" to modify or
+remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next
 installation step."),
 
 setupBootloaderAddEntry => 
-__("LILO (the LInux LOader) and grub are boot loaders: they are able to boot
+__("LILO (the LInux LOader) and grub are bootloaders: 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
@@ -722,75 +726,76 @@ Unless you know exactly what you are doing, choose \"First sector of drive
 (MBR)\"."),
 
 setupDefaultSpooler => 
-__("Here we select a printing system for your computer to use. Other OSes may
-offer you one, but Mandrake offers three.
+__("Here, we select a printing system for your computer. Other OSs may offer
+you one, but Mandrake Linux offers three.
 
- * \"pdq\" - which means ``print, don't queue'', is the choice if you have a
+ * \"pdq\" which means ``print, don't queue'', is the choice if you have a
 direct connection to your printer and you want to be able to panic out of
-printer jams, and you do not have any networked printers. It will handle
-only very simple network cases and is somewhat slow for networks. Pick
-\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your
-choices after install by running PrinterDrake from the Mandrake Control
-Center and clicking the expert button.
-
- * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to
-your local printer and also halfway round the planet. It is simple and can
-act like a server or a client for the ancient \"lpd\" printing system, so
-it is compatible with the systems that went before. It can do many tricks,
-but the basic setup is almost as easy as \"pdq\". If you need this to
-emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has
+printer jams, and you do not have networked printers. It will handle only
+very simple network cases and is somewhat slow for networks. Pick \"pdq\"
+if this is your maiden voyage to GNU/Linux. You can change your choices
+after installation by running PrinterDrake from the Mandrake Control Center
+and clicking the expert button.
+
+ * \"CUPS\"``Common Unix Printing System'', is excellent at printing to your
+local printer and also halfway-around the planet. It is simple and can act
+as a server or a client for the ancient \"lpd\" printing system. Hence, it
+is compatible with the systems that went before. It can do many tricks, but
+the basic setup is almost as easy as \"pdq\". If you need this to emulate
+an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has
 graphical front-ends for printing or choosing printer options.
 
- * \"lprNG\" - ``line printer daemon New Generation''. This system can do
+ * \"lprNG\"``line printer daemon New Generation''. This system can do
 approximately the same things the others can do, but it will print to
-printers mounted on a Novell Network, because it supports IPX protocol, and
-it can print directly to shell commands. If you have need of Novell or
+printers mounted on a Novell Network, because it supports the IPX protocol,
+and it can print directly to shell commands. If you have need of Novell or
 printing to commands without using a separate pipe construct, use lprNG.
 Otherwise, CUPS is preferable as it is simpler and better at working over
 networks."),
 
 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.
+__("DrakX now detects any IDE device 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,
+Because hardware detection does not always 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
+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.
 
 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
+the card-specific options which the hardware needs to initialize. This
 usually works well.
 
-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)."),
+If DrakX is not able to probe for the options which need to be passed, you
+will need to provide options to the driver manually. Please review the
+``User Guide'' (chapter 3, in the ``Collecting Information on Your
+Hardware'' section) for hints on retrieving the parameters required from
+hardware documentation, from the manufacturer's web site (if you have
+Internet access) or from MicrosoftWindows (if you used this hardware with
+Windows on your system)."),
 
 setupYabootAddEntry => 
 __("You can add additional entries for yaboot, either for other operating
 systems, alternate kernels, or for an emergency boot image.
 
-For other OS's, the entry consists only of a label and the root partition.
+For other OSs, the entry consists only of a label and the \"root\"
+partition.
 
 For Linux, there are a few possible options:
 
  * Label: this is simply the name you will have to type at the yaboot prompt
-to select this boot option.
+to select this boot option;
 
  * Image: this would be the name of the kernel to boot. Typically, vmlinux
-or a variation of vmlinux with an extension.
+or a variation of vmlinux with an extension;
 
- * Root: the \"root\" device or \"/\" for your Linux installation.
+ * Root: the \"root\" device or ``/'' for your Linux installation;
 
  * Append: on Apple hardware, the kernel append option is used quite often
 to assist in initializing video hardware, or to enable keyboard mouse
@@ -803,90 +808,89 @@ Apple mouse. The following are some examples:
 
  * 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.
+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.
+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.
+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.
+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
+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
+__("Yaboot is a bootloader 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.
+is not the case, you can add an entry by hand in this screen. Be careful to
+choose the correct parameters.
 
 Yaboot's main options are:
 
- * Init Message: a simple text message that is displayed before the boot
-prompt.
+ * Init Message: a simple text message 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.
+ * Boot Device: indicates where you want to place the information required
+to boot to GNU/Linux. Generally, you set up 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.
+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.
+default kernel description is selected;
 
- * Enable CD Boot?: checking this option allows you to choose \"C\" for CD
-at the first boot prompt.
+ * 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.
+ * 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 concerning your machine. Depending on
-your installed hardware, you may - or not, see the following entries:
+your installed hardware, you may or not, see the following entries:
 
  * \"Mouse\": check the current mouse configuration and click on the button
-to change it if necessary.
+to change it if necessary;
 
  * \"Keyboard\": check the current keyboard map configuration and click on
-the button to change that if necessary.
+the button to change that if necessary;
 
  * \"Timezone\": DrakX, 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.
+configure the clock according to the time zone you are in;
 
  * \"Printer\": clicking on the \"No Printer\" button will open the printer
-configuration wizard.
+configuration wizard;
 
  * \"Sound card\": if a sound card is detected on your system, it is
-displayed here. No modification possible at installation time.
+displayed here. No modification possible at installation time;
 
  * \"TV card\": if a TV card is detected on your system, it is displayed
-here. No modification possible at installation time.
+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."),
+associated with 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!"),
+__("Choose the hard drive you want to erase in order 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