no_comment

1 files changed, 284 insertions, 117 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index 614fa833c..604124b20 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -7,7 +7,7 @@ selectLanguage =>
  __("Choose preferred language for install and system usage."),
 
 selectKeyboard =>
- __("Choose on the list of keyboards, the one corresponding to yours"),
+ __("Choose the layout corresponding to your keyboard from the list above"),
 
 selectPath =>
  __("Choose \"Installation\" if there are no previous versions of Linux
@@ -20,8 +20,9 @@ Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
 selectInstallClass =>
  __("Select:
 
-  - Beginner: If you have not installed Linux before, or wish to install
-the distribution elected \"Product of the year\" for 1999, click here.
+  - Beginner: If you have never installed Linux before, and wish to
+install the distribution elected \"Product of the year\" for 1999,
+click here.
 
   - Developer: If you are familiar with Linux and will be using the
 computer primarily for software development, you will find happiness
@@ -31,8 +32,8 @@ here.
 Linux distribution elected \"Distribution/Server\" for 1999, select
 this.
 
-  - Expert: If you know GNU/Linux and want to perform a highly
-customized installation, this Install Class is for you."),
+  - Expert: If you are fluent with GNU/Linux and want to perform
+a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
  __("Panoramix will attempt at first to look for one or more PCI
@@ -43,56 +44,99 @@ If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
-\"Yes\". You will then be asked which driver to try.
+\"Yes\". A list of drivers will then pop up, from which you will
+have to select one.
 
-In this case, you will be prompted on options to pass to the dri-
-ver (namely, I/O port and IRQ). Don't forget the information you
-could get from Windows, as suggested by the installation guide!"),
+After you have selected the driver, Panoramix will ask if you
+want to specify options for it. First, try and let the driver
+probe for the hardware: it usually works fine.
+
+If not, do not forget the information on your hardware that you
+could get from Windows (if you have it on your system), as
+suggested by the installation guide. These are the options
+you will need to provide to the driver."),
 
 partitionDisks =>
  __("At this point, hard drive partitions must be defined. (Unless you
 are overwriting a previous install of Linux and have already defined
-your hard drives partitions as desired.) This operation consists of
+your hard drive partitions as desired.) This operation consists of
 logically dividing the computer's hard drive capacity into separate
-areas for use. Two common partition are: \"root\" which is the point at
-which the filesystem's directory structure starts, and \"boot\", which
-contains those files necessary to start the operating system when the
-computer is first turned on. Because the effects of this process are
-usually irreversible, partitioning can be intimidating and stressful to
-the inexperienced. DiskDrake simplifies the process so that it need not
-be. Consult the documentation and take your time before proceeding."),
+areas for use.
+
+
+Two common partition are: the root partition (/), which is the starting
+point of the filesystem's directory hierarchy, and /boot, which contains
+all files necessary to start the operating system when the
+computer is first turned on.
+
+
+Because the effects of this process are usually irreversible, partitioning
+can be intimidating and stressful to the unexperienced. DiskDrake
+simplifies the process so that it need not be. Consult the documentation
+and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
-use. At this time, you may wish to re-format some pre-existing
-partitions to erase the data they contain. Note: it is not necessary to
-re-format pre-existing partitions, particularly if they contain files or
-data you wish to keep. Typically retained are: /home and /usr/local."),
+use (formatting meaning creating a filesystem). At this time, you may
+wish to re-format some already existing partitions to erase the data
+they contain. Note: it is not necessary to re-format pre-existing
+partitions, particularly if they contain files or data you wish to keep.
+Typically retained are /home and /usr/local."),
 
 choosePackages =>
  __("You may now select the packages you wish to install.
 
 
-Please note that some packages require the installation of others. These
-are referred to as package dependencies. The packages you select, and
-the packages they require will automatically be added to the
-installation configuration. It is impossible to install a package
-without installing all of its dependencies.
+Please note that some packages require the installation of others.
+These are referred to as package dependencies. The packages you select,
+and the packages they require will be automatically selected for
+install. It is impossible to install a package without installing all
+of its dependencies.
 
 
 Information on each category and specific package is available in the
-area titled \"Info\". This is located above the buttons: [confirmation]
-[selection] [unselection]."),
+area titled \"Info\",  located between list of packages and the five
+buttons \"Go\", \"Select more/less\" and \"Show more/less\"."),
 
 doInstallStep =>
  __("The packages selected are now being installed. This operation
 should only take a few minutes."),
 
 configureMouse =>
- __("Help"),
+ __("If Panoramix failed to find your mouse, or if you want to
+check what it has done, you will be presented the list of mice
+above.
+
+
+If you agree with Panoramix' settings, just jump to the section
+you want by clicking on it in the menu on the left. Otherwise,
+choose a mouse type in the menu which you think is the closest
+match for your mouse.
+
+In case of a serial mouse, you will also have to tell Panoramix
+which serial port it is connected to."),
 
 configureNetwork =>
- __("Help"),
+ __("This section is dedicated to configuring a local area network,
+or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+Ethernet adapter on your machine. PCI adapters should be found and
+initialized automatically. However, if your peripheral is ISA,
+autodetection will not work, and you will have to choose a driver
+from the list that will appear then.
+
+
+As for SCSI adapters, you can let the driver probe for the adapter
+in the first time, otherwise you will have to specify the options
+to the driver that you will have fetched from Windows' control
+panel.
+
+
+If you install a Linux-Mandrake system on a machine which is part
+of an already existing network, the network administrator will
+have given you all necessary information (IP address, network
+submask or netmask for short, and hostname). If you're setting
+up a private network at home for example, you should choose
+addresses "),
 
 configureTimezone =>
  __("Help"),
@@ -101,42 +145,75 @@ configureServices =>
  __("Help"),
 
 configurePrinter =>
- __("Help"),
+ __("Linux can deal with many types of printer. Each of these
+types require a different setup.
+
+
+If your printer is directly connected to your computer, select
+\"Local printer\". You will then have to tell which port your
+printer is connected to, and select the appropriate filter.
+
+
+If you want to access a printer located on a remote Unix machine,
+you will have to select \"Remote lpd queue\". In order to make
+it work, no username or password is required, but you will need
+to know the name of the printing queue on this server.
+
+
+If you want to access a SMB printer (which means, a printer located
+on a remote Windows 9x/NT machine), you will have to specify its
+SMB name (which is not its TCP/IP name), and possibly its IP address,
+plus the username, workgroup and password required in order to
+access the printer, and of course the name of the printer.
+
+
+The same goes for a NetWare printer, except that you need no
+workgroup information. As for SMB printers, keep in mind that
+the Netware name (which is the one you have to enter) is not
+the name as its TCP/IP name, therefore you may also want to
+enter the IP address of the print server as well."),
 
 setRootPassword =>
- __("An administrator password for your Linux system must now be
-assigned. The password must be entered twice to verify that both
+ __("You must now enter the root password for your Linux-Mandrake
+system. The password must be entered twice to verify that both
 password entries are identical.
 
 
-Choose this password carefully. Only persons with access to an
-administrator account can maintain and administer the system.
-Alternatively, unauthorized use of an administrator account can be
-extremely dangerous to the integrity of the system, the data upon it,
-and other systems with which it is interfaced. The password should be a
+Root is the administrator of the system, and is the only user
+allowed to modify the system configuration. Therefore, choose
+this password carefully! Unauthorized use of the root account can
+be extremely dangerous to the integrity of the system and its data,
+and other systems connected to it. The password should be a
 mixture of alphanumeric characters and a least 8 characters long. It
-should never be written down. Do not make the password too long or
-complicated that it will be difficult to remember.
+should *never* be written down. Do not make the password too long or
+complicated, though: you must be able to remember without too much
+effort."),
 
+addUser =>
+ __("You may now create one or more \"regular\" user account(s), as
+opposed to the \"priviledged\" user account, root. You can create
+one or more account(s) for each person you want to allow to use
+the computer. Note that each user account will have its own
+preferences (graphical environment, program settings, etc.)
+and its own \"home directory\", in which these preferences are
+stored.
 
-When you login as Administrator, at \"login\" type \"root\" and at
-\"password\", type the password that was created here."),
 
-addUser =>
- __("You can now authorize one or more people to use your Linux
-system. Each user account will have their own customizable environment.
+First of all, create an account for yourself! Even if you will be
+the only user of the machine, you may NOT connect as root for daily
+use of the system: it's a very high security risk. Making the
+system unusable is very often a typo away.
 
 
-It is very important that you create a regular user account, even if
-there will only be one principle user of the system. The administrative
-\"root\" account should not be used for day to day operation of the
-computer.  It is a security risk.  The use of a regular user account
-protects you and the system from yourself. The root account should only
-be used for administrative and maintenance tasks that can not be
-accomplished from a regular user account."),
+Therefore, you should connect to the system using the user account
+you will have created here, and login as root only for administration
+and maintenance purposes."),
 
 createBootdisk =>
- __("Help"),
+ __("Please, please, answer \"Yes\" here! Just for example, when you
+reinstall Windows, it will overwrite the boot sector. Unless you have
+made the bootdisk as suggested, you won't be able to boot into Linux
+any more!"),
 
 setupBootloader =>
  __("You need to indicate where you wish
@@ -144,13 +221,20 @@ to place the information required to boot to Linux.
 
 
 Unless you know exactly what you are doing, choose \"First sector of
-drive\"."),
+drive (MBR)\"."),
 
 configureX =>
- __("It is now time to configure the video card and monitor
-configuration for the X Window Graphic User Interface (GUI). First
-select your monitor. Next, you may test the configuration and change
-your selections if necessary."),
+ __("Now it's time to configure the X Window System, which is the
+core of the Linux GUI (Graphical User Interface). For this purpose,
+you must configure your video card and monitor. Most of these
+steps are automated, though, therefore your work may only consist
+of verifying what has been done and accept the settings :)
+
+When the configuration is over, X will be started (unless you
+ask Panoramix not to) so that you can check and see if the
+settings suit you. If they don't, you can come back and
+change them, as many times as necessary."),
+
 exitInstall =>
  __("Help"),
 );
@@ -161,7 +245,7 @@ selectLanguage =>
  __("Choose preferred language for install and system usage."),
 
 selectKeyboard =>
- __("Choose on the list of keyboards, the one corresponding to yours"),
+ __("Choose the layout corresponding to your keyboard from the list above"),
 
 selectPath =>
  __("Choose \"Installation\" if there are no previous versions of Linux
@@ -174,8 +258,9 @@ Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
 selectInstallClass =>
  __("Select:
 
-  - Beginner: If you have not installed Linux before, or wish to install
-the distribution elected \"Product of the year\" for 1999, click here.
+  - Beginner: If you have never installed Linux before, and wish to
+install the distribution elected \"Product of the year\" for 1999,
+click here.
 
   - Developer: If you are familiar with Linux and will be using the
 computer primarily for software development, you will find happiness
@@ -185,11 +270,11 @@ here.
 Linux distribution elected \"Distribution/Server\" for 1999, select
 this.
 
-  - Expert: If you know GNU/Linux and want to perform a highly
-customized installation, this Install Class is for you."),
+  - Expert: If you are fluent with GNU/Linux and want to perform
+a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
-__("Panoramix will attempt at first to look for one or more PCI
+ __("Panoramix will attempt at first to look for one or more PCI
 SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
 to use, it will insert it (them)  automatically.
 
@@ -197,57 +282,99 @@ If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
-\"Yes\". You will then be asked which driver to try.
+\"Yes\". A list of drivers will then pop up, from which you will
+have to select one.
 
-In this case, you will be prompted on options to pass to the dri-
-ver (namely, I/O port and IRQ). Don't forget the information you
-could get from Windows, as suggested by the installation guide!"),
+After you have selected the driver, Panoramix will ask if you
+want to specify options for it. First, try and let the driver
+probe for the hardware: it usually works fine.
 
+If not, do not forget the information on your hardware that you
+could get from Windows (if you have it on your system), as
+suggested by the installation guide. These are the options
+you will need to provide to the driver."),
 
 partitionDisks =>
  __("At this point, hard drive partitions must be defined. (Unless you
 are overwriting a previous install of Linux and have already defined
-your hard drives partitions as desired.) This operation consists of
+your hard drive partitions as desired.) This operation consists of
 logically dividing the computer's hard drive capacity into separate
-areas for use. Two common partition are: \"root\" which is the point at
-which the filesystem's directory structure starts, and \"boot\", which
-contains those files necessary to start the operating system when the
-computer is first turned on. Because the effects of this process are
-usually irreversible, partitioning can be intimidating and stressful to
-the inexperienced. DiskDrake simplifies the process so that it need not
-be. Consult the documentation and take your time before proceeding."),
+areas for use.
+
+
+Two common partition are: the root partition (/), which is the starting
+point of the filesystem's directory hierarchy, and /boot, which contains
+all files necessary to start the operating system when the
+computer is first turned on.
+
+
+Because the effects of this process are usually irreversible, partitioning
+can be intimidating and stressful to the unexperienced. DiskDrake
+simplifies the process so that it need not be. Consult the documentation
+and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
-use. At this time, you may wish to re-format some pre-existing
-partitions to erase the data they contain. Note: it is not necessary to
-re-format pre-existing partitions, particularly if they contain files or
-data you wish to keep. Typically retained are: /home and /usr/local."),
+use (formatting meaning creating a filesystem). At this time, you may
+wish to re-format some already existing partitions to erase the data
+they contain. Note: it is not necessary to re-format pre-existing
+partitions, particularly if they contain files or data you wish to keep.
+Typically retained are /home and /usr/local."),
 
 choosePackages =>
  __("You may now select the packages you wish to install.
 
 
-Please note that some packages require the installation of others. These
-are referred to as package dependencies. The packages you select, and
-the packages they require will automatically be added to the
-installation configuration. It is impossible to install a package
-without installing all of its dependencies.
+Please note that some packages require the installation of others.
+These are referred to as package dependencies. The packages you select,
+and the packages they require will be automatically selected for
+install. It is impossible to install a package without installing all
+of its dependencies.
 
 
 Information on each category and specific package is available in the
-area titled \"Info\". This is located above the buttons: [confirmation]
-[selection] [unselection]."),
+area titled \"Info\",  located between list of packages and the five
+buttons \"Go\", \"Select more/less\" and \"Show more/less\"."),
 
 doInstallStep =>
  __("The packages selected are now being installed. This operation
 should only take a few minutes."),
 
 configureMouse =>
- __("Help"),
+ __("If Panoramix failed to find your mouse, or if you want to
+check what it has done, you will be presented the list of mice
+above.
+
+
+If you agree with Panoramix' settings, just jump to the section
+you want by clicking on it in the menu on the left. Otherwise,
+choose a mouse type in the menu which you think is the closest
+match for your mouse.
+
+In case of a serial mouse, you will also have to tell Panoramix
+which serial port it is connected to."),
 
 configureNetwork =>
- __("Help"),
+ __("This section is dedicated to configuring a local area network,
+or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+Ethernet adapter on your machine. PCI adapters should be found and
+initialized automatically. However, if your peripheral is ISA,
+autodetection will not work, and you will have to choose a driver
+from the list that will appear then.
+
+
+As for SCSI adapters, you can let the driver probe for the adapter
+in the first time, otherwise you will have to specify the options
+to the driver that you will have fetched from Windows' control
+panel.
+
+
+If you install a Linux-Mandrake system on a machine which is part
+of an already existing network, the network administrator will
+have given you all necessary information (IP address, network
+submask or netmask for short, and hostname). If you're setting
+up a private network at home for example, you should choose
+addresses "),
 
 configureTimezone =>
  __("Help"),
@@ -256,42 +383,75 @@ configureServices =>
  __("Help"),
 
 configurePrinter =>
- __("Help"),
+ __("Linux can deal with many types of printer. Each of these
+types require a different setup.
+
+
+If your printer is directly connected to your computer, select
+\"Local printer\". You will then have to tell which port your
+printer is connected to, and select the appropriate filter.
+
+
+If you want to access a printer located on a remote Unix machine,
+you will have to select \"Remote lpd queue\". In order to make
+it work, no username or password is required, but you will need
+to know the name of the printing queue on this server.
+
+
+If you want to access a SMB printer (which means, a printer located
+on a remote Windows 9x/NT machine), you will have to specify its
+SMB name (which is not its TCP/IP name), and possibly its IP address,
+plus the username, workgroup and password required in order to
+access the printer, and of course the name of the printer.
+
+
+The same goes for a NetWare printer, except that you need no
+workgroup information. As for SMB printers, keep in mind that
+the Netware name (which is the one you have to enter) is not
+the name as its TCP/IP name, therefore you may also want to
+enter the IP address of the print server as well."),
 
 setRootPassword =>
- __("An administrator password for your Linux system must now be
-assigned. The password must be entered twice to verify that both
+ __("You must now enter the root password for your Linux-Mandrake
+system. The password must be entered twice to verify that both
 password entries are identical.
 
 
-Choose this password carefully. Only persons with access to an
-administrator account can maintain and administer the system.
-Alternatively, unauthorized use of an administrator account can be
-extremely dangerous to the integrity of the system, the data upon it,
-and other systems with which it is interfaced. The password should be a
+Root is the administrator of the system, and is the only user
+allowed to modify the system configuration. Therefore, choose
+this password carefully! Unauthorized use of the root account can
+be extremely dangerous to the integrity of the system and its data,
+and other systems connected to it. The password should be a
 mixture of alphanumeric characters and a least 8 characters long. It
-should never be written down. Do not make the password too long or
-complicated that it will be difficult to remember.
+should *never* be written down. Do not make the password too long or
+complicated, though: you must be able to remember without too much
+effort."),
 
+addUser =>
+ __("You may now create one or more \"regular\" user account(s), as
+opposed to the \"priviledged\" user account, root. You can create
+one or more account(s) for each person you want to allow to use
+the computer. Note that each user account will have its own
+preferences (graphical environment, program settings, etc.)
+and its own \"home directory\", in which these preferences are
+stored.
 
-When you login as Administrator, at \"login\" type \"root\" and at
-\"password\", type the password that was created here."),
 
-addUser =>
- __("You can now authorize one or more people to use your Linux
-system. Each user account will have their own customizable environment.
+First of all, create an account for yourself! Even if you will be
+the only user of the machine, you may NOT connect as root for daily
+use of the system: it's a very high security risk. Making the
+system unusable is very often a typo away.
 
 
-It is very important that you create a regular user account, even if
-there will only be one principle user of the system. The administrative
-\"root\" account should not be used for day to day operation of the
-computer.  It is a security risk.  The use of a regular user account
-protects you and the system from yourself. The root account should only
-be used for administrative and maintenance tasks that can not be
-accomplished from a regular user account."),
+Therefore, you should connect to the system using the user account
+you will have created here, and login as root only for administration
+and maintenance purposes."),
 
 createBootdisk =>
- __("Help"),
+ __("Please, please, answer \"Yes\" here! Just for example, when you
+reinstall Windows, it will overwrite the boot sector. Unless you have
+made the bootdisk as suggested, you won't be able to boot into Linux
+any more!"),
 
 setupBootloader =>
  __("You need to indicate where you wish
@@ -299,13 +459,20 @@ to place the information required to boot to Linux.
 
 
 Unless you know exactly what you are doing, choose \"First sector of
-drive\"."),
+drive (MBR)\"."),
 
 configureX =>
- __("It is now time to configure the video card and monitor
-configuration for the X Window Graphic User Interface (GUI). First
-select your monitor. Next, you may test the configuration and change
-your selections if necessary."),
+ __("Now it's time to configure the X Window System, which is the
+core of the Linux GUI (Graphical User Interface). For this purpose,
+you must configure your video card and monitor. Most of these
+steps are automated, though, therefore your work may only consist
+of verifying what has been done and accept the settings :)
+
+When the configuration is over, X will be started (unless you
+ask Panoramix not to) so that you can check and see if the
+settings suit you. If they don't, you can come back and
+change them, as many times as necessary."),
+
 exitInstall =>
  __("Help"),
 );