update from doc (/cooker/doc/manualB)

1 files changed, 346 insertions, 482 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index e1474b1f7..69247fd02 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -9,47 +9,46 @@ use common;
 #            you want it changed.
 sub acceptLicense() {
     N("Before continuing, you should carefully read the terms of the license. It
-covers the entire Mandrakelinux distribution. If you do agree with all the
-terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button
-will reboot your computer.", N("Accept"), N("Quit"));
+covers the entire Mandrakelinux distribution. If you agree with all the
+terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"
+button will reboot your computer.", N("Accept"), N("Quit"));
 }
 sub addUser() {
-    N("GNU/Linux is a multi-user system, meaning each user may have their own
-preferences, their own files and so on. You can read the ``Starter Guide''
-to learn more about multi-user systems. But unlike \"root\", who is the
-system administrator, the users you add at this point will not be
-authorized to change anything except their own files and their own
-configurations, protecting the system from unintentional or malicious
-changes that impact on the system as a whole. You will have to create at
-least one regular user for yourself -- this is the account which you should
-use for routine, day-to-day use. Although it is very easy to log in as
-\"root\" to do anything and everything, it may also be very dangerous! A
-very simple mistake could mean that your system will not work any more. If
-you make a serious mistake as a regular user, the worst that will happen is
-that you will lose some information, but not affect the entire system.
+    N("GNU/Linux is a multi-user system which means each user can have his or her
+own preferences, own files and so on. But unlike \"root\", who is the
+system administrator, the users you add at this point won't be authorized
+to change anything except their own files and their own configurations,
+protecting the system from unintentional or malicious changes which could
+impact on the system as a whole. You'll have to create at least one regular
+user for yourself -- this is the account which you should use for routine,
+day-to-day usage. Although it's very easy to log in as \"root\" to do
+anything and everything, it may also be very dangerous! A very simple
+mistake could mean that your system won't work any more. If you make a
+serious mistake as a regular user, the worst that can happen is that you'll
+lose some information, but you won't affect the entire system.
 
 The first field asks you for a real name. Of course, this is not mandatory
 -- you can actually enter whatever you like. DrakX will use the first word
-you typed in this field and copy it to the \"%s\" field, which is the name
+you type in this field and copy it to the \"%s\" one, which is the name
 this user will enter to log onto the system. If you like, you may override
 the default and change the user name. The next step is to enter a password.
 From a security point of view, a non-privileged (regular) user password is
-not as crucial as the \"root\" password, but that is no reason to neglect
-it by making it blank or too simple: after all, your files could be the
-ones at risk.
+not as crucial as the \"root\" password, but that's no reason to neglect it
+by making it blank or too simple: after all, your files could be the ones
+at risk.
 
 Once you click on \"%s\", you can add other users. Add a user for each one
-of your friends: your father or your sister, for example. Click \"%s\" when
-you have finished adding users.
+of your friends, your father, your sister, etc. Click \"%s\" when you're
+finished adding users.
 
 Clicking the \"%s\" button allows you to change the default \"shell\" for
 that user (bash by default).
 
-When you have finished adding users, you will be asked to choose a user who
-can automatically log into the system when the computer boots up. If you
-are interested in that feature (and do not care much about local security),
-choose the desired user and window manager, then click \"%s\". If you are
-not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next"), N("Advanced"), N("Next"), N("Do you want to use this feature?"));
+When you're finished adding users, you'll be asked to choose a user who
+will be automatically logged into the system when the computer boots up. If
+you're interested in that feature (and don't care much about local
+security), choose the desired user and window manager, then click on
+\"%s\". If you're not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next"), N("Advanced"), N("Next"), N("Do you want to use this feature?"));
 }
 sub ask_mntpoint_s() {
     N("Listed here are the existing Linux partitions detected on your hard drive.
@@ -85,25 +84,33 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 sub chooseCd() {
     N("The Mandrakelinux installation is distributed on several CD-ROMs. If a
 selected package is located on another CD-ROM, DrakX will eject the current
-CD and ask you to insert the correct CD as required.");
+CD and ask you to insert the required one. If you do not have the requested
+CD at hand, just click on \"%s\", the corresponding packages will not be
+installed.", N("Cancel"));
 }
 sub choosePackages() {
-    N("It is now time to specify which programs you wish to install on your
-system. There are thousands of packages available for Mandrakelinux, and
-to make it simpler to manage the packages have been placed into groups of
-similar applications.
+    N("It's now time to specify which programs you wish to install on your system.
+There are thousands of packages available for Mandrakelinux, and to make it
+simpler to manage, they have been placed into groups of similar
+applications.
 
-Packages are sorted into groups corresponding to a particular use of your
-machine. Mandrakelinux sorts packages groups in four categories. You can
-mix and match applications from the various categories, so a
-``Workstation'' installation can still have applications from the
-``Development'' category installed.
+Mandrakelinux sorts package groups in four categories. You can mix and
+match applications from the various categories, so a ``Workstation''
+installation can still have applications from the ``Server'' category
+installed.
 
  * \"%s\": if you plan to use your machine as a workstation, select one or
-more of the groups that are in the workstation category.
+more of the groups in the workstation category.
 
  * \"%s\": if you plan on using your machine for programming, select the
-appropriate groups from that category.
+appropriate groups from that category. The special \"LSB\" group will
+configure your system so that it complies as much as possible with the
+Linux Standard Base specifications.
+
+   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,
+instead of the default \"2.6\" one. This is to ensure 100%-LSB compliance
+of the system. However, if you do not select the \"LSB\" group you will
+still have a system which is nearly 100% LSB-compliant.
 
  * \"%s\": if your machine is intended to be a server, select which of the
 more common services you wish to install on your machine.
@@ -113,9 +120,19 @@ environment. At least one must be selected if you want to have a graphical
 interface available.
 
 Moving the mouse cursor over a group name will display a short explanatory
-text about that group. If you unselect all groups when performing a regular
-installation (as opposed to an upgrade), a dialog will pop up proposing
-different options for a minimal installation:
+text about that group.
+
+You can check the \"%s\" box, which is useful if you're familiar with the
+packages being offered or if you want to have total control over what will
+be installed.
+
+If you start the installation in \"%s\" mode, you can deselect all groups
+and prevent the installation of any new packages. This is useful for
+repairing or updating an existing system.
+
+If you deselect all groups when performing a regular installation (as
+opposed to an upgrade), a dialog will pop up suggesting different options
+for a minimal installation:
 
  * \"%s\": install the minimum number of packages possible to have a
 working graphical desktop.
@@ -125,100 +142,65 @@ documentation. This installation is suitable for setting up a server.
 
  * \"%s\": will install the absolute minimum number of packages necessary
 to get a working Linux system. With this installation you will only have a
-command line interface. The total size of this installation is about 65
-megabytes.
-
-You can check the \"%s\" box, which 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 started the installation in \"%s\" mode, you can unselect all groups
-to avoid installing any new package. This is useful for repairing or
-updating an existing system.", N("Workstation"), N("Development"), N("Server"), N("Graphical Environment"), N("With X"), N("With basic documentation"), N("Truly minimal install"), N("Individual package selection"), N("Upgrade"));
+command-line interface. The total size of this installation is about 65
+megabytes.", N("Workstation"), N("Development"), N("Server"), N("Graphical Environment"), N("Individual package selection"), N("Upgrade"), N("With X"), N("With basic documentation"), N("Truly minimal install"));
 }
 sub choosePackagesTree() {
-    N("If you told the installer that you wanted to individually select packages,
-it will present a tree containing all packages classified by groups and
-subgroups. While browsing the tree, you can select entire groups,
-subgroups, or individual packages.
+    N("If you choose to install packages individually, the installer will present
+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 to let you know the purpose of the package.
+Whenever you select a package on the tree, a description will appear on the
+right to let you know the purpose of that package.
 
 !! If a server package has been selected, either because you specifically
 chose the individual package or because it was part of a group of packages,
-you will be asked to confirm that you really want those servers to be
+you'll be asked to confirm that you really want those servers to be
 installed. By default Mandrakelinux will automatically start any installed
 services at boot time. Even if they are safe and have no known issues at
-the time the distribution was shipped, it is entirely possible that that
+the time the distribution was shipped, it is entirely possible that
 security holes were discovered after this version of Mandrakelinux was
-finalized. If you do not know what a particular service is supposed to do
-or why it is being installed, then click \"%s\". Clicking \"%s\" will
-install the listed services and they will be started automatically by
-default during boot. !!
+finalized. If you don't know what a particular service is supposed to do or
+why it's being installed, then click \"%s\". Clicking \"%s\" will install
+the listed services and they will be started automatically at boot time. !!
 
 The \"%s\" option is used to disable the warning dialog which appears
 whenever the installer automatically selects a package to resolve a
-dependency issue. Some packages have relationships between each them such
-that installation of one package requires that some other program is also
-required to be installed. The installer can determine which packages are
-required to satisfy a dependency to successfully complete the installation.
+dependency issue. Some packages depend on others and the installation of
+one particular package may require the installation of another package. The
+installer can determine which packages are required to satisfy a dependency
+to successfully complete the installation.
 
 The tiny floppy disk icon at the bottom of the list allows you to load a
 package list created during a previous installation. This is useful if you
 have a number of machines that you wish to configure identically. 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.", N("No"), N("Yes"), N("Automatic dependencies"));
-}
-sub configureNetwork() {
-    N("You will now set up your Internet/network connection. If you wish to
-connect your computer to the Internet or to a local network, click \"%s\".
-Mandrakelinux will attempt to auto-detect network devices and modems. If
-this detection fails, uncheck the \"%s\" box. You may also choose not to
-configure the network, or to do it later, in which case clicking the \"%s\"
-button will take you to the next step.
-
-When configuring your network, the available connections options are:
-Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,
-cable modem, and finally a simple LAN connection (Ethernet).
-
-We will not detail each configuration option - just make sure that you have
-all the parameters, such as IP address, default gateway, DNS servers, etc.
-from your Internet Service Provider or system administrator.
-
-About Winmodem Connection. Winmodems are special integrated low-end modems
-that require additional software to work compared to Normal modems. Some of
-those modems actually work under Mandrakelinux, some others do not. You
-can consult the list of supported modems at LinModems.
-
-You can consult the ``Starter 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.", N("Next"), N("Use auto detection"), N("Cancel"));
+on this icon will ask you to insert the floppy disk created at the end of
+another installation. See the second tip of the last step on how to create
+such a floppy.", N("No"), N("Yes"), N("Automatic dependencies"));
 }
 sub configurePrinter() {
     N("\"%s\": clicking on the \"%s\" button will open the printer configuration
 wizard. Consult the corresponding chapter of the ``Starter Guide'' for more
-information on how to setup a new printer. The interface presented there is
-similar to the one used during installation.", N("Printer"), N("Configure"));
+information on how to set up a new printer. The interface presented in our
+manual is similar to the one used during installation.", N("Printer"), N("Configure"));
 }
 sub configureServices() {
-    N("This dialog is used to choose which services you wish to start at boot
+    N("This dialog is used to select which services you wish to start at boot
 time.
 
-DrakX will list all the services available on the current installation.
-Review each one carefully and uncheck those which are not needed at boot
+DrakX will list all services available on the current installation. Review
+each one of them carefully and uncheck those which aren't needed at boot
 time.
 
 A short explanatory text will be displayed about a service when it is
-selected. However, if you are not sure whether a service is useful or not,
+selected. However, if you're 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.
-!!");
+server: you probably don't want to start any services which you don't need.
+Please remember that some services can be dangerous if they're enabled on a
+server. In general, select only those services you really need. !!");
 }
 sub configureTimezoneGMT() {
     N("GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to
@@ -226,23 +208,23 @@ local time according to the time zone you selected. If the clock on your
 motherboard is set to local time, you may deactivate this by unselecting
 \"%s\", which will let GNU/Linux know that the system clock and the
 hardware clock are in the same time zone. This is useful when the machine
-also hosts another operating system like Windows.
+also hosts another operating system.
 
-The \"%s\" option will automatically regulate the clock by connecting to a
-remote time server on the Internet. For this feature to work, you must have
-a working Internet connection. It is best to choose a time server located
-near you. This option actually installs a time server that can be used by
-other machines on your local network as well.", N("Hardware clock set to GMT"), N("Automatic time synchronization"));
+The \"%s\" option will automatically regulate the system clock by
+connecting to a remote time server on the Internet. For this feature to
+work, you must have a working Internet connection. We recommend that you
+choose a time server located near you. This option actually installs a time
+server which can be used by other machines on your local network as well.", N("Hardware clock set to GMT"), N("Automatic time synchronization"));
 }
 sub configureX_card_list() {
     N("Graphic Card
 
    The installer will normally automatically detect and configure the
-graphic card installed on your machine. If it is not the case, you can
+graphic card installed on your machine. If this is not correct, you can
 choose from this list the card you actually have installed.
 
    In the situation where different servers are available for your card,
-with or without 3D acceleration, you are asked to choose the server that
+with or without 3D acceleration, you're asked to choose the server which
 best suits your needs.");
 }
 sub configureX_chooser() {
@@ -250,32 +232,34 @@ sub configureX_chooser() {
 on which all the graphical environments (KDE, GNOME, AfterStep,
 WindowMaker, etc.) bundled with Mandrakelinux rely upon.
 
-You will be presented with a list of different parameters to change to get
-an optimal graphical display: Graphic Card
+You'll see a list of different parameters to change to get an optimal
+graphical display.
+
+Graphic Card
 
    The installer will normally automatically detect and configure the
-graphic card installed on your machine. If it is not the case, you can
+graphic card installed on your machine. If this is not correct, you can
 choose from this list the card you actually have installed.
 
    In the situation where different servers are available for your card,
-with or without 3D acceleration, you are asked to choose the server that
+with or without 3D acceleration, you're asked to choose the server which
 best suits your needs.
 
 
 
 Monitor
 
-   The installer will normally automatically detect and configure the
-monitor connected to your machine. If it is incorrect, you can choose from
-this list the monitor you actually have connected to your computer.
+   Normally the installer will automatically detect and configure the
+monitor connected to your machine. If it is not correct, you can choose
+from this list the monitor which is connected to your computer.
 
 
 
 Resolution
 
    Here you can choose the resolutions and color depths available for your
-hardware. Choose the one that best suits your needs (you will be able to
-change that after installation though). A sample of the chosen
+graphics hardware. Choose the one which best suits your needs (you will be
+able to make changes after the installation). A sample of the chosen
 configuration is shown in the monitor picture.
 
 
@@ -284,104 +268,105 @@ Test
 
    Depending on your hardware, this entry might not appear.
 
-   the system will try to open a graphical screen at the desired
-resolution. If you can see the message during the test and answer \"%s\",
-then DrakX will proceed to the next step. If you cannot see the message, it
+   The system will try to open a graphical screen at the desired
+resolution. If you see the test message during the test and answer \"%s\",
+then DrakX will proceed to the next step. If you do not see it, then it
 means that some part of the auto-detected configuration was incorrect and
-the test will automatically end after 12 seconds, bringing you back to the
+the test will automatically end after 12 seconds and return you to the
 menu. Change settings until you get a correct graphical display.
 
 
 
 Options
 
-   Here you can choose whether you want to have your machine automatically
-switch to a graphical interface at boot. Obviously, you want to check
-\"%s\" if your machine is to act as a server, or if you were not successful
-in getting the display configured.", N("Yes"), N("No"));
+   This steps allows you to choose whether you want your machine to
+automatically switch to a graphical interface at boot. Obviously, you may
+want to check \"%s\" if your machine is to act as a server, or if you were
+not successful in getting the display configured.", N("Yes"), N("No"));
 }
 sub configureX_monitor() {
     N("Monitor
 
-   The installer will normally automatically detect and configure the
-monitor connected to your machine. If it is incorrect, you can choose from
-this list the monitor you actually have connected to your computer.");
+   Normally the installer will automatically detect and configure the
+monitor connected to your machine. If it is not correct, you can choose
+from this list the monitor which is connected to your computer.");
 }
 sub configureX_resolution() {
     N("Resolution
 
    Here you can choose the resolutions and color depths available for your
-hardware. Choose the one that best suits your needs (you will be able to
-change that after installation though). A sample of the chosen
+graphics hardware. Choose the one which best suits your needs (you will be
+able to make changes after the installation). A sample of the chosen
 configuration is shown in the monitor picture.");
 }
 sub configureX_xfree_and_glx() {
     N("In the situation where different servers are available for your card, with
-or without 3D acceleration, you are asked to choose the server that best
+or without 3D acceleration, you're asked to choose the server which best
 suits your needs.");
 }
 sub configureXxdm() {
     N("Options
 
-   Here you can choose whether you want to have your machine automatically
-switch to a graphical interface at boot. Obviously, you want to check
-\"%s\" if your machine is to act as a server, or if you were not successful
-in getting the display configured.", N("No"));
+   This steps allows you to choose whether you want your machine to
+automatically switch to a graphical interface at boot. Obviously, you may
+want to check \"%s\" if your machine is to act as a server, or if you were
+not successful in getting the display configured.", N("No"));
 }
 sub doPartitionDisks() {
-    N("At this point, you need to decide 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
-have to partition the drive. Basically, partitioning a hard drive consists
-of logically dividing it to create the space needed to install your new
+    N("You now need to decide where you want to install the Mandrakelinux
+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 have to
+partition the drive. Basically, partitioning a hard drive means to
+logically divide it to create the space needed to install your new
 Mandrakelinux system.
 
 Because the process of partitioning a hard drive is usually irreversible
-and can lead to lost data if there is an existing operating system already
-installed on the drive, partitioning can be intimidating and stressful if
-you are an inexperienced user. Fortunately, DrakX includes a wizard which
+and can lead to data losses, partitioning can be intimidating and stressful
+for the inexperienced user. Fortunately, DrakX includes a wizard which
 simplifies this process. Before continuing with this step, read through the
 rest of this section and above all, take your time.
 
-Depending on your hard drive configuration, several options are available:
+Depending on the configuration of your hard drive, several options are
+available:
 
- * \"%s\": this option will perform an automatic partitioning of your blank
+ * \"%s\". This option will perform an automatic partitioning of your blank
 drive(s). If you use this option there will be no further prompts.
 
- * \"%s\": the wizard has detected one or more existing Linux partitions on
+ * \"%s\". The wizard has detected one or more existing Linux partitions on
 your hard drive. If you want to use them, choose this option. You will then
 be asked to choose the mount points associated with each of the partitions.
 The legacy mount points are selected by default, and for the most part it's
 a good idea to keep them.
 
- * \"%s\": if Microsoft Windows is installed on your hard drive and takes
+ * \"%s\". If Microsoft Windows is installed on your hard drive and takes
 all the space available on it, you will have to create free space for
 GNU/Linux. To do so, you can delete your Microsoft Windows partition and
 data (see ``Erase entire disk'' solution) or resize your Microsoft Windows
 FAT or NTFS partition. Resizing can be performed without the loss of any
-data, provided you have previously defragmented the Windows partition.
-Backing up your data is strongly recommended.. Using this option is
+data, provided you've previously defragmented the Windows partition.
+Backing up your data is strongly recommended. Using this option is
 recommended if you want to use both Mandrakelinux and Microsoft Windows on
 the same computer.
 
    Before choosing this option, please understand that after this
 procedure, the size of your Microsoft Windows partition will be smaller
-then when you started. You will have less free space under Microsoft
-Windows to store your data or to install new software.
+than when you started. You'll have less free space under Microsoft Windows
+to store your data or to install new software.
 
- * \"%s\": if you want to delete all data and all partitions present on
-your hard drive and replace them with your new Mandrakelinux system,
-choose this option. Be careful, because you will not be able to undo your
-choice after you confirm.
+ * \"%s\". If you want to delete all data and all partitions present on
+your hard drive and replace them with your new Mandrakelinux system, choose
+this option. Be careful, because you won't be able to undo this operation
+after you confirm.
 
    !! If you choose this option, all data on your disk will be deleted. !!
 
- * \"%s\": this will simply erase everything on the drive and begin fresh,
-partitioning everything from scratch. All data on your disk will be lost.
+ * \"%s\". This option appears when the hard drive is entirely taken by
+Microsoft Windows. Choosing this option will simply erase everything on the
+drive and begin fresh, partitioning everything from scratch.
 
    !! If you choose this option, all data on your disk will be lost. !!
 
- * \"%s\": choose this option if you want to manually partition your hard
+ * \"%s\". Choose this option if you want to manually partition your hard
 drive. Be careful -- it is a powerful but dangerous choice and you can very
 easily lose all your data. That's why this option is really only
 recommended if you have done something like this before and have some
@@ -390,18 +375,19 @@ refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N(
 }
 sub exitInstall() {
     N("There you are. Installation is now complete and your GNU/Linux system is
-ready to use. Just click \"%s\" to reboot the system. Don't forget to
-remove the installation media (CD-ROM or floppy). The first thing you
+ready to be used. Just click on \"%s\" to reboot the system. Don't forget
+to remove the installation media (CD-ROM or floppy). The first thing you
 should see after your computer has finished doing its hardware tests is the
-bootloader menu, giving you the choice of which operating system to start.
+boot-loader menu, giving you the choice of which operating system to start.
 
 The \"%s\" button shows two more buttons to:
 
- * \"%s\": to create an installation floppy disk that will automatically
-perform a whole installation without the help of an operator, similar to
-the installation you just configured.
+ * \"%s\": enables you to create an installation floppy disk which will
+automatically perform a whole installation without the help of an operator,
+similar to the installation you've just configured.
 
-   Note that two different options are available after clicking the button:
+   Note that two different options are available after clicking on that
+button:
 
     * \"%s\". This is a partially automated installation. The partitioning
 step is the only interactive procedure.
@@ -409,67 +395,67 @@ step is the only interactive procedure.
     * \"%s\". Fully automated installation: the hard disk is completely
 rewritten, all data is lost.
 
-   This feature is very handy when installing a number of similar machines.
-See the Auto install section on our web site for more information.
+   This feature is very handy when installing on a number of similar
+machines. See the Auto install section on our web site for more
+information.
+
+ * \"%s\"(*): saves a list of the packages selected in this installation.
+To use this selection with another installation, insert the floppy and
+start the installation. At the prompt, press the [F1] key, type >>linux
+defcfg=\"floppy\"<< and press the [Enter] key.
 
- * \"%s\": saves a list of the packages selected in this installation. To
-use this selection with another installation, insert the floppy and start
-the installation. At the prompt, press the [F1] key and type >>linux
-defcfg=\"floppy\" <<.", N("Reboot"), N("Advanced"), N("Generate auto-install floppy"), N("Replay"), N("Automated"), N("Save packages selection"));
+(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type
+\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat
+/dev/fd0\".", N("Reboot"), N("Advanced"), N("Generate auto-install floppy"), N("Replay"), N("Automated"), N("Save packages selection"));
 }
 sub formatPartitions() {
-    N("Any partitions that have been newly defined must be formatted for use
-(formatting means creating a file system).
-
-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
-partitions as well.
+    N("If you chose to reuse some legacy GNU/Linux partitions, you may wish to
+reformat some of them and erase any data they contain. To do so, please
+select those partitions as well.
 
-Please note that it is not necessary to reformat all pre-existing
+Please note that it's 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\").
+system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat
+partitions containing data that you wish to keep (typically \"/home\").
 
-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
-it.
+Please be careful when selecting partitions. After the formatting is
+completed, all data on the selected partitions will be deleted and you
+won't be able to recover it.
 
-Click on \"%s\" when you are ready to format the partitions.
+Click on \"%s\" when you're ready to format the partitions.
 
 Click on \"%s\" if you want to choose another partition for your new
 Mandrakelinux operating system installation.
 
-Click on \"%s\" if you wish to select partitions that will be checked for
+Click on \"%s\" if you wish to select partitions which will be checked for
 bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
 }
 sub installUpdates() {
-    N("At the time you are installing Mandrakelinux, it is likely that some
-packages will have been updated since the initial release. Bugs may have
-been fixed, security issues resolved. To allow you to benefit from these
-updates, you are now able to download them from the Internet. Check \"%s\"
-if you have a working Internet connection, or \"%s\" if you prefer to
-install updated packages later.
-
-Choosing \"%s\" will display a list of places from which updates can be
-retrieved. You should choose one near to you. A package-selection tree will
-appear: review the selection, and press \"%s\" to retrieve and install the
-selected package(s), or \"%s\" to abort.", N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
+    N("By the time you install Mandrakelinux, it's likely that some packages will
+have been updated since the initial release. Bugs may have been fixed,
+security issues resolved. To allow you to benefit from these updates,
+you're now able to download them from the Internet. Check \"%s\" if you
+have a working Internet connection, or \"%s\" if you prefer to install
+updated packages later.
+
+Choosing \"%s\" will display a list of web locations from which updates can
+be retrieved. You should choose one near to you. A package-selection tree
+will appear: review the selection, and press \"%s\" to retrieve and install
+the selected package(s), or \"%s\" to abort.", N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
 }
 sub miscellaneous() {
-    N("At this point, DrakX will allow you to choose the security level desired
-for the machine. As a rule of thumb, the security level should be set
-higher if the machine will contain crucial data, or if it will be a machine
-directly exposed to the Internet. The trade-off of a higher security level
-is generally obtained at the expense of ease of use.
+    N("At this point, DrakX will allow you to choose the security level you desire
+for your machine. As a rule of thumb, the security level should be set
+higher if the machine is to contain crucial data, or if it's to be directly
+exposed to the Internet. The trade-off that a higher security level is
+generally obtained at the expense of ease of use.
 
-If you do not know what to choose, stay with the default option. You will
-be able to change that security level later with tool draksec from the
-Mandrake Control Center.
+If you don't know what to choose, keep the default option. You'll be able
+to change it later with the draksec tool, which is part of Mandrakelinux
+Control Center.
 
-The \"%s\" field can inform the system of the user on this computer who
-will be responsible for security. Security messages will be sent to that
-address.", N("Security Administrator"));
+Fill the \"%s\" field with the e-mail address of the person responsible for
+security. Security messages will be sent to that address.", N("Security Administrator"));
 }
 sub partition_with_diskdrake() {
     N("At this point, you need to choose which partition(s) will be used for the
@@ -575,68 +561,69 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 disk or partition is called \"C:\").");
 }
 sub selectCountry() {
-    N("\"%s\": check the current country selection. If you are not in this
-country, click on the \"%s\" button and choose another one. If your country
-is not in the first list shown, click the \"%s\" button to get the complete
-country list.", N("Country / Region"), N("Configure"), N("More"));
+    N("\"%s\": check the current country selection. If you're not in this country,
+click on the \"%s\" button and choose another. If your country isn't in the
+list shown, click on the \"%s\" button to get the complete country list.", N("Country / Region"), N("Configure"), N("More"));
 }
 sub selectInstallClass() {
     N("This step is activated only if an existing GNU/Linux partition has been
 found on your machine.
 
-DrakX now needs to know if you want to perform a new install or an upgrade
-of an existing Mandrakelinux system:
+DrakX now needs to know if you want to perform a new installation or an
+upgrade of an existing Mandrakelinux system:
 
- * \"%s\": For the most part, this completely wipes out the old system. If
-you wish to change how your hard drives are partitioned, or change the file
-system, you should use this option. However, depending on your partitioning
-scheme, you can prevent some of your existing data from being over-written.
+ * \"%s\". For the most part, this completely wipes out the old system.
+However, depending on your partitioning scheme, you can prevent some of
+your existing data (notably \"home\" directories) from being over-written.
+If you wish to change how your hard drives are partitioned, or to change
+the file system, you should use this option.
 
- * \"%s\": this installation class allows you to update the packages
-currently installed on your Mandrakelinux system. Your current
-partitioning scheme and user data is not altered. Most of other
-configuration steps remain available, similar to a standard installation.
+ * \"%s\". This installation class allows you to update the packages
+currently installed on your Mandrakelinux system. Your current partitioning
+scheme and user data won't be altered. Most of the other configuration
+steps remain available and are similar to a standard installation.
 
 Using the ``Upgrade'' option should work fine on Mandrakelinux systems
-running version \"8.1\" or later. Performing an Upgrade on versions prior
+running version \"8.1\" or later. Performing an upgrade on versions prior
 to Mandrakelinux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
 }
 sub selectKeyboard() {
-    N("Depending on the language you chose in section , DrakX will automatically
-select a particular type of keyboard configuration. Check that the
-selection suits you or choose another keyboard layout.
+    N("Depending on the language you chose (), DrakX will automatically select a
+particular type of keyboard configuration. Check that the selection suits
+you or choose another keyboard layout.
 
-Also, you may not have a keyboard that corresponds exactly to your
+Also, you may not have a keyboard which corresponds exactly to your
 language: for example, if you are an English-speaking Swiss native, you may
 have a Swiss keyboard. Or if you speak English and are located in Quebec,
 you may find yourself in the same situation where your native language and
-country-set keyboard do not match. In either case, this installation step
+country-set keyboard don't match. In either case, this installation step
 will allow you to select an appropriate keyboard from a list.
 
-Click on the \"%s\" button to be presented with the complete list of
-supported keyboards.
+Click on the \"%s\" button to be shown a list of supported keyboards.
 
 If you choose a keyboard layout based on a non-Latin alphabet, the next
-dialog will allow you to choose the key binding that will switch the
+dialog will allow you to choose the key binding which will switch the
 keyboard between the Latin and non-Latin layouts.", N("More"));
 }
 sub selectLanguage() {
-    N("Your choice of preferred language will affect the language of the
-documentation, the installer and the system in general. Select first the
-region you are located in, and then the language you speak.
+    N("The first step is to choose your preferred language.
+
+Your choice of preferred language will affect the installer, the
+documentation, and the system in general. First select the region you're
+located in, then the language you speak.
 
 Clicking on the \"%s\" button will allow you to select other languages to
 be installed on your workstation, thereby installing 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 default
-language in the tree view and \"%s\" in the Advanced section.
+files for system documentation and applications. For example, if Spanish
+users are to use your machine, select English as the default language in
+the tree view and \"%s\" in the Advanced section.
 
 About UTF-8 (unicode) support: Unicode is a new character encoding meant to
-cover all existing languages. Though full support for it in GNU/Linux is
-still under development. For that reason, Mandrakelinux will be using it
-or not depending on the user choices:
+cover all existing languages. However full support for it in GNU/Linux is
+still under development. For that reason, Mandrakelinux's use of UTF-8 will
+depend on the user's choices:
 
- * If you choose a languages with a strong legacy encoding (latin1
+ * If you choose a language with a strong legacy encoding (latin1
 languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most
 iso-8859-2 languages), the legacy encoding will be used by default;
 
@@ -645,50 +632,53 @@ iso-8859-2 languages), the legacy encoding will be used by default;
  * If two or more languages are required, and those languages are not using
 the same encoding, then unicode will be used for the whole system;
 
- * Finally, unicode can also be forced for the system at user request by
-selecting option \"%s\" independently of which language(s) have been
-chosen.
+ * Finally, unicode can also be forced for use throughout the system at a
+user's request by selecting the \"%s\" option independently of which
+languages were been chosen.
 
 Note that you're not limited to choosing a single additional language. You
-may choose several ones, or even install them all by selecting the \"%s\"
-box. Selecting support for a language means translations, fonts, spell
-checkers, etc. for that language will also be installed.
+may choose several, or even install them all by selecting the \"%s\" box.
+Selecting support for a language means translations, fonts, spell checkers,
+etc. will also be installed for that language.
 
-To switch between the various languages installed on the system, you can
-launch the \"/usr/sbin/localedrake\" command as \"root\" to change the
-language used by the entire system. Running the command as a regular user
-will only change the language settings for that particular user.", N("Advanced"), N("Espanol"), N("Use Unicode by default"), N("All languages"));
+To switch between the various languages installed on your system, you can
+launch the \"localedrake\" command as \"root\" to change the language used
+by the entire system. Running the command as a regular user will only
+change the language settings for that particular user.", N("Advanced"), N("Espanol"), N("Use Unicode by default"), N("All languages"));
 }
 sub selectMouse() {
     N("Usually, DrakX has no problems detecting the number of buttons on your
 mouse. If it does, it assumes you have a two-button mouse and will
 configure it for third-button emulation. The third-button mouse button of a
-two-button mouse can be ``pressed'' by simultaneously clicking the left and
+two-button mouse can be obtained by simultaneously clicking the left and
 right mouse buttons. DrakX will automatically know whether your mouse uses
 a PS/2, serial or USB interface.
 
-In case you have a 3 buttons mouse without wheel, you can choose the mouse
-that says \"%s\". DrakX will then configure your mouse so that you can
-simulate the wheel with it: to do so, press the middle button and move your
-mouse up and down.
+If you have a 3-button mouse without a wheel, you can choose a \"%s\"
+mouse. DrakX will then configure your mouse so that you can simulate the
+wheel with it: to do so, press the middle button and move your mouse
+pointer up and down.
 
 If for some reason you wish to specify a different type of mouse, select it
 from the list provided.
 
-If you choose a mouse other than the default, a test screen will be
+You can select the \"%s\" entry to chose a ``generic'' mouse type which
+will work with nearly all mice.
+
+If you choose a mouse other than the default one, a test screen will be
 displayed. Use the buttons and wheel to verify that the settings are
 correct and that the mouse is working correctly. If the mouse is not
-working well, press the space bar or [Return] key to cancel the test and to
-go back to the list of choices.
+working well, press the space bar or [Return] key to cancel the test and
+you will be returned to the mouse list.
 
-Wheel mice are occasionally not detected automatically, so you will need to
+Occasionally wheel mice are not detected automatically, so you will need to
 select your mouse from a list. Be sure to select the one corresponding to
 the port that your mouse is attached to. After selecting a mouse and
-pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll
-the mouse wheel to ensure that it is activated correctly. Once you see the
-on-screen scroll wheel moving as you scroll your mouse wheel, test the
-buttons and check that the mouse pointer moves on-screen as you move your
-mouse.", N("with Wheel emulation"), N("Next"));
+pressing the \"%s\" button, a mouse image will be displayed on-screen.
+Scroll the mouse wheel to ensure that it is activating correctly. As you
+scroll your mouse wheel, you will see the on-screen scroll wheel moving.
+Test the buttons and check that the mouse pointer moves on-screen as you
+move your mouse about.", N("with Wheel emulation"), N("Universal | Any PS/2 & USB mice"), N("Next"));
 }
 sub selectSerialPort() {
     N("Please select the correct port. For example, the \"COM1\" port under
@@ -696,12 +686,12 @@ Windows is named \"ttyS0\" under GNU/Linux.");
 }
 sub setRootPassword() {
     N("This is the most crucial decision point for the security of your GNU/Linux
-system: you have to enter the \"root\" password. \"Root\" is the system
+system: you must enter the \"root\" password. \"Root\" is the system
 administrator and is the only user 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 the password you chose is too easy. As you
-can see, you are not forced to enter a password, but we strongly advise you
+do everything! That's why you must choose a password which is difficult to
+guess: DrakX will tell you if the password you chose is too simple. As you
+can see, you're not forced to enter a password, but we strongly advise
 against this. GNU/Linux is just as prone to operator error as any other
 operating system. Since \"root\" can overcome all limitations and
 unintentionally erase all data on partitions by carelessly accessing the
@@ -710,120 +700,69 @@ partitions themselves, it is important that it be difficult to become
 
 The password should be a mixture of alphanumeric characters and at least 8
 characters long. Never write down the \"root\" password -- it makes it far
-too easy to compromise a system.
+too easy to compromise your system.
 
-One caveat -- do not make the password too long or complicated because you
+One caveat: don't make the password too long or too complicated because you
 must be able to remember it!
 
-The password will not be displayed on screen as you type it in. To reduce
-the chance of a blind typing error you will need to enter the password
-twice. If you do happen to make the same typing error twice, this
-``incorrect'' password will be the one you will have use the first time you
-connect.
+The password won't be displayed on screen as you type it. To reduce the
+chance of a blind typing error you'll need to enter the password twice. If
+you do happen to make the same typing error twice, you'll have to use this
+``incorrect'' password the first time you'll try to connect as \"root\".
 
-If you wish access to this computer to be controlled by an authentication
-server, click the \"%s\" button.
+If you want an authentication server to control access to your computer,
+click on the \"%s\" button.
 
 If your network uses either LDAP, NIS, or PDC Windows Domain authentication
-services, select the appropriate one for \"%s\". If you do not know which
+services, select the appropriate one for \"%s\". If you don't know which
 one to use, you should ask your network administrator.
 
-If you happen to have problems with remembering passwords, if your computer
-will never be connected to the Internet and you absolutely trust everybody
-who uses your computer, you can choose to have \"%s\".", N("Advanced"), N("authentication"), N("No password"));
-}
-sub setupBootloader() {
-    N("This dialog allows you to fine tune your bootloader:
-
- * \"%s\": there are three choices for your bootloader:
-
-    * \"%s\": if you prefer GRUB (text menu).
-
-    * \"%s\": if you prefer LILO with its text menu interface.
-
-    * \"%s\": if you prefer LILO with its graphical interface.
-
- * \"%s\": in most cases, you will not change the default (\"%s\"), but if
-you prefer, the bootloader can be installed on the second hard drive
-(\"%s\"), or even on a floppy disk (\"%s\");
-
- * \"%s\": after a boot or a reboot of the computer, this is the delay
-given to the user at the console to select a boot entry other than the
-default.
-
- * \"%s\": ACPI is a new standard (appeared during year 2002) for power
-management, notably for laptops. If you know your hardware supports it and
-you need it, check this box.
-
- * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,
-instabilities, machine freeze, ...) you should try disabling APIC by
-checking this box.
-
-!! Be aware that if you choose not to install a bootloader (by selecting
-\"%s\"), you must ensure that you have a way to boot your Mandrakelinux
-system! Be sure you know what you are doing before changing any of the
-options. !!
-
-Clicking the \"%s\" button in this dialog will offer advanced options which
-are normally reserved for the expert user.", N("Bootloader to use"), N("GRUB"), N("LILO with text menu"), N("LILO with graphical menu"), N("Boot device"), N("/dev/hda"), N("/dev/hdb"), N("/dev/fd0"), N("Delay before booting the default image"), N("Enable ACPI"), N("Force no APIC"), N("Skip"), N("Advanced"));
-}
-sub setupBootloaderAddEntry() {
-    N("After you have configured the general bootloader parameters, the list of
-boot options that will be available at boot time will be displayed.
-
-If there are other operating systems installed on your machine they will
-automatically be added to the boot menu. You can fine-tune the existing
-options by clicking \"%s\" to create a new entry; selecting an entry and
-clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your
-changes.
-
-You may also not want to give access to these other operating systems to
-anyone who goes to the console and reboots the machine. You can delete the
-corresponding entries for the operating systems to remove them from the
-bootloader menu, but you will need a boot disk in order to boot those other
-operating systems!", N("Add"), N("Modify"), N("Remove"), N("Next"));
+If you happen to have problems with remembering passwords, or if your
+computer will never be connected to the Internet and you absolutely trust
+everybody who uses your computer, you can choose to have \"%s\".", N("Advanced"), N("authentication"), N("No password"));
 }
 sub setupBootloaderBeginner() {
-    N("LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally
-automated. DrakX will analyze the disk boot sector and act according to
-what it finds there:
+    N("A boot loader is a little program which is started by the computer at boot
+time. It's responsible for starting up the whole system. Normally, the boot
+loader installation is totally automated. DrakX will analyze the disk boot
+sector and act according to what it finds there:
 
  * if a Windows boot sector is found, it will replace it with a GRUB/LILO
-boot sector. This way you will be able to load either GNU/Linux or any
-other OS installed on your machine.
+boot sector. This way you'll be able to load either GNU/Linux or any other
+OS installed on your machine.
 
- * if a GRUB or LILO boot sector is found, it will replace it with a new
-one.
+ * if a GRUB or LILO boot sector is found, it'll replace it with a new one.
 
-If it cannot make a determination, DrakX will ask you where to place the
-bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"
-won't install any bootloader. Use it only if you know what you are doing.", N("First sector of drive (MBR)"), N("Skip"));
+If DrakX can't determine where to place the boot sector, it'll ask you
+where it should place it. Generally, the \"%s\" is the safest place.
+Choosing \"%s\" won't install any boot loader. Use this option only if you
+know what you're doing.", N("First sector of drive (MBR)"), N("Skip"));
 }
 sub setupDefaultSpooler() {
-    N("Now, it's time to select a printing system for your computer. Other OSs may
-offer you one, but Mandrakelinux offers two. Each of the printing systems
-is best suited to particular types of configuration.
+    N("Now, it's time to select a printing system for your computer. Other
+operating systems may offer you one, but Mandrakelinux offers two. Each of
+the printing systems is best suited to particular types of configuration.
 
  * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice
 if you have a direct connection to your printer, you want to be able to
-panic out of printer jams, and you do not have networked printers. (\"%s\"
+panic out of printer jams, and you don't have networked printers. (\"%s\"
 will handle only very simple network cases and is somewhat slow when used
-with networks.) It's recommended that you use \"pdq\" if this is your first
-experience with GNU/Linux.
-
- * \"%s\" - `` Common Unix Printing System'', is an excellent choice for
-printing to your local printer or to one halfway around the planet. It is
-simple to configure and can act as a server or a client for the ancient
-\"lpd \" printing system, so it is compatible with older operating systems
-which may still need print services. While quite powerful, the basic setup
-is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make
-sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical
-front-ends for printing or choosing printer options and for managing the
-printer.
+within networks.) It's recommended that you use \"pdq\" if this is your
+first experience with GNU/Linux.
+
+ * \"%s\" stands for `` Common Unix Printing System'' and is an excellent
+choice for printing to your local printer or to one halfway around the
+planet. It's simple to configure and can act as a server or a client for
+the ancient \"lpd\" printing system, so it's compatible with older
+operating systems which may still need print services. While quite
+powerful, the basic setup is almost as easy as \"pdq\". If you need to
+emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.
+\"%s\" includes graphical front-ends for printing or choosing printer
+options and for managing the printer.
 
 If you make a choice now, and later find that you don't like your printing
-system you may change it by running PrinterDrake from the Mandrake Control
-Center and clicking the expert button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"));
+system you may change it by running PrinterDrake from the Mandrakelinux
+Control Center and clicking on the \"%s\" button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"), N("Expert"));
 }
 sub setupSCSI() {
     N("DrakX will first detect any IDE devices present in your computer. It will
@@ -843,137 +782,60 @@ If DrakX is not able to probe for the options to automatically determine
 which parameters need to be passed to the hardware, you'll need to manually
 configure the driver.");
 }
-sub setupYabootAddEntry() {
-    N("You can add additional entries in yaboot for other operating systems,
-alternate kernels, or for an emergency boot image.
-
-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 the name you will have to type at the yaboot prompt to
-select this boot option.
-
- * Image: this is the name of the kernel to boot. Typically, vmlinux or a
-variation of vmlinux with an extension.
-
- * Root: the \"root\" device or ``/'' for your Linux installation.
-
- * Append: on Apple hardware, the kernel append option is often used to
-assist in initializing video hardware, or to enable keyboard mouse button
-emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.
-The following are some examples:
-
-   	      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111
-hda=autotune
-
-   	      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111
-
- * 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 4096 Kbytes. If you
-need to allocate a large ramdisk, this option can be used to specify a
-ramdisk larger than the default.
-
- * Read-write: normally the \"root\" partition is initially mounted as
-read-only, to allow a file system check before the system becomes ``live''.
-You can override the default with 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 pressing ENTER at the yaboot prompt. This entry will also be
-highlighted with a ``*'' if you press [Tab] to see the boot selections.");
-}
-sub setupYabootGeneral() {
-    N("Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to
-boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly
-detected and installed in the bootloader menu. If this is not the case, you
-can add an entry by hand in this screen. Take care to choose the correct
-parameters.
-
-Yaboot's main options are:
-
- * Init Message: a simple text message displayed before the boot prompt.
-
- * 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;
-
- * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.
-After selecting Linux, you will have this delay in 0.1 second increments
-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.");
-}
 sub sound_config() {
-    N("\"%s\": if a sound card is detected on your system, it is displayed here.
-If you notice the sound card displayed is not the one that is actually
-present on your system, you can click on the button and choose another
-driver.", N("Sound card"));
+    N("\"%s\": if a sound card is detected on your system, it'll be displayed
+here. If you notice the sound card isn't the one actually present on your
+system, you can click on the button and choose a different driver.", N("Sound card"));
 }
 sub summary() {
-    N("As a review, DrakX will present a summary of information it has about your
-system. Depending on your installed hardware, you may have some or all of
-the following entries. Each entry is made up of the configuration item to
-be configured, followed by a quick summary of the current configuration.
-Click on the corresponding \"%s\" button to change that.
+    N("As a review, DrakX will present a summary of information it has gathered
+about your system. Depending on the hardware installed on your machine, you
+may have some or all of the following entries. Each entry is made up of the
+hardware item to be configured, followed by a quick summary of the current
+configuration. Click on the corresponding \"%s\" button to make the change.
 
  * \"%s\": check the current keyboard map configuration and change it if
 necessary.
 
- * \"%s\": check the current country selection. If you are not in this
-country, click on the \"%s\" button and choose another one. If your country
-is not in the first list shown, click the \"%s\" button to get the complete
+ * \"%s\": check the current country selection. If you're not in this
+country, click on the \"%s\" button and choose another. If your country
+isn't in the list shown, click on the \"%s\" button to get the complete
 country list.
 
- * \"%s\": By default, DrakX deduces your time zone based on the country
+ * \"%s\": by default, DrakX deduces your time zone based on the country
 you have chosen. You can click on the \"%s\" button here if this is not
 correct.
 
- * \"%s\": check the current mouse configuration and click on the button to
-change it if necessary.
+ * \"%s\": verify the current mouse configuration and click on the button
+to change it if necessary.
 
  * \"%s\": clicking on the \"%s\" button will open the printer
 configuration wizard. Consult the corresponding chapter of the ``Starter
-Guide'' for more information on how to setup a new printer. The interface
-presented there is similar to the one used during installation.
+Guide'' for more information on how to set up a new printer. The interface
+presented in our manual is similar to the one used during installation.
 
- * \"%s\": if a sound card is detected on your system, it is displayed
-here. If you notice the sound card displayed is not the one that is
-actually present on your system, you can click on the button and choose
-another driver.
+ * \"%s\": if a sound card is detected on your system, it'll be displayed
+here. If you notice the sound card isn't the one actually present on your
+system, you can click on the button and choose a different driver.
+
+ * \"%s\": if you have a TV card, this is where information about its
+configuration will be displayed. If you have a TV card and it isn't
+detected, click on \"%s\" to try to configure it manually.
+
+ * \"%s\": you can click on \"%s\" to change the parameters associated with
+the card if you feel the configuration is wrong.
 
  * \"%s\": by default, DrakX configures your graphical interface in
-\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on
+\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on
 \"%s\" to reconfigure your graphical interface.
 
- * \"%s\": if a TV card is detected on your system, it is displayed here.
-If you have a TV card and it is not detected, click on \"%s\" to try to
-configure it manually.
-
- * \"%s\": if an ISDN card is detected on your system, it will be displayed
-here. You can click on \"%s\" to change the parameters associated with the
-card.
+ * \"%s\": if you wish to configure your Internet or local network access,
+you can do so now. Refer to the printed documentation or use the
+Mandrakelinux Control Center after the installation has finished to benefit
+from full in-line help.
 
- * \"%s\": If you wish to configure your Internet or local network access
-now.
+ * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine
+you're installing on is to be located behind a proxy server.
 
  * \"%s\": this entry allows you to redefine the security level as set in a
 previous step ().
@@ -983,12 +845,14 @@ idea to protect yourself from intrusions by setting up a firewall. Consult
 the corresponding section of the ``Starter Guide'' for details about
 firewall settings.
 
- * \"%s\": if you wish to change your bootloader configuration, click that
-button. This should be reserved to advanced users.
+ * \"%s\": if you wish to change your bootloader configuration, click this
+button. This should be reserved to advanced users. Refer to the printed
+documentation or the in-line help about bootloader configuration in the
+Mandrakelinux Control Center.
 
- * \"%s\": here you'll be able to fine control which services will be run
+ * \"%s\": through this entry you can fine tune which services will be run
 on your machine. If you plan to use this machine as a server it's a good
-idea to review this setup.", N("Configure"), N("Keyboard"), N("Country / Region"), N("Configure"), N("More"), N("Timezone"), N("Configure"), N("Mouse"), N("Printer"), N("Configure"), N("Sound card"), N("Graphical Interface"), N("Configure"), N("TV card"), N("Configure"), N("ISDN card"), N("Configure"), N("Network"), N("Security Level"), N("Firewall"), N("Bootloader"), N("Services"));
+idea to review this setup.", N("Configure"), N("Keyboard"), N("Country / Region"), N("Configure"), N("More"), N("Timezone"), N("Configure"), N("Mouse"), N("Printer"), N("Configure"), N("Sound card"), N("TV card"), N("Configure"), N("ISDN card"), N("Configure"), N("Graphical Interface"), N("Configure"), N("Network"), N("Proxies"), N("Security Level"), N("Firewall"), N("Bootloader"), N("Services"));
 }
 sub takeOverHdChoose() {
     N("Choose the hard drive you want to erase in order to install your new
@@ -1002,5 +866,5 @@ to recover any data and partitions present on this hard drive, including
 any Windows data.
 
 Click on \"%s\" to quit this operation without losing data and partitions
-present on this hard drive.", N("Next"), N("Next"), N("Previous"));
+present on this hard drive.", N("Next ->"), N("Next ->"), N("<- Previous"));
 }