per Pablo's request:

- create a mini header in the generated help-*.pot files
- guilabel, guibutton and guimenu now uses %s to separate more cleanly what
comes is doc and what is gui text
!! the new generated help.pm has a different interface, non-backward compliant !!

7 files changed, 4443 insertions, 4465 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index bb3e94eb3..1f12244b4 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -5,56 +5,51 @@ use common;
 #            from the manuals !!! 
 #            Write a mail to <documentation@mandrakesoft.com> if
 #            you want it changed.
-
-our %steps = (
-
-acceptLicense => 
-N_("Before continuing, you should carefully read the terms of the license. It
+sub acceptLicense {
+    N("Before continuing, you should carefully read the terms of the license. It
 covers the entire Mandrake Linux distribution. If you do agree with all the
-terms in it, check the \"Accept\" box. If not, simply turn off your
-computer."),
-
-addUser => 
-N_("GNU/Linux is a multi-user system, meaning each user can have their own
+terms in it, check the \"%s\" box. If not, simply turn off your computer.", N("Accept"));
+}
+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\", which is the
+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
-configuration, protecting the system from unintentional or malicious
-changes that impact 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 mistake
-could mean that your system would 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.
+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.
 
 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 and copy it to the \"User name\" field, which is the name this
-user will enter to log onto the system. If you like, you may override the
-default and change the username. 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.
-
-Once you click on \"Accept user\", you can add other users. Add a user for
-each one of your friends: your father or your sister, for example. Click
-\"Next ->\" when you have finished adding users.
-
-Clicking the \"Advanced\" button allows you to change the default \"shell\"
-for that user (bash by default).
-
-When you are finished adding all users, you will be asked to choose a user
+you typed in this field and copy it to the \"%s\" field, which is the name
+this user will enter to log onto the system. If you like, you may override
+the default and change the username. 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.
+
+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.
+
+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
 that 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 \"Next
-->\". If you are not interested in this feature, uncheck the \"Do you want
-to use this feature?\" box."),
-
-ask_mntpoint_s => 
-N_("Here are Listed the existing Linux partitions detected on your hard drive.
+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?"));
+}
+sub ask_mntpoint_s {
+    N("Listed here are the existing Linux partitions detected on your hard drive.
 You can keep the choices made by the wizard, since they are good for most
 common installations. If you make any changes, you must at least define a
 root partition (\"/\"). Do not choose too small a partition or you will not
@@ -82,15 +77,15 @@ hard drives:
  * \"d\" means \"slave hard drive on the secondary IDE controller\".
 
 With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
-\"second lowest SCSI ID\", etc."),
-
-chooseCd => 
-N_("The Mandrake Linux installation is distributed on several CD-ROMs. DrakX
+\"second lowest SCSI ID\", etc.");
+}
+sub chooseCd {
+    N("The Mandrake Linux installation is distributed on several CD-ROMs. DrakX
 knows if a selected package is located on another CD-ROM so it will eject
-the current CD and ask you to insert the correct CD as required."),
-
-choosePackages => 
-N_("It is now time to specify which programs you wish to install on your
+the current CD and ask you to insert the correct CD as required.");
+}
+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 Mandrake Linux, and
 to make it simpler to manage the packages have been placed into groups of
 similar applications.
@@ -98,51 +93,49 @@ similar applications.
 Packages are sorted into groups corresponding to a particular use of your
 machine. Mandrake Linux has four predefined installations available. You
 can think of these installation classes as containers for various packages.
-You can mix and match applications from the various containers, so a
+You can mix and match applications from the various groups, so a
 ``Workstation'' installation can still have applications from the
-``Development'' container installed.
+``Development'' group installed.
 
- * \"Workstation\": if you plan to use your machine as a workstation,
-select one or more of the applications that are in the workstation
-container.
+ * \"%s\": if you plan to use your machine as a workstation, select one or
+more of the applications that are in the workstation group.
 
- * \"Development\": if plan on using your machine for programming, choose
-the appropriate packages from the container.
+ * \"%s\": if plan on using your machine for programming, choose the
+appropriate packages from that group.
 
- * \"Server\": if your machine is intended to be a server, select which of
-the more common services you wish to install on your machine.
+ * \"%s\": if your machine is intended to be a server, select which of the
+more common services you wish to install on your machine.
 
- * \"Graphical Environment\": this is where you will choose your preferred
-graphical environment. At least one must be selected if you want to have a
-graphical interface available.
+ * \"%s\": this is where you will choose your preferred graphical
+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:
 
- * \"With X\": install the minimum number of packages possible to have a
+ * \"%s\": install the minimum number of packages possible to have a
 working graphical desktop.
 
- * \"With basic documentation\": installs the base system plus basic
-utilities and their documentation. This installation is suitable for
-setting up a server.
+ * \"%s\": installs the base system plus basic utilities and their
+documentation. This installation is suitable for setting up a server.
 
- * \"Truly minimal install\": 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 65 megabytes.
+ * \"%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 \"Individual package selection\" 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.
+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 \"Upgrade\" mode, you can unselect all
-groups to avoid installing any new package. This is useful for repairing or
-updating an existing system."),
-
-choosePackagesTree => 
-N_("If you told the installer that you wanted to individually select packages,
+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"));
+}
+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.
@@ -156,17 +149,17 @@ you will be asked to confirm that you really want those servers to be
 installed. By default Mandrake Linux 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
-security holes are discovered after this version of Mandrake Linux was
+security holes were discovered after this version of Mandrake Linux was
 finalized. If you do not know what a particular service is supposed to do
-or why it is being installed, then click \"No\". Clicking \"Yes \" will
+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. !!
 
-The \"Automatic dependencies\" 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
-other such that installation of a package requires that some other program
-is already installed. The installer can determine which packages are
+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 other such
+that installation of a package requires that some other program is also
+rerquired to be installed. 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
@@ -174,15 +167,15 @@ 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."),
-
-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 \"Next
-->\". Mandrake Linux will attempt to autodetect network devices and modems.
-If this detection fails, uncheck the \"Use auto detection\" box. You may
-also choose not to configure the network, or to do it later, in which case
-clicking the \"Cancel\" button will take you to the next step.
+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\".
+Mandrake Linux will attempt to autodetect 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:
 traditional modem, ISDN modem, ADSL connection, cable modem, and finally a
@@ -194,21 +187,21 @@ from your Internet Service Provider or system administrator.
 
 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."),
-
-configurePrinter => 
-N_("\"Printer\": clicking on the \"Configure\" 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."),
-
-configureServices => 
-N_("This dialog is used to choose which services you wish to start at boot
+installed and use the program described there to configure your connection.", N("Next ->"), N("Use auto detection"), N("Cancel"));
+}
+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"));
+}
+sub configureServices {
+    N("This dialog is used to choose 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 always needed at
-boot time.
+Review each one carefully and uncheck those which are not 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,
@@ -218,64 +211,64 @@ it is safer to leave the default behavior.
 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.
-!!"),
-
-configureTimezoneGMT => 
-N_("GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to
+!!");
+}
+sub configureTimezoneGMT {
+    N("GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to
 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
-\"Hardware clock set to GMT \", which will let GNU/Linux know that the
-system clock and the hardware clock are in the same timezone. This is
-useful when the machine also hosts another operating system like Windows.
-
-The \"Automatic time synchronization \" option will automatically regulate
-the clock by connecting to a remote time server on the Internet. 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 used by other machines on your local network."),
-
-configureX_card_list => 
-N_("Graphic Card
-
-   The installer can normally automatically detect and configure the
+\"%s\", which will let GNU/Linux know that the system clock and the
+hardware clock are in the same timezone. This is useful when the machine
+also hosts another operating system like Windows.
+
+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 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
-choose in this list the card you actually own.
+choose from this list the card you actually have installed.
 
    In the case that different servers are available for your card, with or
-without 3D acceleration, you are then proposed to choose the server that
-best suits your needs."),
-
-configureX_chooser => 
-N_("X (for X Window System) is the heart of the GNU/Linux graphical interface
+without 3D acceleration, you are then asked to choose the server that best
+suits your needs.");
+}
+sub configureX_chooser {
+    N("X (for X Window System) is the heart of the GNU/Linux graphical interface
 on which all the graphical environments (KDE, GNOME, AfterStep,
 WindowMaker, etc.) bundled with Mandrake Linux rely upon.
 
-You will be presented the list of different parameters to change to get an
-optimal graphical display: Graphic Card
+You will be presented with a list of different parameters to change to get
+an optimal graphical display: Graphic Card
 
-   The installer can normally automatically detect and configure the
+   The installer will normally automatically detect and configure the
 graphic card installed on your machine. If it is not the case, you can
-choose in this list the card you actually own.
+choose from this list the card you actually have installed.
 
    In the case that different servers are available for your card, with or
-without 3D acceleration, you are then proposed to choose the server that
-best suits your needs.
+without 3D acceleration, you are then asked to choose the server that best
+suits your needs.
 
 
 
 Monitor
 
-   The installer can normally automatically detect and configure the
-monitor connected to your machine. If it is not the case, you can choose in
-this list the monitor you actually own.
+   The installer will normally automatically detect and configure the
+monitor connected to your machine. If it is correct, you can choose from
+this list the monitor you actually have connected to your computer.
 
 
 
 Resolution
 
-   You can choose here resolutions and color depth between those available
-for your hardware. Choose the one that best suit your needs (you will be
-able to change that after installation though). A sample of the chosen
+   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
 configuration is shown in the monitor.
 
 
@@ -283,7 +276,7 @@ configuration is shown in the monitor.
 Test
 
    the system will try to open a graphical screen at the desired
-resolution. If you can see the message during the test and answer \"Yes\",
+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
 means that some part of the autodetected configuration was incorrect and
 the test will automatically end after 12 seconds, bringing you back to the
@@ -293,40 +286,41 @@ menu. Change settings until you get a correct graphical display.
 
 Options
 
-   You can here choose whether you want to have your machine automatically
+   Here you can choose whether you want to have your machine automatically
 switch to a graphical interface at boot. Obviously, you want to check
-\"No\" if your machine is to act as a server, or if you were not successful
-in getting the display configured."),
-
-configureX_monitor => 
-N_("Monitor
-
-   The installer can normally automatically detect and configure the
-monitor connected to your machine. If it is not the case, you can choose in
-this list the monitor you actually own."),
-
-configureX_resolution => 
-N_("Resolution
-
-   You can choose here resolutions and color depth between those available
-for your hardware. Choose the one that best suit your needs (you will be
-able to change that after installation though). A sample of the chosen
-configuration is shown in the monitor."),
-
-configureX_xfree_and_glx => 
-N_("In the case that different servers are available for your card, with or
-without 3D acceleration, you are then proposed to choose the server that
-best suits your needs."),
-
-configureXxdm => 
-N_("Finally, you will be asked whether you want to see the graphical interface
-at boot. Note this question will be asked even if you chose not to test the
-configuration. Obviously, you want to answer \"No\" if your machine is to
-act as a server, or if you were not successful in getting the display
-configured."),
-
-doPartitionDisks => 
-N_("At this point, you need to decide where you want to install the Mandrake
+\"%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 correct, you can choose from
+this list the monitor you actually have 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
+configuration is shown in the monitor.");
+}
+sub configureX_xfree_and_glx {
+    N("In the case that different servers are available for your card, with or
+without 3D acceleration, you are then asked to choose the server that 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"));
+}
+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
@@ -342,86 +336,83 @@ rest of this section and above all, take your time.
 
 Depending on your hard drive configuration, several options are available:
 
- * \"Use free space\": this option will perform an automatic partitioning
-of your blank drive(s). If you use this option there will be no further
-prompts.
-
- * \"Use existing partition\": the wizard has detected one or more existing
-Linux partitions on your hard drive. If you want to use them, choose this
-option. 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.
-
- * \"Use the free space on the Windows partition\": if Microsoft Windows is
-installed on your hard drive and takes all the space available on it, you
-have to create free space for Linux data. To do so, you can delete your
-Microsoft Windows partition and data (see ``Erase entire disk'' solution)
-or resize your Microsoft Windows FAT partition. Resizing can be performed
-without the loss of any data, provided you previously defragment the
-Windows partition and that it uses the FAT format. Backing up your data is
-strongly recommended.. Using this option is recommended if you want to use
-both Mandrake Linux and Microsoft Windows on the same computer.
+ * \"%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
+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
+all the space available on it, you will have to create free space for
+Linux. To do so, you can delete your Microsoft Windows partition and data
+(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT
+partition. Resizing can be performed without the loss of any data, provided
+you have previously defragmented the Windows partition and that it uses the
+FAT format. Backing up your data is strongly recommended.. Using this
+option is recommended if you want to use both Mandrake Linux 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.
 
- * \"Erase entire disk\": if you want to delete all data and all partitions
-present on your hard drive and replace them with your new Mandrake Linux
-system, choose this option. Be careful, 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 Mandrake Linux system,
+choose this option. Be careful, because you will not be able to undo your
+choice after you confirm.
 
    !! If you choose this option, all data on your disk will be deleted. !!
 
- * \"Remove Windows\": this will simply erase everything on the drive and
-begin fresh, partitioning everything from scratch. All data on your disk
-will be lost.
+ * \"%s\": this will simply erase everything on the drive and begin fresh,
+partitioning everything from scratch. All data on your disk will be lost.
 
    !! If you choose this option, all data on your disk will be lost. !!
 
- * \"Custom disk partitioning\": 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 experience. For more instructions on how to use the DiskDrake
-utility, refer to the ``Managing Your Partitions '' section in the
-``Starter Guide''."),
-
-exitInstall => 
-N_("There you are. Installation is now complete and your GNU/Linux system is
-ready to use. Just click \"Next ->\" to reboot the system. 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.
-
-The \"Advanced\" button shows two more buttons to:
-
- * \"generate auto-install floppy\": 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\": 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
+experience. For more instructions on how to use the DiskDrake utility,
+refer to the ``Managing Your Partitions '' section in the ``Starter
+Guide''.", N("Use free space"), N("Use existing partition"), N("Use the free space on the Windows partition"), N("Erase entire disk"), N("Remove Windows"), N("Custom disk partitioning"));
+}
+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. 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.
+
+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.
 
    Note that two different options are available after clicking the button:
 
-    * \"Replay\". This is a partially automated installation. The
-partitioning step is the only interactive procedure.
+    * \"%s\". This is a partially automated installation. The partitioning
+step is the only interactive procedure.
 
-    * \"Automated\". Fully automated installation: the hard disk is
-completely rewritten, all data is lost.
+    * \"%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.
 
- * \"Save packages selection\"(*): saves a list of the package 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\" <<.
+ * \"%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\" <<.
 
 (*) You need a FAT-formatted floppy (to create one under GNU/Linux, type
-\"mformat a:\")"),
-
-formatPartitions => 
-N_("Any partitions that have been newly defined must be formatted for use
+\"mformat a:\")", 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
@@ -438,40 +429,40 @@ 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.
 
-Click on \"Next ->\" when you are ready to format partitions.
-
-Click on \"<- Previous\" if you want to choose another partition for your
-new Mandrake Linux operating system installation.
+Click on \"%s\" when you are ready to format partitions.
 
-Click on \"Advanced\" if you wish to select partitions that will be checked
-for bad blocks on the disk."),
+Click on \"%s\" if you want to choose another partition for your new
+Mandrake Linux operating system installation.
 
-installUpdates => 
-N_("At the time you are installing Mandrake Linux, it is likely that some
+Click on \"%s\" if you wish to select partitions that will be checked for
+bad blocks on the disk.", N("Next ->"), N("<- Previous"), N("Advanced"));
+}
+sub installUpdates {
+    N("At the time you are installing Mandrake Linux, it is likely that some
 packages 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 \"Yes\"
-if you have a working Internet connection, or \"No\" if you prefer to
+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 \"Yes\" will display a list of places from which updates can be
-retrieved. Choose the one nearest you. A package-selection tree will
-appear: review the selection, and press \"Install\" to retrieve and install
-the selected package(s), or \"Cancel\" to abort."),
-
-miscellaneous => 
-N_("At this point, DrakX will allow you to choose the security level desired
+Choosing \"%s\" will display a list of places from which updates can be
+retrieved. You should choose one nearer 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.
 
-If you do not know what to choose, keep the default option."),
-
-partition_with_diskdrake => 
-N_("At this point, you need to choose which partition(s) will be used for the
+If you do not know what to choose, stay with the default option.");
+}
+sub partition_with_diskdrake {
+    N("At this point, you need to choose which partition(s) will be used for the
 installation of your Mandrake Linux system. If partitions have already been
-defined, either from a previous installation of GNU/Linux or from another
+defined, either from a previous installation of GNU/Linux or by another
 partitioning tool, you can use existing partitions. Otherwise, hard drive
 partitions must be defined.
 
@@ -481,43 +472,40 @@ the disk for partitioning by clicking on ``hda'' for the first IDE drive,
 
 To partition the selected hard drive, you can use these options:
 
- * \"Clear all\": this option deletes all partitions on the selected hard
-drive
+ * \"%s\": this option deletes all partitions on the selected hard drive
 
- * \"Auto allocate\": this option enables you to automatically create ext3
-and swap partitions in free space of your hard drive
+ * \"%s\": this option enables you to automatically create ext3 and swap
+partitions in the free space of your hard drive
 
-\"More\": gives access to additional features:
+\"%s\": gives access to additional features:
 
- * \"Save partition table\": saves the partition table to a floppy. Useful
-for later partition-table recovery, if necessary. It is strongly
-recommended that you perform this step.
+ * \"%s\": saves the partition table to a floppy. Useful for later
+partition-table recovery if necessary. It is strongly recommended that you
+perform this step.
 
- * \"Restore partition table\": allows you to restore a previously saved
-partition table from a floppy disk.
+ * \"%s\": allows you to restore a previously saved partition table from a
+floppy disk.
 
- * \"Rescue partition table\": if your partition table is damaged, you can
-try to recover it using this option. Please be careful and remember that it
-doesn't always work.
+ * \"%s\": if your partition table is damaged, you can try to recover it
+using this option. Please be careful and remember that it doesn't always
+work.
 
- * \"Reload partition table\": discards all changes and reloads the
-partition table that was originally on the hard drive.
+ * \"%s\": discards all changes and reloads the partition table that was
+originally on the hard drive.
 
- * \"Removable media automounting\": unchecking this option will force
-users to manually mount and unmount removable medias such as floppies and
-CD-ROMs.
+ * \"%s\": unchecking this option will force users to manually mount and
+unmount removable media such as floppies and CD-ROMs.
 
- * \"Wizard\": use this option if you wish to use a wizard to partition
-your hard drive. This is recommended if you do not have a good
-understanding of partitioning.
+ * \"%s\": use this option if you wish to use a wizard to partition your
+hard drive. This is recommended if you do not have a good understanding of
+partitioning.
 
- * \"Undo\": use this option to cancel your changes.
+ * \"%s\": use this option to cancel your changes.
 
- * \"Toggle to normal/expert mode\": allows additional actions on
-partitions (type, options, format) and gives more information about the
-hard drive.
+ * \"%s\": allows additional actions on partitions (type, options, format)
+and gives more information about the hard drive.
 
- * \"Done\": when you are finished partitioning your hard drive, this will
+ * \"%s\": when you are finished partitioning your hard drive, this will
 save your changes back to disk.
 
 When defining the size of a partition, you can finely set the partition
@@ -541,11 +529,11 @@ If you are installing on a PPC machine, you will want to create a small HFS
 ``bootstrap'' partition of at least 1MB which will be used by the yaboot
 bootloader. If you opt to make the partition a bit larger, say 50MB, you
 may find it a useful place to store a spare kernel and ramdisk images for
-emergency boot situations."),
-
-resizeFATChoose => 
-N_("More than one Microsoft partition has been detected on your hard drive.
-Please choose the one you want to resize in order to install your new
+emergency boot situations.", N("Clear all"), N("Auto allocate"), N("More"), N("Save partition table"), N("Restore partition table"), N("Rescue partition table"), N("Reload partition table"), N("Removable media automounting"), N("Wizard"), N("Undo"), N("Toggle between normal/expert mode"), N("Done"));
+}
+sub resizeFATChoose {
+    N("More than one Microsoft partition has been detected on your hard drive.
+Please choose which one you want to resize in order to install your new
 Mandrake Linux operating system.
 
 Each partition is listed as follows: \"Linux name\", \"Windows name\"
@@ -572,81 +560,79 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.
 
 \"Windows name\" is the letter of your hard drive under Windows (the first
-disk or partition is called \"C:\")."),
-
-selectCountry => 
-N_("\"Country\": check the current country selection. If you are not in this
-country, click on the \"Configure\" button and choose another one. If your
-country is not in the first list shown, click the \"More\" button to get
-the complete country list."),
-
-selectInstallClass => 
-N_("This step is activated only if an old GNU/Linux partition has been found on
+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"), N("Configure"), N("More"));
+}
+sub selectInstallClass {
+    N("This step is activated only if an old 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 Mandrake Linux system:
 
- * \"Install\": 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. 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.
 
- * \"Upgrade\": this installation class allows you to update the packages
+ * \"%s\": this installation class allows you to update the packages
 currently installed on your Mandrake Linux system. Your current
 partitioning scheme and user data is not altered. Most of other
 configuration steps remain available, similar to a standard installation.
 
 Using the ``Upgrade'' option should work fine on Mandrake Linux systems
 running version \"8.1\" or later. Performing an Upgrade on versions prior
-to Mandrake Linux version \"8.1\" is not recommended."),
-
-selectKeyboard => 
-N_("Depending on the default language you chose in Section , DrakX will
+to Mandrake Linux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
+}
+sub selectKeyboard {
+    N("Depending on the default language you chose in Section , DrakX will
 automatically select a particular type of keyboard configuration. However,
-you might not have a keyboard that corresponds exactly to your language:
-for example, if you are an English speaking Swiss person, you may have a
-Swiss keyboard. Or if you speak English but are located in Quebec, you may
-find yourself in the same situation where your native language and keyboard
-do not match. In either case, this installation step will allow you to
-select an appropriate keyboard from a list.
-
-Click on the \"More \" button to be presented with the complete list of
+you may not have a keyboard that corresponds exactly to your language: for
+example, if you are an English speaking Swiss person, you may have a Swiss
+keyboard. Or if you speak English but are located in Quebec, you may find
+yourself in the same situation where your native language and keyboard do
+not 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.
 
 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
-keyboard between the Latin and non-Latin layouts."),
-
-selectLanguage => 
-N_("Your choice of preferred language will affect the language of 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.
 
-Clicking on the \"Advanced\" 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 \"Espanol\" in the Advanced
-section.
+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.
 
 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 \"All
-languages\" box. Selecting support for a language means translations,
-fonts, spell checkers, etc. for that language will be installed.
-Additionally, the \"Use Unicode by default\" checkbox allows to force the
-system to use unicode (UTF-8). Note however that this is an experimental
-feature. If you select different languages requiring different encoding the
-unicode support will be installed anyway.
+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 be installed. Additionally, the
+\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note
+however that this is an experimental feature. If you select different
+languages requiring different encoding the unicode support will be
+installed anyway.
 
 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."),
-
-selectMouse => 
-N_("Usually, DrakX has no problems detecting the number of buttons on your
+will only change the language settings for that particular user.", N("Advanced"), N("Espanol"), N("All languages"), N("Use Unicode by default"));
+}
+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
@@ -654,7 +640,7 @@ right mouse buttons. DrakX will automatically know whether your mouse uses
 a PS/2, serial or USB interface.
 
 If for some reason you wish to specify a different type of mouse, select it
-from the provided list.
+from the list provided.
 
 If you choose a mouse other than the default, a test screen will be
 displayed. Use the buttons and wheel to verify that the settings are
@@ -665,32 +651,33 @@ go back to the list of choices.
 Wheel mice are occasionally 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 \"Next ->\" 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."),
-
-selectSerialPort => 
-N_("Please select the correct port. For example, the \"COM1\" port under
-Windows is named \"ttyS0\" under GNU/Linux."),
-
-setRootPassword => 
-N_("This is the most crucial decision point for the security of your GNU/Linux
+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("Next ->"));
+}
+sub selectSerialPort {
+    N("Please select the correct port. For example, the \"COM1\" port under
+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
-administrator and is the only one authorized to make updates, add users,
+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 that you chose too easy. As you
 can see, you are not forced to enter a password, but we strongly advise you
-against. GNU/Linux is 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 partitions
-themselves, it is important that it be difficult to become \"root\".
+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
+partitions themselves, it is important that it be difficult to become
+\"root\".
 
 The password should be a mixture of alphanumeric characters and at least 8
-characters long. Never write down the \"root\" password -- it makes it too
-easy to compromise a system.
+characters long. Never write down the \"root\" password -- it makes it far
+too easy to compromise a system.
 
 One caveat -- do not make the password too long or complicated because you
 must be able to remember it!
@@ -698,65 +685,65 @@ 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 have to be used the first time you connect.
+``incorrect'' password will be the one you will have use the first time you
+connect.
 
 If you wish access to this computer to be controlled by an authentication
-server, click the \"Advanced\" button.
+server, click the \"%s\" button.
 
 If your network uses either LDAP, NIS, or PDC Windows Domain authentication
-services, select the appropriate one as \"authentication\". If you do not
-know which to use, ask your network administrator.
+services, select the appropriate one for \"%s\". If you do not know which
+one to use, you should ask your network administrator.
 
-If you happen to have problems with reminding passwords, you can choose to
-have \"No password\", if your computer won't be connected to the Internet,
-and if you trust anybody having access to it."),
+If you happen to have problems with remembering passwords, if your computer
+will never be connected to the internet or that 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:
 
-setupBootloader => 
-N_("This dialog allows to finely tune your bootloader:
+ * \"%s\": there are three choices for your bootloader:
 
- * \"Bootloader to use\": there are three choices for your bootloader:
+    * \"%s\": if you prefer grub (text menu).
 
-    * \"GRUB\": if you prefer grub (text menu).
+    * \"%s\": if you prefer LILO with its text menu interface.
 
-    * \"LILO with text menu\": if you prefer LILO with its text menu
-interface.
+    * \"%s\": if you prefer LILO with its graphical interface.
 
-    * \"LILO with graphical menu\": 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\");
 
- * \"Boot device\": in most cases, you will not change the default
-(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the
-second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");
-
- * \"Delay before booting the default image\": 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\": 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.
 
 !! Beware that if you choose not to install a bootloader (by selecting
-\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux
-system! Be sure you know what you do before changing any of the options. !!
-
-Clicking the \"Advanced\" button in this dialog will offer advanced options
-that are reserved for the expert user."),
-
-setupBootloaderAddEntry => 
-N_("After you have configured the general bootloader parameters, the list of
+\"%s\"), you must ensure that you have a way to boot your Mandrake Linux
+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("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 \"Add\" to create a new entry; selecting an entry and
-clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates
-your changes.
+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!"),
-
-setupBootloaderBeginner => 
-N_("LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally
+operating systems!", N("Add"), N("Modify"), N("Remove"), N("OK"));
+}
+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:
 
@@ -768,46 +755,41 @@ OS.
 one.
 
 If it cannot make a determination, DrakX will ask you where to place the
-bootloader.
-
-\"Boot device\": in most cases, you will not change the default (\"First
-sector of drive (MBR)\"), but if you prefer, the bootloader can be
-installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk
-(\"On Floppy\")."),
-
-setupDefaultSpooler => 
-N_("Now, it's time to select a printing system for your computer. Other OSs may
-offer you one, but Mandrake Linux offers two. Each of the printing systems
-is best for a particular type of configuration.
-
- * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice
+bootloader.");
+}
+sub setupDefaultSpooler {
+    N("Now, it's time to select a printing system for your computer. Other OSs may
+offer you one, but Mandrake Linux offers two. Each of the printing system
+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. (\"pdq
-\" 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.
+panic out of printer jams, and you do not 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.
 
- * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for
+ * \"%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 compatible with older operating systems
-that may still need print services. While quite powerful, the basic setup
+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 to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical
+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."),
-
-setupSCSI => 
-N_("DrakX will first detect any IDE devices present in your computer. It will
+Center and clicking the expert button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"));
+}
+sub setupSCSI {
+    N("DrakX will first detect any IDE devices present in your computer. It will
 also scan for one or more PCI SCSI cards on your system. If a SCSI card is
 found, DrakX will automatically install the appropriate driver.
 
 Because hardware detection is not foolproof, DrakX may fail in detecting
-your hard drives. If so, You'll have to specify your hardware by hand.
+your hard drives. If so, you'll have to specify your hardware by hand.
 
 If you had to manually specify your PCI SCSI adapter, DrakX will ask if you
 want to configure options for it. You should allow DrakX to probe the
@@ -817,10 +799,10 @@ issues.
 
 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."),
-
-setupYabootAddEntry => 
-N_("You can add additional entries in yaboot for other operating systems,
+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\"
@@ -831,8 +813,8 @@ 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 would be the name of the kernel to boot. Typically, vmlinux
-or a variation of vmlinux with an extension.
+ * 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.
 
@@ -864,10 +846,10 @@ 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."),
-
-setupYabootGeneral => 
-N_("Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to
+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. Be careful to choose the correct
@@ -886,8 +868,8 @@ yaboot. The first delay is measured in seconds and at this point, you can
 choose between CD, OF boot, MacOS or Linux;
 
  * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.
-After selecting Linux, you will have this delay in 0.1 second before your
-default kernel description is selected;
+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.
@@ -896,88 +878,87 @@ at the first boot prompt.
 Open Firmware at the first boot prompt.
 
  * Default OS: you can select which OS will boot by default when the Open
-Firmware Delay expires."),
-
-sound_config => 
-N_("\"Sound card\": 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."),
-
-summary => 
-N_("As a review, DrakX will present a summary of various 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 \"Configure\" button to change
-that.
-
- * \"Keyboard\": check the current keyboard map configuration and change
-that if necessary.
-
- * \"Country\": check the current country selection. If you are not in this
-country, click on the \"Configure\" button and choose another one. If your
-country is not in the first list shown, click the \"More\" button to get
-the complete country list.
-
- * \"Timezone\": By default, DrakX deduces your time zone based on the
-country you have chosen. You can click on the \"Configure\" button here if
-this is not correct.
-
- * \"Mouse\": check the current mouse configuration and click on the button
-to change it if necessary.
-
- * \"Printer\": clicking on the \"Configure\" button will open the printer
+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"));
+}
+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.
+
+ * \"%s\": check the current keyboard map configuration and change that 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
+country list.
+
+ * \"%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\": 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.
 
- * \"Sound card\": 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
+ * \"%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.
 
- * \"Graphical Interface\": by default, DrakX configures your graphical
-interface in \"800x600\" or \"1024x768\" resolution. If that does not suits
-you, click on \"Configure\" to reconfigure your graphical interface.
-
- * \"TV card\": 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 \"Configure\"
-to try to configure it manually.
-
- * \"ISDN card\": if an ISDN card is detected on your system, it will be
-displayed here. You can click on \"Configure\" to change the parameters
-associated with the card.
-
- * \"Network\": If you want to configure your Internet or local network
-access now.
-
- * \"Security Level\": this entry offers you to redefine the security level
-as set in a previous step ().
-
- * \"Firewall\": if you plan to connect your machine to the Internet, it's
-a good idea to protect you from intrusions by setting up a firewall.
-Consult the corresponding section of the ``Starter Guide'' for details
-about firewall settings.
-
- * \"Bootloader\": if you wish to change your bootloader configuration,
-click that button. This should be reserved to advanced users.
-
- * \"Services\": you'll be able here to control finely 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."),
-
-takeOverHdChoose => 
-N_("Choose the hard drive you want to erase in order to install your new
-Mandrake Linux partition. Be careful, all data present on it will be lost
-and will not be recoverable!"),
-
-takeOverHdConfirm => 
-N_("Click on \"Next ->\" if you want to delete all data and partitions present
-on this hard drive. Be careful, after clicking on \"Next ->\", you will not
-be able to recover any data and partitions present on this hard drive,
-including any Windows data.
-
-Click on \"<- Previous\" to stop this operation without losing any data and
-partitions present on this hard drive."),
-);
+ * \"%s\": by default, DrakX configures your graphical interface in
+\"800x600\" or \"1024x768\" resolution. If that does not 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 want to configure your Internet or local network access
+now.
+
+ * \"%s\": this entry allows you to redefine the security level as set in a
+previous step ().
+
+ * \"%s\": if you plan to connect your machine to the Internet, it's a good
+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\": here you'll be able to fine control 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"), 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"));
+}
+sub takeOverHdChoose {
+    N("Choose the hard drive you want to erase in order to install your new
+Mandrake Linux partition. Be careful, all data present on this partition
+will be lost and will not be recoverable!");
+}
+sub takeOverHdConfirm {
+    N("Click on \"%s\" if you want to delete all data and partitions present on
+this hard drive. Be careful, after clicking on \"%s\", you will not be able
+to recover any data and partitions present on this hard drive, including
+any Windows data.
+
+Click on \"%s\" to stop this operation without losing any data and
+partitions present on this hard drive.", N("Next ->"), N("Next ->"), N("<- Previous"));
+}
diff --git a/perl-install/share/po/help-de.pot b/perl-install/share/po/help-de.pot
index db8788e68..8c34af679 100644
--- a/perl-install/share/po/help-de.pot
+++ b/perl-install/share/po/help-de.pot
@@ -1,3 +1,6 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -18,51 +21,49 @@ msgid ""
 "\n"
 "Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Use free space\": this option will perform an automatic partitioning\n"
-"of your blank drive(s). If you use this option there will be no further\n"
-"prompts.\n"
-"\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated with\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and for the most part it's a good idea to keep them.\n"
-"\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see ``Erase entire disk'' solution)\n"
-"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
-"without the loss of any data, provided you previously defragment the\n"
-"Windows partition and that it uses the FAT format. Backing up your data is\n"
-"strongly recommended.. Using this option is recommended if you want to use\n"
-"both Mandrake Linux and Microsoft Windows on the same computer.\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
+"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
+"partition. Resizing can be performed without the loss of any data, provided\n"
+"you have previously defragmented the Windows partition and that it uses the\n"
+"FAT format. Backing up your data is strongly recommended.. Using this\n"
+"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
 "then when you started. You will have less free space under Microsoft\n"
 "Windows to store your data or to install new software.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful, because you will not be able to\n"
-"undo your choice after you confirm.\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"Custom disk partitioning\": choose this option if you want to manually\n"
-"partition your hard drive. Be careful -- it is a powerful but dangerous\n"
-"choice and you can very easily lose all your data. That's why this option\n"
-"is really only recommended if you have done something like this before and\n"
-"have some experience. For more instructions on how to use the DiskDrake\n"
-"utility, refer to the ``Managing Your Partitions '' section in the\n"
-"``Starter Guide''."
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
+"Guide''."
 msgstr ""
 "Sie mц╪ssen nun entscheiden, wo auf Ihrer/n Festplatte(n) Ihr Mandrake Linux\n"
 "System installiert werden soll. Sofern alles leer ist bzw. ein\n"
@@ -80,51 +81,48 @@ msgstr ""
 "Abhц╓ngig vom aktuellen Zustand Ihrer Platte(n) haben Sie verschiedene\n"
 "Alternativen:\n"
 "\n"
-" * Б─·Freien Platz verwendenБ─°: Dies fц╪hrt einfach dazu, dass Ihre leere(n)\n"
-"Festplatte(n) automatisch partitioniert werden; Sie mц╪ssen sich also um\n"
-"nichts weiter kц╪mmern.(*)\n"
-"\n"
-" * Б─·Verwende existierendeБ─°: Der Assistent hat eine oder mehrere\n"
-"existierende Linux Partitionen auf Ihrer Platte gefunden. Wц╓hlen Sie diese\n"
-"Schaltflц╓che, falls Sie sie behalten wollen. Sie werden dann gebeten, die\n"
-"Einhц╓ngpunkte der Partitionen anzugeben. Als Vorgabe erhalten Sie die\n"
-"Einhц╓ngpunkte der gefundenen Distribution, normalerweise ist es nicht nц╤tig\n"
-"diese zu ц╓ndern.\n"
-"\n"
-" * Б─·Freien Platz der Windows Partition verwendenБ─°: Falls der gesamte\n"
-"Plattenplatz aktuell fц╪r Microsoft Windows(TM) verschwendet ist, mц╪ssen Sie\n"
-"fц╪r GNU/Linux Platz schaffen. Um dies zu erreichen, kц╤nnen Sie entweder\n"
-"Ihre Microsoft Windows(TM) Partition(en) samt Daten lц╤schen (siehe\n"
-"Б─·Komplette Platte lц╤schenБ─°) oder Ihre Windows Partition verkleinern.\n"
-"Letzteres geht ohne Datenverlust. Sie sollten diese Variante wц╓hlen, falls\n"
-"Sie beide Betriebssysteme (Windows und Mandrake Linux) nebeneinander nutzen\n"
-"wollen.\n"
+" * Б─·%sБ─°: Dies fц╪hrt einfach dazu, dass Ihre leere(n) Festplatte(n)\n"
+"automatisch partitioniert werden; Sie mц╪ssen sich also um nichts weiter\n"
+"kц╪mmern.(*)\n"
+"\n"
+" * Б─·%sБ─°: Der Assistent hat eine oder mehrere existierende Linux Partitionen\n"
+"auf Ihrer Platte gefunden. Wц╓hlen Sie diese Schaltflц╓che, falls Sie sie\n"
+"behalten wollen. Sie werden dann gebeten, die Einhц╓ngpunkte der Partitionen\n"
+"anzugeben. Als Vorgabe erhalten Sie die Einhц╓ngpunkte der gefundenen\n"
+"Distribution, normalerweise ist es nicht nц╤tig diese zu ц╓ndern.\n"
+"\n"
+" * Б─·%sБ─°: Falls der gesamte Plattenplatz aktuell fц╪r Microsoft Windows(TM)\n"
+"verschwendet ist, mц╪ssen Sie fц╪r GNU/Linux Platz schaffen. Um dies zu\n"
+"erreichen, kц╤nnen Sie entweder Ihre Microsoft Windows(TM) Partition(en)\n"
+"samt Daten lц╤schen (siehe Б─·Komplette Platte lц╤schenБ─°) oder Ihre Windows\n"
+"Partition verkleinern. Letzteres geht ohne Datenverlust. Sie sollten diese\n"
+"Variante wц╓hlen, falls Sie beide Betriebssysteme (Windows und Mandrake\n"
+"Linux) nebeneinander nutzen wollen.\n"
 "\n"
 "   Bevor Sie sich fц╪r diese Variante entscheiden, sei hier noch einmal\n"
 "betont, dass das bedeutet, Sie haben weniger Platz fц╪r Windows als\n"
 "momentan.\n"
 "\n"
-" * Б─·Komplette Platte lц╤schenБ─°: Falls Sie alle Daten Ihrer Platte verlieren,\n"
-"und sie durch Ihr neues Mandrake Linux System ersetzen wollen, wц╓hlen Sie\n"
-"diese Schaltflц╓che. Beachten Sie, dass dieser Schritt nicht rц╪ckgц╓ngig\n"
-"gemacht werden kann.\n"
+" * Б─·%sБ─°: Falls Sie alle Daten Ihrer Platte verlieren, und sie durch Ihr\n"
+"neues Mandrake Linux System ersetzen wollen, wц╓hlen Sie diese Schaltflц╓che.\n"
+"Beachten Sie, dass dieser Schritt nicht rц╪ckgц╓ngig gemacht werden kann.\n"
 "\n"
 "   !! Wenn Sie diese Variante wц╓hlen, werden alle Ihre Daten auf der Platte\n"
 "gelц╤scht! !!\n"
 "\n"
-" * Б─·Windows(TM) lц╤schenБ─°: Bei dieser Variante werden alle Windows\n"
-"Partitionen gelц╤scht und die Platte(n) komplett neu partitioniert.\n"
+" * Б─·%sБ─°: Bei dieser Variante werden alle Windows Partitionen gelц╤scht und\n"
+"die Platte(n) komplett neu partitioniert.\n"
 "\n"
 "   !! Wenn Sie diese Variante wц╓hlen, werden alle Ihre Daten auf der Platte\n"
 "gelц╤scht! !!\n"
 "\n"
-" * Б─·Benutzerdefinierte PartitionierungБ─°: Wenn Sie Ihre Festplatte selber\n"
-"von Hand partitionieren wollen, dann kц╤nnen Sie diese Option wц╓hlen. Seien\n"
-"Sie bitte sehr sorgfц╓ltig, wenn Sie diese Lц╤sung wц╓hlen, da Sie zwar alle\n"
-"mц╤glichen Einstellungen vornehmen, aber gleichzeitig auch sehr leicht Daten\n"
-"verlieren kц╤nnen. Diese Option ist nur geeignet, wenn Sie wissen, was Sie\n"
-"tun. Um zu erfahren, wie Sie DiskDrake verwenden kц╤nnen, lesen Sie bitte\n"
-"das Kapitel Б─·Ihre Partitionen verwaltenБ─° im Б─·Starter HandbuchБ─°\n"
+" * Б─·%sБ─°: Wenn Sie Ihre Festplatte selber von Hand partitionieren wollen,\n"
+"dann kц╤nnen Sie diese Option wц╓hlen. Seien Sie bitte sehr sorgfц╓ltig, wenn\n"
+"Sie diese Lц╤sung wц╓hlen, da Sie zwar alle mц╤glichen Einstellungen\n"
+"vornehmen, aber gleichzeitig auch sehr leicht Daten verlieren kц╤nnen. Diese\n"
+"Option ist nur geeignet, wenn Sie wissen, was Sie tun. Um zu erfahren, wie\n"
+"Sie DiskDrake verwenden kц╤nnen, lesen Sie bitte das Kapitel Б─·Ihre\n"
+"Partitionen verwaltenБ─° im Б─·Starter HandbuchБ─°\n"
 "\n"
 "(*) In Deutschland ist es quasi unmц╤glich, Komplettrechner mit leeren\n"
 "Festplatten zu erhalten, da laut Gesetz nur Rechner mit BS verkauft werden\n"
@@ -139,9 +137,9 @@ msgstr ""
 msgid ""
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor."
 msgstr ""
 "Auflц╤sung\n"
@@ -154,43 +152,42 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
 "system administrator, the users you add at this point will not be\n"
 "authorized to change anything except their own files and their own\n"
-"configuration, protecting the system from unintentional or malicious\n"
-"changes that impact the system as a whole. You will have to create at least\n"
-"one regular user for yourself -- this is the account which you should use\n"
-"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
-"to do anything and everything, it may also be very dangerous! A mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, the worst that will happen is that you will lose\n"
-"some information, but not affect the entire system.\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in and copy it to the \"User name\" field, which is the name this\n"
-"user will enter to log onto the system. If you like, you may override the\n"
-"default and change the username. The next step is to enter a password. From\n"
-"a security point of view, a non-privileged (regular) user password is not\n"
-"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
-"making it blank or too simple: after all, your files could be the ones at\n"
-"risk.\n"
-"\n"
-"Once you click on \"Accept user\", you can add other users. Add a user for\n"
-"each one of your friends: your father or your sister, for example. Click\n"
-"\"Next ->\" when you have finished adding users.\n"
-"\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
-"\n"
-"When you are finished adding all users, you will be asked to choose a user\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the username. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user\n"
 "that can automatically log into the system when the computer boots up. If\n"
 "you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Next\n"
-"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
-"to use this feature?\" box."
+"security), choose the desired user and window manager, then click \"%s\".\n"
+"If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux ist ein Mehrbenutzer-System, das bedeutet konkret jedes\n"
 "Benutzerkennzeichen hat eigene Prц╓ferenzen (Grafische Umgebung,\n"
@@ -210,29 +207,27 @@ msgstr ""
 "\n"
 "Zuerst geben Sie bitte einen normalen Namen an. Das muss nicht\n"
 "notwendigerweise Ihr richtiger Name sein. Б─·DrakXБ─° wird das erste Wort, das\n"
-"Sie eingegeben haben, in das Feld Б─·BenutzerkennzeichenБ─° eintragen. Dies ist\n"
-"der Name, den Sie zum Anmelden fц╪r dieses Kennzeichen benц╤tigen. Natц╪rlich\n"
-"kц╤nnen Sie ihn hier nach Belieben verц╓ndern. Dann geben Sie Ihrem Konto ein\n"
-"Passwort. Fц╪r ein Benutzerkennzeichen ist dieses zwar nicht von so\n"
-"herausragender Bedeutung wie das fц╪r б╩rootб╚, doch Sie sollten trotzdem\n"
-"etwas Sorgfalt walten lassen. Immerhin sind es Ihre Daten ...\n"
+"Sie eingegeben haben, in das Feld Б─·%sБ─° eintragen. Dies ist der Name, den\n"
+"Sie zum Anmelden fц╪r dieses Kennzeichen benц╤tigen. Natц╪rlich kц╤nnen Sie ihn\n"
+"hier nach Belieben verц╓ndern. Dann geben Sie Ihrem Konto ein Passwort. Fц╪r\n"
+"ein Benutzerkennzeichen ist dieses zwar nicht von so herausragender\n"
+"Bedeutung wie das fц╪r б╩rootб╚, doch Sie sollten trotzdem etwas Sorgfalt\n"
+"walten lassen. Immerhin sind es Ihre Daten ...\n"
 "\n"
-"Klicken Sie auf Б─·Benutzer akzeptierenБ─°, um das Kennzeichen zu erstellen.\n"
-"Anschlieц÷end kц╤nnen Sie direkt weitere Benutzer hinzufц╪gen. Wenn Sie alle\n"
-"Kennzeichen erstellt haben, klicken Sie auf Б─·Weiter ->Б─°.\n"
+"Klicken Sie auf Б─·%sБ─°, um das Kennzeichen zu erstellen. Anschlieц÷end kц╤nnen\n"
+"Sie direkt weitere Benutzer hinzufц╪gen. Wenn Sie alle Kennzeichen erstellt\n"
+"haben, klicken Sie auf Б─·%sБ─°.\n"
 "\n"
-"Durch Anwahl der Schaltflц╓che Б─·FortgeschrittenБ─° haben Sie auch die\n"
-"Mц╤glichkeit, die Standard-Shell dieses Benutzers ц╓ndern (normalerweise ist\n"
-"dies die Б─·BashБ─°).\n"
+"Durch Anwahl der Schaltflц╓che Б─·%sБ─° haben Sie auch die Mц╤glichkeit, die\n"
+"Standard-Shell dieses Benutzers ц╓ndern (normalerweise ist dies die Б─·BashБ─°).\n"
 "\n"
 "Wenn Sie alle Kennzeichen erstellt haben, die Sie nutzen wollen, wird Ihnen\n"
 "die Mц╤glichkeit erц╤ffnet, ein Kennzeichen automatisch beim\n"
 "Betriebssystemstart angemeldet zu bekommen. Falls Sie sich fц╪r diese\n"
 "Funktionalitц╓t entscheiden (und wenig Wert auf Sicherheit legen) wц╓hlen Sie\n"
 "einfach die gewц╪nschte Arbeitsumgebung und das Kennzeichen aus. Bestц╓tigen\n"
-"Sie Ihre Auswahl durch betц╓tigen der Schaltflц╓che Б─·Weiter ->Б─°. Andernfalls\n"
-"lц╤schen Sie einfach die Markierung des Punktes Б─·Mц╤chten Sie diese\n"
-"Mц╤glichkeit nutzen?Б─°."
+"Sie Ihre Auswahl durch betц╓tigen der Schaltflц╓che Б─·%sБ─°. Andernfalls lц╤schen\n"
+"Sie einfach die Markierung des Punktes Б─·%sБ─°."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -256,8 +251,8 @@ msgid ""
 "choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
 "\n"
 " * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
 "at the first boot prompt.\n"
@@ -277,30 +272,27 @@ msgstr ""
 "\n"
 "Die Hauptparameter von yaboot sind:\n"
 "\n"
-" * Б─·Init NachrichtБ─°: Ein Text, der vor der Eingabeaufforderung angezeigt\n"
-"wird.\n"
+" * Б─·%sБ─°: Ein Text, der vor der Eingabeaufforderung angezeigt wird.\n"
 "\n"
-" * Б─·Boot Gerц╓tБ─°: Hiermit wird angegeben, wohin die Informationen zum\n"
-"Starten Ihres GNU/Linux Systems geschrieben werden sollen.\n"
+" * Б─·%sБ─°: Hiermit wird angegeben, wohin die Informationen zum Starten Ihres\n"
+"GNU/Linux Systems geschrieben werden sollen.\n"
 "\n"
-" * Б─·Open Firmware Verzц╤gerungБ─°: Im Gegensatz zu LILO, stehen mit yaboot\n"
-"zwei Verzц╤gerungen zur Verfц╪gung. Die erste Verzц╤gerung wird in Sekunden\n"
-"angegeben und dient zur Auswahl zwischen CD, OF Boot, MacOS oder Linux.\n"
+" * Б─·%sБ─°: Im Gegensatz zu LILO, stehen mit yaboot zwei Verzц╤gerungen zur\n"
+"Verfц╪gung. Die erste Verzц╤gerung wird in Sekunden angegeben und dient zur\n"
+"Auswahl zwischen CD, OF Boot, MacOS oder Linux.\n"
 "\n"
-" * Б─·BS-Startverzц╤gerung fц╪r den KernБ─°: Diese Verzц╤gerung entspricht der\n"
-"LILO Start-Verzц╤gerung. Sie haben nach der Auswahl von GNU/Linux diese\n"
-"Verzц╤gerung (in 0,1 Sekunden Schritten) Zeit, bis der Standardkern geladen\n"
-"wird.\n"
+" * Б─·%sБ─°: Diese Verzц╤gerung entspricht der LILO Start-Verzц╤gerung. Sie haben\n"
+"nach der Auswahl von GNU/Linux diese Verzц╤gerung (in 0,1 Sekunden\n"
+"Schritten) Zeit, bis der Standardkern geladen wird.\n"
 "\n"
-" * Б─·BS-Start von CD erlaubenБ─°: Markieren dieses Punkts erlaubt es Ihnen an\n"
-"der ersten Eingabeaufforderung [C] fц╪r den Start von CD zu wц╓hlen.\n"
+" * Б─·%sБ─°: Markieren dieses Punkts erlaubt es Ihnen an der ersten\n"
+"Eingabeaufforderung [C] fц╪r den Start von CD zu wц╓hlen.\n"
 "\n"
-" * Б─·Open Firmware Start erlaubenБ─°: Markieren dieses Punkts erlaubt es Ihnen\n"
-"an der ersten Eingabeaufforderung [N] fц╪r den Open Firmware Start zu\n"
-"wц╓hlen.\n"
+" * Б─·%sБ─°: Markieren dieses Punkts erlaubt es Ihnen an der ersten\n"
+"Eingabeaufforderung [N] fц╪r den Open Firmware Start zu wц╓hlen.\n"
 "\n"
-" * Б─·Standard BSБ─°: Hiermit stellen Sie ein, welches Betriebssystem nach\n"
-"Ablauf der Open Firmware Verzц╤gerung automatisch gestartet werden soll."
+" * Б─·%sБ─°: Hiermit stellen Sie ein, welches Betriebssystem nach Ablauf der\n"
+"Open Firmware Verzц╤gerung automatisch gestartet werden soll."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -311,13 +303,12 @@ msgid ""
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
 "of an existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": For the most part, this completely wipes out the old\n"
-"system. If you wish to change how your hard drives are partitioned, or\n"
-"change the file system, you should use this option. However, depending on\n"
-"your partitioning scheme, you can prevent some of your existing data from\n"
-"being over- written.\n"
+" * \"%s\": For the most part, this completely wipes out the old system. If\n"
+"you wish to change how your hard drives are partitioned, or change the file\n"
+"system, you should use this option. However, depending on your partitioning\n"
+"scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
-" * \"Upgrade\": this installation class allows you to update the packages\n"
+" * \"%s\": this installation class allows you to update the packages\n"
 "currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
@@ -333,14 +324,14 @@ msgstr ""
 "Wahl zwischen einer Aktualisierung einer bereits vorhandenen Mandrake\n"
 "Linux-Version oder einer kompletten Neuinstallation:\n"
 "\n"
-" * Б─·InstallierenБ─°: Entfernt komplett ц╓ltere Versionen von Mandrake Linux,\n"
-"die noch installiert sind - um genau zu sein, kц╤nnen Sie je nach aktuellem\n"
-"Inhalt Ihrer Platte auch einige ц╓ltere Linux- oder anderweitige Partitionen\n"
+" * Б─·%sБ─°: Entfernt komplett ц╓ltere Versionen von Mandrake Linux, die noch\n"
+"installiert sind - um genau zu sein, kц╤nnen Sie je nach aktuellem Inhalt\n"
+"Ihrer Platte auch einige ц╓ltere Linux- oder anderweitige Partitionen\n"
 "unangetastet behalten.\n"
 "\n"
-" * Б─·AktualisierenБ─°: Mit dieser Variante kц╤nnen Sie eine existierende\n"
-"Mandrake Linux Version aktualisieren. Die Partitionstabellen sowie die\n"
-"persц╤nlichen Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
+" * Б─·%sБ─°: Mit dieser Variante kц╤nnen Sie eine existierende Mandrake Linux\n"
+"Version aktualisieren. Die Partitionstabellen sowie die persц╤nlichen\n"
+"Verzeichnisse der Anwender bleiben erhalten. Alle anderen\n"
 "Installationsschritte werden wie bei einer Installation ausgefц╪hrt.\n"
 "\n"
 "Aktualisierungen von Mandrake Linux Б─·8.1Б─° oder neueren Systemen sollten\n"
@@ -353,99 +344,94 @@ msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Bugs may have been\n"
 "fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"Yes\"\n"
-"if you have a working Internet connection, or \"No\" if you prefer to\n"
+"updates, you are now able to download them from the Internet. Check \"%s\"\n"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
 "install updated packages later.\n"
 "\n"
-"Choosing \"Yes\" will display a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. A package-selection tree will\n"
-"appear: review the selection, and press \"Install\" to retrieve and install\n"
-"the selected package(s), or \"Cancel\" to abort."
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one nearer to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Es ist sehr wahrscheinlich, dass zum Zeitpunkt Ihrer Mandrake Linux\n"
 "Installation bereits einige Pakete aktualisiert wurden, etwa da noch Fehler\n"
 "entdeckt und beseitigt wurden oder da in Paketen Sicherheitslц╪cken entdeckt\n"
 "wurden, fц╪r die bereits Lц╤sungen existieren. Um von diesen aktualisierten\n"
 "Paketen Gebrauch zu machen, wird Ihnen nun angeboten, diese aus dem\n"
-"Internet nachzuladen. Betц╓tigen Sie die Schaltflц╓che Б─·JaБ─°, wenn Sie einen\n"
+"Internet nachzuladen. Betц╓tigen Sie die Schaltflц╓che Б─·%sБ─°, wenn Sie einen\n"
 "Internetzugang haben, um die Pakete zu installieren, andernfalls betц╓tigen\n"
-"Sie die Schaltflц╓che Б─·NeinБ─°. Sie kц╤nnen diese Pakete natц╪rlich auch\n"
-"jederzeit nach der Installation noch installieren.\n"
+"Sie die Schaltflц╓che Б─·%sБ─°. Sie kц╤nnen diese Pakete natц╪rlich auch jederzeit\n"
+"nach der Installation noch installieren.\n"
 "\n"
-"Betц╓tigen der Schaltflц╓che Б─·JaБ─° zeigt Ihnen eine Liste von Servern, von\n"
+"Betц╓tigen der Schaltflц╓che Б─·%sБ─° zeigt Ihnen eine Liste von Servern, von\n"
 "denen Sie die Aktualisierungen herunterladen kц╤nnen. Wц╓hlen Sie einen in\n"
 "Ihrer Nц╓he. Sie erhalten dann einen Paketauswahldialog: Kontrollieren Sie\n"
-"die Auswahl und bestц╓tigen Sie diese durch Betц╓tigen von Б─·InstallierenБ─°.\n"
-"Die Pakete werden nun angefordert und installiert. Sollten Sie das nicht\n"
-"wц╪nschen, betц╓tigen Sie einfach die Schaltflц╓che Б─·AbbruchБ─°."
+"die Auswahl und bestц╓tigen Sie diese durch Betц╓tigen von Б─·%sБ─°. Die Pakete\n"
+"werden nun angefordert und installiert. Sollten Sie das nicht wц╪nschen,\n"
+"betц╓tigen Sie einfach die Schaltflц╓che Б─·%sБ─°."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"This dialog allows to finely tune your bootloader:\n"
+"This dialog allows you to fine tune your bootloader:\n"
 "\n"
-" * \"Bootloader to use\": there are three choices for your bootloader:\n"
+" * \"%s\": there are three choices for your bootloader:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"%s\": if you prefer grub (text menu).\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
 "\n"
-" * \"Delay before booting the default image\": after a boot or a reboot of\n"
-"the computer, this is the delay given to the user at the console to select\n"
-"a boot entry other than the default.\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
-"system! Be sure you know what you do before changing any of the options. !!\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
-"that are reserved for the expert user."
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
 msgstr ""
 "DrakX bietet Ihnen einen Dialog mit verschiedenen Auswahlmц╤glichkeiten.\n"
 "\n"
-" * Б─·Zu verwendender BetriebssystemstarterБ─°: Hier erhalten Sie drei\n"
-"Alternativen:\n"
+" * Б─·%sБ─°: Hier erhalten Sie drei Alternativen:\n"
 "\n"
-"    * Б─·GRUBБ─°: Falls Sie grub (Textmenц╪) bevorzugen.\n"
+"    * Б─·%sБ─°: Falls Sie grub (Textmenц╪) bevorzugen.\n"
 "\n"
-"    * Б─·LILO mit Textmenц╪Б─°: Falls Sie LILO mit Textmenц╪ als Ihren Favoriten\n"
-"ansehen.\n"
+"    * Б─·%sБ─°: Falls Sie LILO mit Textmenц╪ als Ihren Favoriten ansehen.\n"
 "\n"
-"    * Б─·LILO mit grafischem Menц╪Б─°: Falls Sie LILO mit seiner grafischen\n"
-"Oberflц╓che bevorzugen.\n"
+"    * Б─·%sБ─°: Falls Sie LILO mit seiner grafischen Oberflц╓che bevorzugen.\n"
 "\n"
-" * Б─·Boot Gerц╓tБ─°: Normalerweise mц╪ssen Sie hier nichts ц╓ndern (Б─·/dev/hdaБ─°),\n"
-"Sie kц╤nnten jedoch den Starter auch auf der zweiten Platte installieren,\n"
-"(Б─·/dev/hdbБ─°) oder sogar auf einer Diskette (Б─·/dev/fd0Б─°).\n"
+" * Б─·%sБ─°: Normalerweise mц╪ssen Sie hier nichts ц╓ndern (Б─·%sБ─°), Sie kц╤nnten\n"
+"jedoch den Starter auch auf der zweiten Platte installieren, (Б─·%sБ─°) oder\n"
+"sogar auf einer Diskette (Б─·%sБ─°).\n"
 "\n"
-" * Б─·Wartezeit vorm Starten des Standard BetriebssystemsБ─°: Wenn Sie Ihren\n"
-"Rechner neu starten erhalten Sie im Menц╪ der zur Verfц╪gung stehenden BSe\n"
-"eine gewisse Zeit um auszuwц╓hlen, was Sie starten mц╤chten. Sollten Sie\n"
-"wц╓hrend dieser Zeit keine Wahl getroffen haben, wird Ihr Standard-BS\n"
-"gestartet.\n"
+" * Б─·%sБ─°: Wenn Sie Ihren Rechner neu starten erhalten Sie im Menц╪ der zur\n"
+"Verfц╪gung stehenden BSe eine gewisse Zeit um auszuwц╓hlen, was Sie starten\n"
+"mц╤chten. Sollten Sie wц╓hrend dieser Zeit keine Wahl getroffen haben, wird\n"
+"Ihr Standard-BS gestartet.\n"
 "\n"
 "!! Machen Sie sich klar, dass Sie sich selbst darum kц╪mmern mц╪ssen,\n"
 "irgendwie Ihr Mandrake Linux-System zu starten, wenn Sie hier keinen\n"
-"Betriebssystemstarter installieren (durch Auswahl von Б─·ц°berspringenБ─°).\n"
-"Stellen Sie auch sicher, dass Sie wissen was Sie tun, wenn Sie hier\n"
-"Einstellungen verц╓ndern ... !!\n"
+"Betriebssystemstarter installieren (durch Auswahl von Б─·%sБ─°). Stellen Sie\n"
+"auch sicher, dass Sie wissen was Sie tun, wenn Sie hier Einstellungen\n"
+"verц╓ndern ... !!\n"
 "\n"
-"Durch wц╓hlen der Schaltflц╓che Б─·FortgeschrittenБ─° erhalten Sie etliche\n"
-"Optionen, die dem fortgeschrittenen Anwender vorbehalten bleiben."
+"Durch wц╓hlen der Schaltflц╓che Б─·%sБ─° erhalten Sie etliche Optionen, die dem\n"
+"fortgeschrittenen Anwender vorbehalten bleiben."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
+"Please choose which one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -510,32 +496,32 @@ msgid ""
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
-"You will be presented the list of different parameters to change to get an\n"
-"optimal graphical display: Graphic Card\n"
+"You will be presented with a list of different parameters to change to get\n"
+"an optimal graphical display: Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs.\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own.\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor.\n"
 "\n"
 "\n"
@@ -543,7 +529,7 @@ msgid ""
 "Test\n"
 "\n"
 "   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"Yes\",\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
 "then DrakX will proceed to the next step. If you cannot see the message, it\n"
 "means that some part of the autodetected configuration was incorrect and\n"
 "the test will automatically end after 12 seconds, bringing you back to the\n"
@@ -553,9 +539,9 @@ msgid ""
 "\n"
 "Options\n"
 "\n"
-"   You can here choose whether you want to have your machine automatically\n"
+"   Here you can choose whether you want to have your machine automatically\n"
 "switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"No\" if your machine is to act as a server, or if you were not successful\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
 "X (das X Window System) ist das Herz der grafischen Benutzeroberflц╓che von\n"
@@ -601,7 +587,7 @@ msgstr ""
 "   DrakX versucht eine Testbild mit denen von Ihnen gewц╪nschten\n"
 "Einstellungen zu ц╤ffnen. Falls Sie wц╓hrend des Tests einen Dialog sehen, in\n"
 "dem Sie gefragt werden, ob sie die getroffenen Einstellungen behalten\n"
-"wollen, antworten Sie mit Б─·JaБ─°, damit DrakX mit dem nц╓chsten\n"
+"wollen, antworten Sie mit Б─·%sБ─°, damit DrakX mit dem nц╓chsten\n"
 "Installationsschritt fortfц╓hrt. Sollten Sie die Nachricht nicht sehen,\n"
 "bedeutet das, dass eine oder mehrere getroffene Einstellungen nicht korrekt\n"
 "sind. Nach 12 Sekunden sollten Sie wieder das Installationsmenц╪ sehen. Sie\n"
@@ -612,32 +598,32 @@ msgstr ""
 "Options\n"
 "\n"
 "   Sie kц╤nnen direkt bei Betriebssystemstart die grafische Umgebung\n"
-"aktivieren. Durch betц╓tigen der Schaltflц╓che Б─·NeinБ─° wird in eine reine\n"
+"aktivieren. Durch betц╓tigen der Schaltflц╓che Б─·%sБ─° wird in eine reine\n"
 "Textumgebung gestartet. Das ist sinnvoll fц╪r Server oder wenn Sie bei dem\n"
 "Versuch die grafische Umgebung zu konfigurieren erfolglos waren. Wц╓hlen Sie\n"
-"Б─·JaБ─°, um die grafische Umgebung vorzufinden."
+"Б─·%sБ─°, um die grafische Umgebung vorzufinden."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
-"is best for a particular type of configuration.\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"is best suited to particular types of configuration.\n"
 "\n"
-" * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"pdq\n"
-"\" will handle only very simple network cases and is somewhat slow when\n"
-"used with networks.) It's recommended that you use \"pdq\" if this is your\n"
-"first experience with GNU/Linux.\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
 "printing to your local printer or to one halfway around the planet. It is\n"
 "simple to configure and can act as a server or a client for the ancient\n"
 "\"lpd \" printing system, so it compatible with older operating systems\n"
-"that may still need print services. While quite powerful, the basic setup\n"
+"which may still need print services. While quite powerful, the basic setup\n"
 "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
 "front-ends for printing or choosing printer options and for managing the\n"
 "printer.\n"
 "\n"
@@ -649,14 +635,14 @@ msgstr ""
 "Betriebssysteme bieten Ihnen nur eines, bei Mandrake Linux kц╤nnen Sie\n"
 "zwischen zwei verschiedenen wц╓hlen.\n"
 "\n"
-" * Б─·pdqБ─° - Es steht fц╪r Б─·print, don't queueБ─° (engl. fц╪r Б─·Drucken ohne\n"
+" * Б─·%sБ─° - Es steht fц╪r Б─·print, don't queueБ─° (engl. fц╪r Б─·Drucken ohne\n"
 "WarteschlangeБ─°). Falls Sie einen Drucker haben, der direkt an Ihrem Rechner\n"
 "hц╓ngt und Sie keine Netzwerkdrucker verwenden wollen, ist dies das\n"
 "Drucksystem Ihrer Wahl. Es kann zwar auch mit Netzwerkdruckern umgehen, ist\n"
 "dabei aber extrem langsam. Wц╓hlen Sie Б─·pdqБ─°, wenn Sie ein GNU/Linux Neuling\n"
 "sind.\n"
 "\n"
-" * Б─·CUPSБ─° - Mit dem Б─·Common Unix Printing SystemБ─° (engl. fц╪r Б─·Allgemeines\n"
+" * Б─·%sБ─° - Mit dem Б─·Common Unix Printing SystemБ─° (engl. fц╪r Б─·Allgemeines\n"
 "Unix-DrucksystemБ─°) kц╤nnen Sie ebenso gut um auf Ihrem direkt\n"
 "angeschlossenen Drucker drucken, wie auf einem Drucker, der an einem Server\n"
 "auf der anderen Seite der Welt hц╓ngt. Es ist einfach zu bedienen und kann\n"
@@ -667,8 +653,7 @@ msgstr ""
 "starten. CUPS bietet grafische Konfigurations- und Druckmenц╪s.\n"
 "\n"
 "Sie kц╤nnen diese Wahl spц╓ter immer wieder ц╓ndern, indem Sie PrinterDrake im\n"
-"Mandrake-Kontrollzentrum starten und dort die Schaltflц╓che Б─·ExpertenmodusБ─°\n"
-"betц╓tigen."
+"Mandrake-Kontrollzentrum starten und dort die Schaltflц╓che Б─·%sБ─° betц╓tigen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -681,47 +666,45 @@ msgid ""
 "Packages are sorted into groups corresponding to a particular use of your\n"
 "machine. Mandrake Linux has four predefined installations available. You\n"
 "can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various containers, so a\n"
+"You can mix and match applications from the various groups, so a\n"
 "``Workstation'' installation can still have applications from the\n"
-"``Development'' container installed.\n"
+"``Development'' group installed.\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the applications that are in the workstation\n"
-"container.\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the applications that are in the workstation group.\n"
 "\n"
-" * \"Development\": if plan on using your machine for programming, choose\n"
-"the appropriate packages from the container.\n"
+" * \"%s\": if plan on using your machine for programming, choose the\n"
+"appropriate packages from that group.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, select which of\n"
-"the more common services you wish to install on your machine.\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical interface available.\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
 "text about that group. If you unselect all groups when performing a regular\n"
 "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the minimum number of packages possible to have a\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server.\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
 "\n"
-" * \"Truly minimal install\": will install the absolute minimum number of\n"
-"packages necessary to get a working Linux system. With this installation\n"
-"you will only have a command line interface. The total size of this\n"
-"installation is 65 megabytes.\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
 "Nun ist es Zeit sich zu entscheiden, welche Programme Sie auf Ihrem Rechner\n"
@@ -731,44 +714,44 @@ msgstr ""
 "Die Pakete sind nach ihrer Verwendung in Gruppen eingeteilt. Diese Gruppen\n"
 "wiederum enthalten vier Abschnitte:\n"
 "\n"
-" * Б─·ArbeitsplatzrechnerБ─°: Falls Ihr Rechner als Arbeitsplatzrechner\n"
-"verwendet werden soll, markieren Sie eine oder mehrere Gruppen.\n"
+" * Б─·%sБ─°: Falls Ihr Rechner als Arbeitsplatzrechner verwendet werden soll,\n"
+"markieren Sie eine oder mehrere Gruppen.\n"
 "\n"
-" * Б─·EntwicklungsplattformБ─°: Falls Sie mit Ihrem Rechner programmieren\n"
-"wollen, sollten Sie diese Gruppe markieren.\n"
+" * Б─·%sБ─°: Falls Sie mit Ihrem Rechner programmieren wollen, sollten Sie\n"
+"diese Gruppe markieren.\n"
 "\n"
-" * Б─·ServerБ─°: Wenn Ihre Maschine ein Server werden soll, kц╤nnen Sie hier die\n"
+" * Б─·%sБ─°: Wenn Ihre Maschine ein Server werden soll, kц╤nnen Sie hier die\n"
 "wichtigsten Dienste auswц╓hlen, die auf Ihren Rechner installiert werden\n"
 "sollen.\n"
 "\n"
-" * Б─·Grafische Oberflц╓cheБ─°: Wц╓hlen Sie hier Ihre bevorzugte grafische\n"
-"Arbeitsoberflц╓che. Wenn Sie eine grafische Oberflц╓che verwenden wollen, so\n"
-"mц╪ssen Sie hier zumindest eine Gruppe auswц╓hlen.\n"
+" * Б─·%sБ─°: Wц╓hlen Sie hier Ihre bevorzugte grafische Arbeitsoberflц╓che. Wenn\n"
+"Sie eine grafische Oberflц╓che verwenden wollen, so mц╪ssen Sie hier\n"
+"zumindest eine Gruppe auswц╓hlen.\n"
 "\n"
 "Wenn Sie die Maus ц╪ber eine Gruppe bewegen, erhalten Sie einen kurzen\n"
 "erklц╓renden Text ц╪ber die Gruppe. Falls Sie bei einer Installation alle\n"
 "Markierungen entfernen, erscheint ein Dialog, in dem Sie zwischen\n"
 "verschiedenen Minimalinstallationen wц╓hlen kц╤nnen:\n"
 "\n"
-" * Б─·Mit XБ─° Installiert eine rudimentц╓re grafische Oberflц╓che;\n"
+" * Б─·%sБ─° Installiert eine rudimentц╓re grafische Oberflц╓che;\n"
 "\n"
-" * Б─·Mit minimaler DokumentationБ─° Installiert das Basissystem zuzц╪glich\n"
-"grundlegender Werkzeuge inklusive deren Dokumentation. Dies ist die\n"
-"sinnvollste Wahl fц╪r eine Serverinstallation.\n"
+" * Б─·%sБ─° Installiert das Basissystem zuzц╪glich grundlegender Werkzeuge\n"
+"inklusive deren Dokumentation. Dies ist die sinnvollste Wahl fц╪r eine\n"
+"Serverinstallation.\n"
 "\n"
-" * Б─·Extrem minimale InstallationБ─° Sie erhalten eine komplett Б─·nackteБ─° 65MB\n"
-"groц÷e GNU/Linux-Distribution (speziell auch ohne urpmi!). Es versteht sich\n"
-"von selbst, dass das nur eine Kommandozeileninstallation sein kann.\n"
+" * Б─·%sБ─° Sie erhalten eine komplett Б─·nackteБ─° 65MB groц÷e\n"
+"GNU/Linux-Distribution (speziell auch ohne urpmi!). Es versteht sich von\n"
+"selbst, dass das nur eine Kommandozeileninstallation sein kann.\n"
 "\n"
-"Wenn Sie die Schaltflц╓che Б─·FortgeschrittenБ─° anwц╓hlen, erhalten Sie die\n"
-"Mц╤glichkeit, eine Б─·Individuelle PaketauswahlБ─° durchzufц╪hren. Das macht nur\n"
-"Sinn, wenn Sie die Pakete genau kennen oder wenn Sie volle Kontrolle\n"
-"darц╪ber haben wollen, was installiert werden soll.\n"
+"Wenn Sie die Schaltflц╓che Б─·%sБ─° anwц╓hlen, erhalten Sie die Mц╤glichkeit, eine\n"
+"Б─·%sБ─° durchzufц╪hren. Das macht nur Sinn, wenn Sie die Pakete genau kennen\n"
+"oder wenn Sie volle Kontrolle darц╪ber haben wollen, was installiert werden\n"
+"soll.\n"
 "\n"
-"Haben Sie die Installation als Б─·AktualisierungБ─° gestartet, kц╤nnen Sie die\n"
-"Markierungen aller Gruppen entfernen, um die Installation neuer Pakete zu\n"
-"vermeiden. Hierdurch werden nur bereits installierte Pakete aktualisiert\n"
-"oder repariert."
+"Haben Sie die Installation als Б─·%sБ─° gestartet, kц╤nnen Sie die Markierungen\n"
+"aller Gruppen entfernen, um die Installation neuer Pakete zu vermeiden.\n"
+"Hierdurch werden nur bereits installierte Pakete aktualisiert oder\n"
+"repariert."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -787,19 +770,20 @@ msgstr ""
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
+"administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
 "guess - DrakX will tell you if the password that you chose too easy. As you\n"
 "can see, you are not forced to enter a password, but we strongly advise you\n"
-"against. GNU/Linux is as prone to operator error as any other operating\n"
-"system. Since \"root\" can overcome all limitations and unintentionally\n"
-"erase all data on partitions by carelessly accessing the partitions\n"
-"themselves, it is important that it be difficult to become \"root\".\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
 "\n"
 "One caveat -- do not make the password too long or complicated because you\n"
 "must be able to remember it!\n"
@@ -807,18 +791,19 @@ msgid ""
 "The password will not be displayed on screen as you type it in. To reduce\n"
 "the chance of a blind typing error you will need to enter the password\n"
 "twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
 "\n"
 "If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"Advanced\" button.\n"
+"server, click the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you do not\n"
-"know which to use, ask your network administrator.\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with reminding passwords, you can choose to\n"
-"have \"No password\", if your computer won't be connected to the Internet,\n"
-"and if you trust anybody having access to it."
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the internet or that you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Sie kц╤nnen nun das б╩rootб╚ Passwort fц╪r Ihr Mandrake Linux System eingeben.\n"
 "Das Passwort muss zweimal eingegeben werden, um sicher zu stellen, dass Sie\n"
@@ -852,7 +837,7 @@ msgstr ""
 "\n"
 "Wenn Sie wollen, dass der Zugang zu diesem Rechner ц╪ber einen\n"
 "Authentifizierungsserver verwaltet wird, betц╓tigen Sie die Schaltflц╓che\n"
-"Б─·FortgeschrittenБ─°.\n"
+"Б─·%sБ─°.\n"
 "\n"
 "Falls in Ihrem Netzwerk LDAP, NIS oder PDC zur Authentifizierung verwendet\n"
 "wird, wц╓hlen Sie bitte den entsprechenden Menц╪punkt. Falls Sie nicht\n"
@@ -860,27 +845,27 @@ msgstr ""
 "Netzwerkadministrator.\n"
 "\n"
 "Wenn Sie Probleme haben, sich Passwц╤rter zu merken, kц╤nnen Sie die Option\n"
-"Б─·Kein PasswortБ─° wц╓hlen. Dennoch mц╪ssen wir Ihnen von dieser Mц╤glichkeit\n"
-"abraten. Besonders wenn Sie mit Ihrem Rechner stц╓ndig oder auch nur\n"
-"zeitweise mit dem Internet verbunden sind."
+"Б─·%sБ─° wц╓hlen. Dennoch mц╪ssen wir Ihnen von dieser Mц╤glichkeit abraten.\n"
+"Besonders wenn Sie mit Ihrem Rechner stц╓ndig oder auch nur zeitweise mit\n"
+"dem Internet verbunden sind."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"Click on \"Next ->\" if you want to delete all data and partitions present\n"
-"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
-"be able to recover any data and partitions present on this hard drive,\n"
-"including any Windows data.\n"
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"Click on \"%s\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Betц╓tigen Sie die Schaltflц╓che Б─·Weiter ->Б─°, wenn Sie alle Partitionen und\n"
-"die darauf befindlichen Daten lц╤schen wollen. Bedenken Sie, dass Sie nach\n"
+"Betц╓tigen Sie die Schaltflц╓che Б─·%sБ─°, wenn Sie alle Partitionen und die\n"
+"darauf befindlichen Daten lц╤schen wollen. Bedenken Sie, dass Sie nach\n"
 "betц╓tigen der Schaltflц╓che auch an die mц╤glicherweise noch vorhandenen\n"
 "Windows-Daten nicht mehr gelangen werden!\n"
 "\n"
-"Wц╓hlen Sie Б─·<- Zurц╪ckБ─°, um die Aktion ohne Datenverlust abzubrechen."
+"Wц╓hlen Sie Б─·%sБ─°, um die Aktion ohne Datenverlust abzubrechen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -899,17 +884,17 @@ msgid ""
 "installed. By default Mandrake Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes are discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
 "default during boot. !!\n"
 "\n"
-"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
-"which appears whenever the installer automatically selects a package to\n"
-"resolve a dependency issue. Some packages have relationships between each\n"
-"other such that installation of a package requires that some other program\n"
-"is already installed. The installer can determine which packages are\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each other such\n"
+"that installation of a package requires that some other program is also\n"
+"rerquired to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -919,18 +904,17 @@ msgid ""
 "end of another installation. See the second tip of last step on how to\n"
 "create such a floppy."
 msgstr ""
-"Schlussendlich erhalten Sie (falls Sie sich fц╪r Б─·Individuelle PaketauswahlБ─°\n"
-"entschieden haben) eine Baumliste aller Pakete die zu den von Ihnen\n"
-"gewц╪nschten Gruppen gehц╤ren. Diese Pakete sind nach Gruppen und\n"
-"Untergruppen klassifiziert. Beim Durchstц╤bern des Baums, kц╤nnen Sie\n"
-"Gruppen, Untergruppen oder einzelne Pakete markieren oder deren Markierung\n"
-"entfernen.\n"
+"Schlussendlich erhalten Sie (falls Sie sich fц╪r Б─·%sБ─° entschieden haben)\n"
+"eine Baumliste aller Pakete die zu den von Ihnen gewц╪nschten Gruppen\n"
+"gehц╤ren. Diese Pakete sind nach Gruppen und Untergruppen klassifiziert.\n"
+"Beim Durchstц╤bern des Baums, kц╤nnen Sie Gruppen, Untergruppen oder einzelne\n"
+"Pakete markieren oder deren Markierung entfernen.\n"
 "\n"
 "Sobald Sie ein Paket auswц╓hlen, erscheint rechts eine kurze Beschreibung.\n"
 "Sobald Sie die Auswahl abgeschlossen haben, bestц╓tigen Sie das durch\n"
-"Drц╪cken der Schaltflц╓che Б─·InstallationБ─°. Nun beginnt die eigentliche\n"
-"Installation. Falls Sie eine Vielzahl von Paketen installieren wollen,\n"
-"kц╤nnen Sie nun getrost einen Kaffee trinken gehen.\n"
+"Drц╪cken der Schaltflц╓che Б─·%sБ─°. Nun beginnt die eigentliche Installation.\n"
+"Falls Sie eine Vielzahl von Paketen installieren wollen, kц╤nnen Sie nun\n"
+"getrost einen Kaffee trinken gehen.\n"
 "\n"
 "!! Es kommt vor, dass Server- und Dienst-Pakete angewц╓hlt wurden - entweder\n"
 "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
@@ -940,13 +924,13 @@ msgstr ""
 "Distribution zusammengestellt wurde, keine Sicherheitslц╪cken oder Fehler in\n"
 "diesen Paketen bekannt waren, ist natц╪rlich nicht auszuschlieц÷en, dass\n"
 "spц╓ter solche Fehler gefunden werden. Sollten Sie also nicht wissen, wovon\n"
-"hier die Rede ist, wц╓hlen Sie sicherheitshalber lieber Б─·NeinБ─°. Falls Sie\n"
-"mit Б─·JaБ─° antworten, werden die Dienste und Server installiert und stehen\n"
-"Ihnen nach der Installation standardmц╓ц÷ig zur Verfц╪gung. !!\n"
+"hier die Rede ist, wц╓hlen Sie sicherheitshalber lieber Б─·%sБ─°. Falls Sie mit\n"
+"Б─·%sБ─° antworten, werden die Dienste und Server installiert und stehen Ihnen\n"
+"nach der Installation standardmц╓ц÷ig zur Verfц╪gung. !!\n"
 "\n"
-"Die Option Б─·Automatische Abhц╓ngigkeitenБ─° unterdrц╪ckt nur die Warnungen, die\n"
-"erscheinen, wenn das Installationsprogramm Pakete automatisch markiert, um\n"
-"Paketabhц╓ngigkeiten aufzulц╤sen, wenn Sie ein Paket auswц╓hlen.\n"
+"Die Option Б─·%sБ─° unterdrц╪ckt nur die Warnungen, die erscheinen, wenn das\n"
+"Installationsprogramm Pakete automatisch markiert, um Paketabhц╓ngigkeiten\n"
+"aufzulц╤sen, wenn Sie ein Paket auswц╓hlen.\n"
 "\n"
 "Das kleine Diskettensymbol am unteren Rand der Liste ermц╤glicht es Ihnen,\n"
 "die wц╓hrend einer vorangegangenen Installation gespeicherte Paketauswahl\n"
@@ -971,12 +955,7 @@ msgid ""
 "one.\n"
 "\n"
 "If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader.\n"
-"\n"
-"\"Boot device\": in most cases, you will not change the default (\"First\n"
-"sector of drive (MBR)\"), but if you prefer, the bootloader can be\n"
-"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
-"(\"On Floppy\")."
+"bootloader."
 msgstr ""
 "LILO und grub sind Betriebssystemstarter fц╪r GNU/Linux. Diese\n"
 "Installationsphase lц╓uft in den meisten Fц╓llen vц╤llig automatisch ab. DrakX\n"
@@ -991,12 +970,7 @@ msgstr ""
 "neuen;\n"
 "\n"
 "Falls DrakX nicht weiц÷, wo der Betriebssystemstarter installiert werden\n"
-"soll, wird es Sie um Ihre Meinung bitten.\n"
-"\n"
-"Б─·Boot Gerц╓tБ─°: Normalerweise werden Sie die Voreinstellung nicht ц╓ndern\n"
-"(Б─·Erster Sektor der Platte (MBR)Б─°), Sie kц╤nnen Ihn jedoch auch auf der\n"
-"zweiten Festplatte (Б─·/dev/hdbБ─°), oder etwa auf einer Diskette (Б─·Auf\n"
-"DisketteБ─°)."
+"soll, wird es Sie um Ihre Meinung bitten."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1006,7 +980,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, You'll have to specify your hardware by hand.\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1047,8 +1021,8 @@ msgid ""
 " * Label: this is the name you will have to type at the yaboot prompt to\n"
 "select this boot option.\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
 "\n"
 " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
@@ -1090,17 +1064,16 @@ msgstr ""
 "\n"
 "Fц╪r Linux gibt es einige Parameter:\n"
 "\n"
-" * Б─·IdentifikatorБ─°: Es handelt sich um den Namen, den Sie an der yaboot\n"
+" * Б─·%sБ─°: Es handelt sich um den Namen, den Sie an der yaboot\n"
 "Eingabeaufforderung angeben mц╪ssen, um diese Alternative zu wц╓hlen.\n"
 "\n"
-" * Б─·KernБ─°: Der Name des BS-Kerns, den sie starten wollen. Normalerweise\n"
+" * Б─·%sБ─°: Der Name des BS-Kerns, den sie starten wollen. Normalerweise\n"
 "handelt es sich um Б─·vmlinuzБ─° oder eine Variante von Б─·vmlinuzБ─° mit einer\n"
 "Versionsnummer.\n"
 "\n"
-" * Б─·VerzeichnisbaumwurzelБ─°: Die Verzeichnisbaumwurzel Б─·/Б─° Ihrer Linux\n"
-"Installation.\n"
+" * Б─·%sБ─°: Die Verzeichnisbaumwurzel Б─·/Б─° Ihrer Linux Installation.\n"
 "\n"
-" * Б─·ц°bergebenБ─°: Auf Apple Hardware, wird die ц°bergabemц╤glichkeit weiterer\n"
+" * Б─·%sБ─°: Auf Apple Hardware, wird die ц°bergabemц╤glichkeit weiterer\n"
 "Kernparameter hц╓ufig verwendet, um die Grafikausgabe richtig zu\n"
 "konfigurieren oder die Tastaturemulation der Mausknц╤pfe einzuschalten, da\n"
 "klassische Apple-Mц╓use von Hause aus mit 2 fehlenden Maustasten\n"
@@ -1111,25 +1084,24 @@ msgstr ""
 "\n"
 "      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-" * Б─·Init-RamDiskБ─°: Dieser Parameter kann entweder verwendet werden, um beim\n"
+" * Б─·%sБ─°: Dieser Parameter kann entweder verwendet werden, um beim\n"
 "Betriebssystemstart bereits zusц╓tzliche Kern-Module zur Verfц╪gung zu haben,\n"
 "ohne dass das Start-Gerц╓t zur Verfц╪gung steht oder um ein RamDisk Abbild\n"
 "fц╪r den BS-Start in Notfц╓llen zur Verfц╪gung zu haben.\n"
 "\n"
-" * Б─·Grц╤ц÷e der Init-RamDiskБ─°: Standardmц╓ц÷ig ist eine RamDisk 4096 Bytes\n"
-"groц÷. Sollten Sie eine grц╤ц÷ere RamDisk benц╤tigen, kц╤nnen Sie das mit diesem\n"
-"Parameter einstellen.\n"
+" * Б─·%sБ─°: Standardmц╓ц÷ig ist eine RamDisk 4096 Bytes groц÷. Sollten Sie eine\n"
+"grц╤ц÷ere RamDisk benц╤tigen, kц╤nnen Sie das mit diesem Parameter einstellen.\n"
 "\n"
-" * Б─·Schreiben/LesenБ─°: Normalerweise wird die Verzeichnisbaumwurzel zuerst\n"
-"im Nur-Lese-Modus eingehц╓ngt, um eine Dateisystem-Verifikation durchfц╪hren\n"
-"zu kц╤nnen, bevor das Betriebssystem seinen Dienst aufnimmt. Diesen Umstand\n"
+" * Б─·%sБ─°: Normalerweise wird die Verzeichnisbaumwurzel zuerst im\n"
+"Nur-Lese-Modus eingehц╓ngt, um eine Dateisystem-Verifikation durchfц╪hren zu\n"
+"kц╤nnen, bevor das Betriebssystem seinen Dienst aufnimmt. Diesen Umstand\n"
 "kц╤nnen Sie hier abstellen.\n"
 "\n"
-" * Б─·NoVideoБ─°: Sollte sich die Apple Grafik-Hardware als extrem\n"
-"problematisch erweisen, kц╤nnen Sie diesen Parameter verwenden um im sog.\n"
-"Б─·novideoБ─°-Modus, also im FrameBuffer-Modus zu starten.\n"
+" * Б─·%sБ─°: Sollte sich die Apple Grafik-Hardware als extrem problematisch\n"
+"erweisen, kц╤nnen Sie diesen Parameter verwenden um im sog. Б─·novideoБ─°-Modus,\n"
+"also im FrameBuffer-Modus zu starten.\n"
 "\n"
-" * Б─·StandardБ─°: Wц╓hlt diesen Eintrag als Standard Linux-Kern, den Sie durch\n"
+" * Б─·%sБ─°: Wц╓hlt diesen Eintrag als Standard Linux-Kern, den Sie durch\n"
 "Drц╪cken von Enter an der yaboot Eingabeaufforderung gestartet bekommen.\n"
 "Wenn Sie die [Tab]-Taste an der Eingabeaufforderung drц╪cken, erhalten Sie\n"
 "eine Liste der verfц╪gbaren Alternativen. Der Standardeintrag wird mit einem\n"
@@ -1142,21 +1114,20 @@ msgid ""
 "documentation, the installer and the system in general. Select first the\n"
 "region you are located in, and then the language you speak.\n"
 "\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation, thereby installing the\n"
-"language-specific files for system documentation and applications. For\n"
-"example, if you will host users from Spain on your machine, select English\n"
-"as the default language in the tree view and \"Espanol\" in the Advanced\n"
-"section.\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"All\n"
-"languages\" box. Selecting support for a language means translations,\n"
-"fonts, spell checkers, etc. for that language will be installed.\n"
-"Additionally, the \"Use Unicode by default\" checkbox allows to force the\n"
-"system to use unicode (UTF-8). Note however that this is an experimental\n"
-"feature. If you select different languages requiring different encoding the\n"
-"unicode support will be installed anyway.\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will be installed. Additionally, the\n"
+"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
+"however that this is an experimental feature. If you select different\n"
+"languages requiring different encoding the unicode support will be\n"
+"installed anyway.\n"
 "\n"
 "To switch between the various languages installed on the system, you can\n"
 "launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
@@ -1167,18 +1138,17 @@ msgstr ""
 "Systemlaufzeit. Wц╓hlen Sie zuerst die Region, in der Sie sich befinden,\n"
 "anschlieц÷end die Sprache, die Sie sprechen.\n"
 "\n"
-"Durch Betц╓tigen der Schaltflц╓che Б─·FortgeschrittenБ─° erhalten Sie die\n"
-"Mц╤glichkeit, weitere Sprachen auf Ihrem Rechner zu installieren, um diese\n"
-"spц╓ter verwenden zu kц╤nnen. Wollen Sie etwa Spaniern muttersprachlichen\n"
-"Zugang zu Ihrem System erlauben, wц╓hlen Sie Deutsch als Hauptsprache in der\n"
-"Liste und im Fortgeschrittenen-Bereich Б─·SpanischБ─°.\n"
+"Durch Betц╓tigen der Schaltflц╓che Б─·%sБ─° erhalten Sie die Mц╤glichkeit, weitere\n"
+"Sprachen auf Ihrem Rechner zu installieren, um diese spц╓ter verwenden zu\n"
+"kц╤nnen. Wollen Sie etwa Spaniern muttersprachlichen Zugang zu Ihrem System\n"
+"erlauben, wц╓hlen Sie Deutsch als Hauptsprache in der Liste und im\n"
+"Fortgeschrittenen-Bereich Б─·%sБ─°.\n"
 "\n"
 "Sie sind nicht auf eine weitere Sprache begrenzt. Sie kц╤nnen so viele\n"
-"auswц╓hlen, wie Sie wollen, ja sogar alle, indem Sie die Schaltflц╓che Б─·Alle\n"
-"SprachenБ─° verwenden. Das Auswц╓hlen einer Sprache beeinflusst die\n"
-"installierten ц°bersetzungen der Programme, Schriften,\n"
-"Rechtschreibkorrekturen, etc. Durch Auswahl des Menц╪punkts Б─·Verwende\n"
-"standardmц╓ц÷ig UnicodeБ─° wird das System als Standardkodierung UTF-8\n"
+"auswц╓hlen, wie Sie wollen, ja sogar alle, indem Sie die Schaltflц╓che Б─·%sБ─°\n"
+"verwenden. Das Auswц╓hlen einer Sprache beeinflusst die installierten\n"
+"ц°bersetzungen der Programme, Schriften, Rechtschreibkorrekturen, etc. Durch\n"
+"Auswahl des Menц╪punkts Б─·%sБ─° wird das System als Standardkodierung UTF-8\n"
 "Verwenden. Es sei angemerkt, dass diese Funktionalitц╓t momentan noch als\n"
 "experimentell eingestuft ist. Sollten Sie jedoch verschiedene Sprachen\n"
 "auswц╓hlen, die unterschiedliche Kodierungen notwendig machen wц╪rden, wird\n"
@@ -1193,14 +1163,14 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"\"Sound card\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver."
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
 msgstr ""
-"Б─·SoundkarteБ─°: Falls eine Soundkarte in Ihrem Rechner gefunden wurde, wird\n"
-"sie hier angezeigt. Sollte die von DrakX getroffene Auswahl nicht korrekt\n"
-"sein, betц╓tigen Sie einfach die Schaltflц╓che, um sie zu korrigieren."
+"Б─·%sБ─°: Falls eine Soundkarte in Ihrem Rechner gefunden wurde, wird sie hier\n"
+"angezeigt. Sollte die von DrakX getroffene Auswahl nicht korrekt sein,\n"
+"betц╓tigen Sie einfach die Schaltflц╓che, um sie zu korrigieren."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1210,9 +1180,9 @@ msgid ""
 "\n"
 "If there are other operating systems installed on your machine they will\n"
 "automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
-"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
-"your changes.\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
 "anyone who goes to the console and reboots the machine. You can delete the\n"
@@ -1228,9 +1198,9 @@ msgstr ""
 "so wird dieses - sofern es erkannt wird - automatisch zu dem Startmenц╪\n"
 "hinzugefц╪gt. Hier kц╤nnen Sie noch einige Feineinstellungen fц╪r die\n"
 "bestehenden Optionen vornehmen. Markieren Sie einen bestehenden Eintrag und\n"
-"betц╓tigen Sie die Schaltflц╓che Б─·ц└ndernБ─°, um ihn anzupassen oder zu lц╤schen;\n"
-"Б─·Hinzufц╪genБ─° erzeugt einen neuen Eintrag und Б─·FertigБ─° bringt Sie zum\n"
-"nц╓chsten Installationsschritt.\n"
+"betц╓tigen Sie die Schaltflц╓che Б─·%sБ─°, um ihn anzupassen oder zu lц╤schen;\n"
+"Б─·%sБ─° erzeugt einen neuen Eintrag und Б─·%sБ─° bringt Sie zum nц╓chsten\n"
+"Installationsschritt.\n"
 "\n"
 "Mц╤glicherweise wollen Sie auch nicht, dass andere Anwender Zugriff auf die\n"
 "ц╪brigen installierten Betriebssysteme bekommen. In diesem Fall kц╤nnen Sie\n"
@@ -1241,8 +1211,8 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Mandrake Linux partition. Be careful, all data present on this partition\n"
+"will be lost and will not be recoverable!"
 msgstr ""
 "Bitte wц╓hlen Sie die Festplatte, die Sie lц╤schen wollen, um Ihr neues\n"
 "Mandrake Linux zu installieren. Bedenken Sie dabei, dass alle Daten auf\n"
@@ -1251,32 +1221,33 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"\"Printer\": clicking on the \"Configure\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation."
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
 msgstr ""
-"Б─·DruckerБ─°: Durch Anwahl der Schaltflц╓che Б─·KonfigurierenБ─° startet den\n"
-"Druckerassistenten. Weitere Informationen zu diesem Assistenten erhalten\n"
-"Sie im Drucker-Kapitel des Б─·Starter HandbuchБ─°. Das dort vorgestellte\n"
-"Programm entspricht dem wц╓hrend der Installation angebotenen."
+"Б─·%sБ─°: Durch Anwahl der Schaltflц╓che Б─·%sБ─° startet den Druckerassistenten.\n"
+"Weitere Informationen zu diesem Assistenten erhalten Sie im Drucker-Kapitel\n"
+"des Б─·Starter HandbuchБ─°. Das dort vorgestellte Programm entspricht dem\n"
+"wц╓hrend der Installation angebotenen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
 msgstr ""
 "Options\n"
 "\n"
 "   Sie kц╤nnen direkt bei Betriebssystemstart die grafische Umgebung\n"
-"aktivieren. Durch betц╓tigen der Schaltflц╓che Б─·NeinБ─° wird in eine reine\n"
+"aktivieren. Durch betц╓tigen der Schaltflц╓che Б─·%sБ─° wird in eine reine\n"
 "Textumgebung gestartet. Das ist sinnvoll fц╪r Server oder wenn Sie bei dem\n"
 "Versuch die grafische Umgebung zu konfigurieren erfolglos waren. Wц╓hlen Sie\n"
-"Б─·JaБ─°, um die grafische Umgebung vorzufinden."
+"Б─·%sБ─°, um die grafische Umgebung vorzufinden."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1296,7 +1267,7 @@ msgid ""
 "directly exposed to the Internet. The trade-off of a higher security level\n"
 "is generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, keep the default option."
+"If you do not know what to choose, stay with the default option."
 msgstr ""
 "Nun ist es an der Zeit, die gewц╪nschte Sicherheitsebene fц╪r Ihr System\n"
 "festzulegen. Als Faustregel sollte hier dienen: Je zugц╓nglicher die\n"
@@ -1311,141 +1282,138 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"As a review, DrakX will present a summary of various information it has\n"
-"about your system. Depending on your installed hardware, you may have some\n"
-"or all of the following entries. Each entry is made up of the configuration\n"
-"item to be configured, followed by a quick summary of the current\n"
-"configuration. Click on the corresponding \"Configure\" button to change\n"
-"that.\n"
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
 "\n"
-" * \"Keyboard\": check the current keyboard map configuration and change\n"
-"that if necessary.\n"
+" * \"%s\": check the current keyboard map configuration and change that if\n"
+"necessary.\n"
 "\n"
-" * \"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list.\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
 "\n"
-" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
-"country you have chosen. You can click on the \"Configure\" button here if\n"
-"this is not correct.\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
 "\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary.\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
 "\n"
-" * \"Printer\": clicking on the \"Configure\" button will open the printer\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
 "presented there is similar to the one used during installation.\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. If you notice the sound card displayed is not the one that\n"
-"is actually present on your system, you can click on the button and choose\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
 "another driver.\n"
 "\n"
-" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
-"interface in \"800x600\" or \"1024x768\" resolution. If that does not suits\n"
-"you, click on \"Configure\" to reconfigure your graphical interface.\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. If you have a TV card and it is not detected, click on \"Configure\"\n"
-"to try to configure it manually.\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on \"Configure\" to change the parameters\n"
-"associated with the card.\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
 "\n"
-" * \"Network\": If you want to configure your Internet or local network\n"
-"access now.\n"
+" * \"%s\": If you want to configure your Internet or local network access\n"
+"now.\n"
 "\n"
-" * \"Security Level\": this entry offers you to redefine the security level\n"
-"as set in a previous step ().\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
 "\n"
-" * \"Firewall\": if you plan to connect your machine to the Internet, it's\n"
-"a good idea to protect you from intrusions by setting up a firewall.\n"
-"Consult the corresponding section of the ``Starter Guide'' for details\n"
-"about firewall settings.\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
 "\n"
-" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
-"click that button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
 "\n"
-" * \"Services\": you'll be able here to control finely which services will\n"
-"be run on your machine. If you plan to use this machine as a server it's a\n"
-"good idea to review this setup."
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
 msgstr ""
 "Nun bekommen Sie eine Zusammenfassung verschiedener Informationen Ihres\n"
 "Systems. Je nach vorhandener Hardware sehen Sie hier (oder eben nicht) die\n"
 "folgende Eintrц╓ge. Jeder Eintrag besteht aus einem konfigurierbaren Gerц╓t\n"
-"gefolgt vom dessen aktuellen Zustand. Durch betц╓tigen der Schaltflц╓che\n"
-"Б─·KonfigurierenБ─° kц╤nnen Sie diesen ц╓ndern.\n"
+"gefolgt vom dessen aktuellen Zustand. Durch betц╓tigen der Schaltflц╓che Б─·%sБ─°\n"
+"kц╤nnen Sie diesen ц╓ndern.\n"
 "\n"
-" * Б─·TastaturБ─°: Kontrollieren Sie die aktuelle Tastaturvorgabe und wц╓hlen\n"
-"Sie die Schaltflц╓che, falls Sie die Vorgabe ц╓ndern wollen.\n"
+" * Б─·%sБ─°: Kontrollieren Sie die aktuelle Tastaturvorgabe und wц╓hlen Sie die\n"
+"Schaltflц╓che, falls Sie die Vorgabe ц╓ndern wollen.\n"
 "\n"
-" * Б─·StaatБ─°: Б─·StaatБ─°: Kontrollieren Sie, ob die Auswahl des Staates, in dem\n"
-"Sie sich befinden korrekt ist. Falls nicht, betц╓tigen Sie bitte die\n"
-"Schaltflц╓che Б─·KonfigurierenБ─° und wц╓hlen Sie den richtigen. Ist Ihr Staat\n"
-"nicht in der Liste, die Sie gezeigt bekommen, kц╤nnen Sie ц╪ber die\n"
-"Schaltflц╓che Б─·MehrБ─° eine vollstц╓ndigere Liste erzwingen.\n"
+" * Б─·%sБ─°: Б─·%sБ─°: Kontrollieren Sie, ob die Auswahl des Staates, in dem Sie\n"
+"sich befinden korrekt ist. Falls nicht, betц╓tigen Sie bitte die\n"
+"Schaltflц╓che Б─·%sБ─° und wц╓hlen Sie den richtigen. Ist Ihr Staat nicht in der\n"
+"Liste, die Sie gezeigt bekommen, kц╤nnen Sie ц╪ber die Schaltflц╓che Б─·%sБ─° eine\n"
+"vollstц╓ndigere Liste erzwingen.\n"
 "\n"
-" * Б─·ZeitzoneБ─°: Б─·DrakXБ─° versucht die Zeitzone anhand des gewц╓hlten Staates\n"
-"zu setzen. Sollte diese Auswahl nicht korrekt sein (manche Staaten etwa\n"
+" * Б─·%sБ─°: Б─·DrakXБ─° versucht die Zeitzone anhand des gewц╓hlten Staates zu\n"
+"setzen. Sollte diese Auswahl nicht korrekt sein (manche Staaten etwa\n"
 "ц╪berspannen mehrere Zeitzonen) kц╤nnen Sie durch betц╓tige der Schaltflц╓che\n"
-"Б─·KonfigurierenБ─° Ihre lokale Zeitzone setzen.\n"
+"Б─·%sБ─° Ihre lokale Zeitzone setzen.\n"
 "\n"
-" * Б─·MausБ─°: Kontrollieren Sie die konfigurierte Maus und betц╓tigen Sie,\n"
-"falls notwendig, die Schaltflц╓che.\n"
+" * Б─·%sБ─°: Kontrollieren Sie die konfigurierte Maus und betц╓tigen Sie, falls\n"
+"notwendig, die Schaltflц╓che.\n"
 "\n"
-" * Б─·DruckerБ─°: Durch Anwahl der Schaltflц╓che Б─·KonfigurierenБ─° startet den\n"
-"Druckerassistenten. Weitere Informationen zu diesem Assistenten erhalten\n"
-"Sie im Drucker-Kapitel des Б─·Starter HandbuchБ─°. Das dort vorgestellte\n"
-"Programm entspricht dem wц╓hrend der Installation angebotenen.\n"
+" * Б─·%sБ─°: Durch Anwahl der Schaltflц╓che Б─·%sБ─° startet den Druckerassistenten.\n"
+"Weitere Informationen zu diesem Assistenten erhalten Sie im Drucker-Kapitel\n"
+"des Б─·Starter HandbuchБ─°. Das dort vorgestellte Programm entspricht dem\n"
+"wц╓hrend der Installation angebotenen.\n"
 "\n"
-" * Б─·SoundkarteБ─°: Falls eine Soundkarte in Ihrem Rechner gefunden wurde,\n"
-"wird sie hier angezeigt. Sollte die von DrakX getroffene Auswahl nicht\n"
-"korrekt sein, betц╓tigen Sie einfach die Schaltflц╓che, um sie zu\n"
-"korrigieren.\n"
+" * Б─·%sБ─°: Falls eine Soundkarte in Ihrem Rechner gefunden wurde, wird sie\n"
+"hier angezeigt. Sollte die von DrakX getroffene Auswahl nicht korrekt sein,\n"
+"betц╓tigen Sie einfach die Schaltflц╓che, um sie zu korrigieren.\n"
 "\n"
-" * Б─·GrafikumgebungБ─°: DrakX richtet Ihre Grafikumgebung normalerweise in der\n"
-"Auflц╤sung Б─·800ц≈600Б─° bzw. Б─·1024ц≈768Б─° ein. Sollte Ihnen das nicht zusagen,\n"
-"kц╤nnen Sie es durch betц╓tigen der Schaltflц╓che Б─·KonfigurierenБ─° ц╓ndern.\n"
+" * Б─·%sБ─°: DrakX richtet Ihre Grafikumgebung normalerweise in der Auflц╤sung\n"
+"Б─·800ц≈600Б─° bzw. Б─·1024ц≈768Б─° ein. Sollte Ihnen das nicht zusagen, kц╤nnen Sie\n"
+"es durch betц╓tigen der Schaltflц╓che Б─·%sБ─° ц╓ndern.\n"
 "\n"
-" * Б─·TV-KarteБ─°: Falls eine TV-Karte in Ihrem Rechner gefunden wurde, wird\n"
-"sie hier angezeigt. Falls Sie eine TV-Karte besitzen, die hier nicht\n"
-"richtig erkannt wurde, kц╤nnen Sie versuchen, diese manuell einzurichten.\n"
-"Betц╓tigen Sie einfach die Schaltflц╓che Б─·KonfigurierenБ─°.\n"
+" * Б─·%sБ─°: Falls eine TV-Karte in Ihrem Rechner gefunden wurde, wird sie hier\n"
+"angezeigt. Falls Sie eine TV-Karte besitzen, die hier nicht richtig erkannt\n"
+"wurde, kц╤nnen Sie versuchen, diese manuell einzurichten. Betц╓tigen Sie\n"
+"einfach die Schaltflц╓che Б─·%sБ─°.\n"
 "\n"
-" * Б─·ISDN KarteБ─°: Falls eine ISDN Karte in Ihrem Rechner gefunden wurde,\n"
-"wird sie hier angezeigt. Durch Anwahl der Schaltflц╓che\n"
-"Б─·KonfigurierenБ─°kц╤nnen Sie die Parameter ц╓ndern.\n"
+" * Б─·%sБ─°: Falls eine ISDN Karte in Ihrem Rechner gefunden wurde, wird sie\n"
+"hier angezeigt. Durch Anwahl der Schaltflц╓che Б─·%sБ─°kц╤nnen Sie die Parameter\n"
+"ц╓ndern.\n"
 "\n"
-" * Б─·NetzwerkБ─°: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
+" * Б─·%sБ─°: Falls Sie Ihren Internetzugang oder Ihr lokales Netzwerk nun\n"
 "einrichten wollen, kц╤nnen Sie das hier tun.\n"
 "\n"
-" * Б─·SicherheitsebeneБ─°: Dieser Eintrag ermц╤glicht es Ihnen, die\n"
-"Sicherheitsebene Ihres Systems zu ц╓ndern, die Sie in einem frц╪heren\n"
-"Installationsschritt () gewц╓hlt haben.\n"
+" * Б─·%sБ─°: Dieser Eintrag ermц╤glicht es Ihnen, die Sicherheitsebene Ihres\n"
+"Systems zu ц╓ndern, die Sie in einem frц╪heren Installationsschritt ()\n"
+"gewц╓hlt haben.\n"
 "\n"
-" * Б─·FirewallБ─°: Falls Sie Ihren Rechner mit dem Internet verbinden wollen,\n"
-"ist es sinnvoll sich vor ungebetenen Eindringlingen durch einrichten einer\n"
+" * Б─·%sБ─°: Falls Sie Ihren Rechner mit dem Internet verbinden wollen, ist es\n"
+"sinnvoll sich vor ungebetenen Eindringlingen durch einrichten einer\n"
 "Firewall zu schц╪tzen. Lesen Sie das entsprechende Kapitel im Б─·Starter\n"
 "HandbuchБ─°, wenn Sie weitere Informationen benц╤tigen.\n"
 "\n"
-" * Б─·BetriebssystemstarterБ─°: Falls Sie die Konfiguration Ihres\n"
-"Betriebssystemstarters ц╓ndern wollen, wц╓hlen Sie diese Schaltflц╓che. Es sei\n"
-"angemerkt, dass dieser Punkt sich an fortgeschrittenere Nutzer richtet.\n"
+" * Б─·%sБ─°: Falls Sie die Konfiguration Ihres Betriebssystemstarters ц╓ndern\n"
+"wollen, wц╓hlen Sie diese Schaltflц╓che. Es sei angemerkt, dass dieser Punkt\n"
+"sich an fortgeschrittenere Nutzer richtet.\n"
 "\n"
-" * Б─·DiensteБ─°: Sie kц╤nnen hier die Dienste wц╓hlen, die ab dem Start von\n"
-"Mandrake Linux zur Verfц╪gung gestellt werden sollen. Wollen Sie den Rechner\n"
-"als Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste\n"
-"werfen."
+" * Б─·%sБ─°: Sie kц╤nnen hier die Dienste wц╓hlen, die ab dem Start von Mandrake\n"
+"Linux zur Verfц╪gung gestellt werden sollen. Wollen Sie den Rechner als\n"
+"Server verwenden, sollten Sie unbedingt einen Blick auf diese Liste werfen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Falls fц╪r Ihre Karte verschiedene Server zur Verfц╪gung stehen, etwa mit und\n"
 "ohne 3D-Beschleunigung, werden Sie gebeten, den zu wц╓hlen, der Ihren\n"
@@ -1462,7 +1430,7 @@ msgid ""
 "a PS/2, serial or USB interface.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
-"from the provided list.\n"
+"from the list provided.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
@@ -1473,11 +1441,11 @@ msgid ""
 "Wheel mice are occasionally not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
-"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
-"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
-"the buttons and check that the mouse pointer moves on-screen as you move\n"
-"your mouse."
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
 msgstr ""
 "Б─·DrakXБ─° versucht normalerweise die Anzahl Tasten Ihrer Maus zu erkennen.\n"
 "Sollte das nicht mц╤glich sein, so behandelt es Ihre Maus als\n"
@@ -1498,19 +1466,19 @@ msgstr ""
 "Es kommt vor, dass Mц╓use mit Rц╓dern nicht korrekt erkannt werden. Wц╓hlen\n"
 "Sie in diesem Fall die richtige Maus aus der vorgegebenen Liste. Stellen\n"
 "Sie sicher, dass Sie auch den Anschluss richtig angegeben haben. Nach\n"
-"betц╓tigen der Schaltflц╓che Б─·Weiter->Б─°, wird Ihnen ein Bild der gewц╓hlten\n"
-"Maus gezeigt. Bewegen Sie Rц╓der und Tasten, um sicherzustellen, dass die\n"
-"Maus richtig erkannt wurde."
+"betц╓tigen der Schaltflц╓che Б─·%sБ─°, wird Ihnen ein Bild der gewц╓hlten Maus\n"
+"gezeigt. Bewegen Sie Rц╓der und Tasten, um sicherzustellen, dass die Maus\n"
+"richtig erkannt wurde."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"Next\n"
-"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
-"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
-"also choose not to configure the network, or to do it later, in which case\n"
-"clicking the \"Cancel\" button will take you to the next step.\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\n"
+"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
+"configure the network, or to do it later, in which case clicking the \"%s\"\n"
+"button will take you to the next step.\n"
 "\n"
 "When configuring your network, the available connections options are:\n"
 "traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
@@ -1525,13 +1493,13 @@ msgid ""
 "installed and use the program described there to configure your connection."
 msgstr ""
 "Wenn Sie Ihren Computer mit dem Internet oder mit einem lokalen Netzwerk\n"
-"verbinden wollen, dann betц╓tigen Sie die Schaltflц╓che Б─·Weiter ->Б─°. Bitte\n"
-"schalten Sie jedoch zuvor, falls nц╤tig, die dafц╪r benц╤tigten Gerц╓te ein,\n"
-"damit Б─·DrakXБ─° sie automatisch erkennen kann. Sollte die automatische\n"
-"Erkennung nicht korrekt erfolgen, kц╤nnen Sie es erneut versuchen, nachdem\n"
-"Sie die Markierung der Option Б─·Autoerkennung benutzenБ─° entfernt haben.\n"
-"Betц╓tigung der Schaltflц╓che Б─·AbbruchБ─° bringt Sie weiter zum nц╓chsten\n"
-"Installationsschritt ohne Ihr Netzwerk einzurichten.\n"
+"verbinden wollen, dann betц╓tigen Sie die Schaltflц╓che Б─·%sБ─°. Bitte schalten\n"
+"Sie jedoch zuvor, falls nц╤tig, die dafц╪r benц╤tigten Gerц╓te ein, damit\n"
+"Б─·DrakXБ─° sie automatisch erkennen kann. Sollte die automatische Erkennung\n"
+"nicht korrekt erfolgen, kц╤nnen Sie es erneut versuchen, nachdem Sie die\n"
+"Markierung der Option Б─·%sБ─° entfernt haben. Betц╓tigung der Schaltflц╓che Б─·%sБ─°\n"
+"bringt Sie weiter zum nц╓chsten Installationsschritt ohne Ihr Netzwerk\n"
+"einzurichten.\n"
 "\n"
 "Zur Auswahl stehen folgende Verbindungsarten: Herkц╤mmliches Modem, ISDN\n"
 "Modem, ADSL Verbindung, Kabelmodem oder eine einfache LAN Verbindung\n"
@@ -1551,27 +1519,26 @@ msgstr ""
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
 "covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
-"computer."
+"terms in it, check the \"%s\" box. If not, simply turn off your computer."
 msgstr ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
 "die gesamte Mandrake Linux Distribution. Sollten Sie nicht in allen Punkten\n"
-"zustimmen, betц╓tigen Sie bitte die Schaltflц╓che Б─·Zurц╪ckweisenБ─°, um die\n"
-"Installation abzubrechen. Um mit der Installation fortzufahren, betц╓tigen\n"
-"Sie die Schaltflц╓che Б─·AkzeptierenБ─°."
+"zustimmen, betц╓tigen Sie bitte die Schaltflц╓che Б─·%sБ─°, um die Installation\n"
+"abzubrechen. Um mit der Installation fortzufahren, betц╓tigen Sie die\n"
+"Schaltflц╓che Б─·%sБ─°."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Grafikkarte\n"
 "\n"
@@ -1590,8 +1557,8 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not always needed at\n"
-"boot time.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
 "selected. However, if you are not sure whether a service is useful or not,\n"
@@ -1627,9 +1594,9 @@ msgstr ""
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own."
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
 msgstr ""
 "Monitor\n"
 "\n"
@@ -1643,15 +1610,15 @@ msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
 "motherboard is set to local time, you may deactivate this by unselecting\n"
-"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
-"system clock and the hardware clock are in the same timezone. This is\n"
-"useful when the machine also hosts another operating system like Windows.\n"
-"\n"
-"The \"Automatic time synchronization \" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. For this\n"
-"feature to work, you must have a working Internet connection. It is best to\n"
-"choose a time server located near you. This option actually installs a time\n"
-"server that can used by other machines on your local network."
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same timezone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can used by\n"
+"other machines on your local network as well."
 msgstr ""
 "GNU/Linux arbeitet mit GMT (Greenwich Mean Time) und ц╪bersetzt diese anhand\n"
 "der Zeitzone in Ihre lokale Zeit.\n"
@@ -1660,15 +1627,15 @@ msgstr ""
 "Б─·NeinБ─° wц╓hlen, falls Sie auch ein Betriebssystem aus dem Hause Microsoft\n"
 "auf Ihrem Rechner Б─·beherbergenБ─°.\n"
 "\n"
-"Die Verwendung der Option Б─·Automatische Zeit-SynchronisationБ─° reguliert\n"
-"Ihre Uhr, indem sie Verbindung mit einem Zeitserver im Internet aufnimmt.\n"
-"Wц╓hlen Sie aus der Liste einen Server in Ihrer Nц╓he. Damit die funktioniert\n"
-"benц╤tigen Sie eine stц╓ndige Internetverbindung."
+"Die Verwendung der Option Б─·%sБ─° reguliert Ihre Uhr, indem sie Verbindung mit\n"
+"einem Zeitserver im Internet aufnimmt. Wц╓hlen Sie aus der Liste einen\n"
+"Server in Ihrer Nц╓he. Damit die funktioniert benц╤tigen Sie eine stц╓ndige\n"
+"Internetverbindung."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"Here are Listed the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -1732,16 +1699,16 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
-"\"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list."
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
 msgstr ""
-"Б─·StaatБ─°: Б─·StaatБ─°: Kontrollieren Sie, ob die Auswahl des Staates, in dem Sie\n"
-"sich befinden korrekt ist. Falls nicht, betц╓tigen Sie bitte die\n"
-"Schaltflц╓che Б─·KonfigurierenБ─° und wц╓hlen Sie den richtigen. Ist Ihr Staat\n"
-"nicht in der Liste, die Sie gezeigt bekommen, kц╤nnen Sie ц╪ber die\n"
-"Schaltflц╓che Б─·MehrБ─° eine vollstц╓ndigere Liste erzwingen."
+"Б─·%sБ─°: Б─·%sБ─°: Kontrollieren Sie, ob die Auswahl des Staates, in dem Sie sich\n"
+"befinden korrekt ist. Falls nicht, betц╓tigen Sie bitte die Schaltflц╓che\n"
+"Б─·%sБ─° und wц╓hlen Sie den richtigen. Ist Ihr Staat nicht in der Liste, die\n"
+"Sie gezeigt bekommen, kц╤nnen Sie ц╪ber die Schaltflц╓che Б─·%sБ─° eine\n"
+"vollstц╓ndigere Liste erzwingen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1763,13 +1730,13 @@ msgid ""
 "the selected partitions will be deleted and you will not be able to recover\n"
 "it.\n"
 "\n"
-"Click on \"Next ->\" when you are ready to format partitions.\n"
+"Click on \"%s\" when you are ready to format partitions.\n"
 "\n"
-"Click on \"<- Previous\" if you want to choose another partition for your\n"
-"new Mandrake Linux operating system installation.\n"
+"Click on \"%s\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
+"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"bad blocks on the disk."
 msgstr ""
 "Alle Partitionen, die gerade neu erzeugt wurden, mц╪ssen formatiert werden\n"
 "(d.h. es muss ein Dateisystem auf der Partition erstellt werden), bevor sie\n"
@@ -1789,28 +1756,27 @@ msgstr ""
 "sind alle zuvor darauf existierenden Daten unwiederbringlich verloren.\n"
 "\n"
 "Wenn Sie alle Einstellungen vorgenommen haben, betц╓tigen Sie die\n"
-"Schaltflц╓che Б─·Weiter ->Б─°, um mit dem Formatieren der Partitionen zu\n"
-"beginnen.\n"
+"Schaltflц╓che Б─·%sБ─°, um mit dem Formatieren der Partitionen zu beginnen.\n"
 "\n"
-"Betц╓tigen Sie Б─·<- Zurц╪ckБ─°, wenn Sie eine andere Partition fц╪r Ihr neues\n"
-"Mandrake Linux vorgesehen haben.\n"
+"Betц╓tigen Sie Б─·%sБ─°, wenn Sie eine andere Partition fц╪r Ihr neues Mandrake\n"
+"Linux vorgesehen haben.\n"
 "\n"
-"Betц╓tigen Sie die Schaltflц╓che Б─·FortgeschrittenБ─°, falls Sie Partitionen auf\n"
-"defekte Blц╤cke untersuchen wollen."
+"Betц╓tigen Sie die Schaltflц╓che Б─·%sБ─°, falls Sie Partitionen auf defekte\n"
+"Blц╤cke untersuchen wollen."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "Depending on the default language you chose in Section , DrakX will\n"
 "automatically select a particular type of keyboard configuration. However,\n"
-"you might not have a keyboard that corresponds exactly to your language:\n"
-"for example, if you are an English speaking Swiss person, you may have a\n"
-"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
-"find yourself in the same situation where your native language and keyboard\n"
-"do not match. In either case, this installation step will allow you to\n"
-"select an appropriate keyboard from a list.\n"
-"\n"
-"Click on the \"More \" button to be presented with the complete list of\n"
+"you may not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may have a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation where your native language and keyboard do\n"
+"not match. In either case, this installation step will allow you to select\n"
+"an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
@@ -1825,8 +1791,8 @@ msgstr ""
 "besitzen. Wц╓hlen Sie einfach ein passendes Layout aus der Liste.\n"
 "\n"
 "Sollten Sie eine andere als die zur gewц╓hlten Sprache gehц╤rende Tastatur\n"
-"verwenden wollen, wц╓hlen Sie die Schaltflц╓che Б─·MehrБ─°. Sie erhalten dann\n"
-"eine Liste aller unterstц╪tzten Tastaturen.\n"
+"verwenden wollen, wц╓hlen Sie die Schaltflц╓che Б─·%sБ─°. Sie erhalten dann eine\n"
+"Liste aller unterstц╪tzten Tastaturen.\n"
 "\n"
 "Sollten Sie sich fц╪r ein Tastaturlayout einer nicht lateinischen Sprache\n"
 "entschieden haben, werden Sie im nц╓chsten Schritt gefragt, mit welcher\n"
@@ -1837,32 +1803,31 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"Next ->\" to reboot the system. The first thing\n"
-"you should see after your computer has finished doing its hardware tests is\n"
-"the bootloader menu, giving you the choice of which operating system to\n"
-"start.\n"
+"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
 "\n"
-"The \"Advanced\" button shows two more buttons to:\n"
+"The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"that will automatically perform a whole installation without the help of an\n"
-"operator, similar to the installation you just configured.\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
 "\n"
 "   Note that two different options are available after clicking the button:\n"
 "\n"
-"    * \"Replay\". This is a partially automated installation. The\n"
-"partitioning step is the only interactive procedure.\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
 "\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
 "   This feature is very handy when installing a number of similar machines.\n"
 "See the Auto install section on our web site for more information.\n"
 "\n"
-" * \"Save packages selection\"(*): saves a list of the package selected in\n"
-"this installation. To use this selection with another installation, insert\n"
-"the floppy and start the installation. At the prompt, press the [F1] key\n"
-"and type >>linux defcfg=\"floppy\" <<.\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<.\n"
 "\n"
 "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
 "\"mformat a:\")"
@@ -1870,34 +1835,33 @@ msgstr ""
 "Nun ist es soweit, die Installation ist abgeschlossen und Ihr neues\n"
 "Betriebssystem sollte einsatzbereit sein. Bei einem Neustart kц╤nnen Sie\n"
 "zwischen den auf Ihrer Platte installierten Betriebssystemen auswц╓hlen.\n"
-"Klicken Sie nur noch auf Б─·OKБ─° und das System wird neu gestartet.\n"
+"Klicken Sie nur noch auf Б─·%sБ─° und das System wird neu gestartet.\n"
 "\n"
-"Die Schaltflц╓che Б─·FortgeschrittenБ─° liefert zwei weitere Schaltflц╓chen:\n"
+"Die Schaltflц╓che Б─·%sБ─° liefert zwei weitere Schaltflц╓chen:\n"
 "\n"
-" * Б─·Erstellen einer Auto-InstallationsdisketteБ─°: Hiermit kц╤nnen Sie eine\n"
-"Installationsdiskette erstellen, mit deren Hilfe Sie eine identische\n"
-"automatische Installation ohne Interaktion eines Administrators\n"
-"durchzufц╪hren kц╤nnen.\n"
+" * Б─·%sБ─°: Hiermit kц╤nnen Sie eine Installationsdiskette erstellen, mit deren\n"
+"Hilfe Sie eine identische automatische Installation ohne Interaktion eines\n"
+"Administrators durchzufц╪hren kц╤nnen.\n"
 "\n"
 "   Es gibt zwei verschiedene Alternativen, nachdem Sie diese Schaltflц╓che\n"
 "aktiviert haben:\n"
 "\n"
-"    * Б─·Erneut abspielenБ─°: Diese Installation ist nur teilweise automatisch,\n"
-"da der Partitionierungsschritt (aber nur dieser!) immer noch interaktiv\n"
-"vonstatten geht.\n"
+"    * Б─·%sБ─°: Diese Installation ist nur teilweise automatisch, da der\n"
+"Partitionierungsschritt (aber nur dieser!) immer noch interaktiv vonstatten\n"
+"geht.\n"
 "\n"
-"    * Б─·AutomatisiertБ─°: Vollautomatische Installation: Die Festplatte wird\n"
-"vollstц╓ndig reorganisiert. Alle darauf vorhandenen Daten gehen verloren!\n"
+"    * Б─·%sБ─°: Vollautomatische Installation: Die Festplatte wird vollstц╓ndig\n"
+"reorganisiert. Alle darauf vorhandenen Daten gehen verloren!\n"
 "\n"
 "   Diese Funktion ist besonders nц╪tzlich, wenn man eine Menge von\n"
 "identischer Rechner einrichten will. Weitere Informationen erhalten Sie\n"
 "auch auf der Seite Auto install\n"
 "\n"
-" * Б─·Paketauswahl speichernБ─°:(*) Sie speichern damit die Paketauswahl, die\n"
-"Sie vorher getroffen haben. Wenn Sie spц╓ter eine erneute Installation\n"
-"vornehmen wollen, legen Sie einfach die Diskette ins Laufwerk und starten\n"
-"Sie die Installation mittels [F1] an der ersten Eingabeaufforderung. Geben\n"
-"Sie dann б╩linux defcfg=\"floppy\"б╚ ein.\n"
+" * Б─·%sБ─°:(*) Sie speichern damit die Paketauswahl, die Sie vorher getroffen\n"
+"haben. Wenn Sie spц╓ter eine erneute Installation vornehmen wollen, legen\n"
+"Sie einfach die Diskette ins Laufwerk und starten Sie die Installation\n"
+"mittels [F1] an der ersten Eingabeaufforderung. Geben Sie dann б╩linux\n"
+"defcfg=\"floppy\"б╚ ein.\n"
 "\n"
 "(*) Sie benц╤tigen eine FAT formatierte Diskette (Mittels Б─·mformat a:Б─°\n"
 "kц╤nnen Sie unter GNU/Linux eine solche erstellen)."
@@ -1907,7 +1871,7 @@ msgstr ""
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
-"defined, either from a previous installation of GNU/Linux or from another\n"
+"defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
@@ -1917,43 +1881,40 @@ msgid ""
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
-" * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
 "\n"
-" * \"Auto allocate\": this option enables you to automatically create ext3\n"
-"and swap partitions in free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
 "\n"
-"\"More\": gives access to additional features:\n"
+"\"%s\": gives access to additional features:\n"
 "\n"
-" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery, if necessary. It is strongly\n"
-"recommended that you perform this step.\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows you to restore a previously saved\n"
-"partition table from a floppy disk.\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"doesn't always work.\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and reloads the\n"
-"partition table that was originally on the hard drive.\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
 "\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
-"users to manually mount and unmount removable medias such as floppies and\n"
-"CD-ROMs.\n"
+" * \"%s\": unchecking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good\n"
-"understanding of partitioning.\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+" * \"%s\": use this option to cancel your changes.\n"
 "\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information about the\n"
-"hard drive.\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1992,45 +1953,43 @@ msgstr ""
 "Um die gewц╓hlte Platte zu partitionieren stehen folgende Mц╤glichkeiten zur\n"
 "Verfц╪gung:\n"
 "\n"
-" * Б─·Alles lц╤schenБ─°: Betц╓tigen dieser Schaltflц╓che lц╤scht alle Partitionen\n"
-"auf der markierten Festplatte.\n"
+" * Б─·%sБ─°: Betц╓tigen dieser Schaltflц╓che lц╤scht alle Partitionen auf der\n"
+"markierten Festplatte.\n"
 "\n"
-" * Б─·Automatisches ErstellenБ─°: Dieser Punkt aktiviert die automatische ext3-\n"
-"und Swap-Partitionen-Erstellung im ungenutzten Bereich Ihrer Festplatte.\n"
+" * Б─·%sБ─°: Dieser Punkt aktiviert die automatische ext3- und\n"
+"Swap-Partitionen-Erstellung im ungenutzten Bereich Ihrer Festplatte.\n"
 "\n"
-"Б─·MehrБ─°: bietet Zugriff auf weitere Mц╤glichkeiten:\n"
+"Б─·%sБ─°: bietet Zugriff auf weitere Mц╤glichkeiten:\n"
 "\n"
-" * Б─·Partitionstabelle schreibenБ─°: Falls Sie Ihre aktuelle Partitionstabelle\n"
-"auf Diskette speichern wollen, falls Sie sie spц╓ter wiederherstellen\n"
-"wollen, kц╤nnen Sie das mit Hilfe dieser Schaltflц╓che tun.\n"
+" * Б─·%sБ─°: Falls Sie Ihre aktuelle Partitionstabelle auf Diskette speichern\n"
+"wollen, falls Sie sie spц╓ter wiederherstellen wollen, kц╤nnen Sie das mit\n"
+"Hilfe dieser Schaltflц╓che tun.\n"
 "\n"
-" * Б─·Partitionstabelle wiederherstellenБ─°: Mit dieser Schaltflц╓che kц╤nnen Sie\n"
-"eine vorher auf Diskette gesicherte Partitionstabelle wieder herstellen.\n"
+" * Б─·%sБ─°: Mit dieser Schaltflц╓che kц╤nnen Sie eine vorher auf Diskette\n"
+"gesicherte Partitionstabelle wieder herstellen.\n"
 "\n"
-" * Б─·Partitionstabelle rettenБ─°: Sollte Ihre Partitionstabelle zerstц╤rt\n"
-"worden sein, kц╤nnen Sie versuchen, mit dieser Schaltflц╓che eine\n"
-"Restaurierung vorzunehmen. Seien Sie vorsichtig! es ist nicht\n"
-"unwahrscheinlich, dass dieser Versuch fehl schlц╓gt.\n"
+" * Б─·%sБ─°: Sollte Ihre Partitionstabelle zerstц╤rt worden sein, kц╤nnen Sie\n"
+"versuchen, mit dieser Schaltflц╓che eine Restaurierung vorzunehmen. Seien\n"
+"Sie vorsichtig! es ist nicht unwahrscheinlich, dass dieser Versuch fehl\n"
+"schlц╓gt.\n"
 "\n"
-" * Б─·Partitionstabelle neu ladenБ─°: Alle ц└nderungen verwerfen und mit der\n"
-"ursprц╪nglichen Partitionstabelle neu beginnen.\n"
+" * Б─·%sБ─°: Alle ц└nderungen verwerfen und mit der ursprц╪nglichen\n"
+"Partitionstabelle neu beginnen.\n"
 "\n"
-" * Б─·Wechselmedien automatisch Einhц╓ngenБ─°: Entfernen dieser Markierung fц╪hrt\n"
-"dazu, dass die Anwender hinterher die Wechselmedien manuell ein- und\n"
-"aushц╓ngen mц╪ssen.\n"
+" * Б─·%sБ─°: Entfernen dieser Markierung fц╪hrt dazu, dass die Anwender\n"
+"hinterher die Wechselmedien manuell ein- und aushц╓ngen mц╪ssen.\n"
 "\n"
-" * Б─·AssistentБ─°: Falls Sie keine Ahnung haben wie Sie die Festplatte\n"
-"partitionieren sollen, wц╓hlen Sie diese Schaltflц╓che. Sie ц╪berlassen damit\n"
-"die gesamte Arbeit unserem Assistenten, der mittels Б─·Abra KadabraБ─°(TM) Ihre\n"
-"Platte partitioniert.\n"
+" * Б─·%sБ─°: Falls Sie keine Ahnung haben wie Sie die Festplatte partitionieren\n"
+"sollen, wц╓hlen Sie diese Schaltflц╓che. Sie ц╪berlassen damit die gesamte\n"
+"Arbeit unserem Assistenten, der mittels Б─·Abra KadabraБ─°(TM) Ihre Platte\n"
+"partitioniert.\n"
 "\n"
-" * Б─·Rц╪ckgц╓ngigБ─°: Mit dieser Schaltflц╓che kц╤nnen Sie alle Einstellungen\n"
-"rц╪ckgц╓ngig machen.\n"
+" * Б─·%sБ─°: Mit dieser Schaltflц╓che kц╤nnen Sie alle Einstellungen rц╪ckgц╓ngig\n"
+"machen.\n"
 "\n"
-" * Б─·In den Experten-/ Normal-Modus wechselnБ─°: Anbieten bzw. Maskieren von\n"
-"Zusatzmц╤glichkeiten.\n"
+" * Б─·%sБ─°: Anbieten bzw. Maskieren von Zusatzmц╤glichkeiten.\n"
 "\n"
-" * Б─·FertigБ─°: Nachdem Sie das Partitionieren Ihrer Festplatte beendet haben,\n"
+" * Б─·%sБ─°: Nachdem Sie das Partitionieren Ihrer Festplatte beendet haben,\n"
 "aktivieren Sie diese Schaltflц╓che, um Ihre ц└nderungen zu speichern.\n"
 "\n"
 "Wenn Sie die Grц╤ц÷e einer Partition festlegen wollen, kц╤nnen Sie die\n"
diff --git a/perl-install/share/po/help-es.pot b/perl-install/share/po/help-es.pot
index d340d2013..66310ef0e 100644
--- a/perl-install/share/po/help-es.pot
+++ b/perl-install/share/po/help-es.pot
@@ -1,3 +1,6 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -18,51 +21,49 @@ msgid ""
 "\n"
 "Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Use free space\": this option will perform an automatic partitioning\n"
-"of your blank drive(s). If you use this option there will be no further\n"
-"prompts.\n"
-"\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated with\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and for the most part it's a good idea to keep them.\n"
-"\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see ``Erase entire disk'' solution)\n"
-"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
-"without the loss of any data, provided you previously defragment the\n"
-"Windows partition and that it uses the FAT format. Backing up your data is\n"
-"strongly recommended.. Using this option is recommended if you want to use\n"
-"both Mandrake Linux and Microsoft Windows on the same computer.\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
+"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
+"partition. Resizing can be performed without the loss of any data, provided\n"
+"you have previously defragmented the Windows partition and that it uses the\n"
+"FAT format. Backing up your data is strongly recommended.. Using this\n"
+"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
 "then when you started. You will have less free space under Microsoft\n"
 "Windows to store your data or to install new software.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful, because you will not be able to\n"
-"undo your choice after you confirm.\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"Custom disk partitioning\": choose this option if you want to manually\n"
-"partition your hard drive. Be careful -- it is a powerful but dangerous\n"
-"choice and you can very easily lose all your data. That's why this option\n"
-"is really only recommended if you have done something like this before and\n"
-"have some experience. For more instructions on how to use the DiskDrake\n"
-"utility, refer to the ``Managing Your Partitions '' section in the\n"
-"``Starter Guide''."
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
+"Guide''."
 msgstr ""
 "Ahora necesita elegir el lugar de su disco rц╜gido donde se instalarц║ su\n"
 "sistema operativo Mandrake Linux. Si su disco rц╜gido estц║ vacц╜o o si un\n"
@@ -81,63 +82,60 @@ msgstr ""
 "Dependiendo de la configuraciцЁn de su disco rц╜gido, estц║n disponibles\n"
 "varias opciones:\n"
 "\n"
-" * \"Usar espacio libre\": esta opciцЁn simplemente llevarц║ a un\n"
-"particionado automц║tico de su(s) disco(s) vacц╜o(s). Si elige esta opciцЁn,\n"
-"no se le pedirц║n mц║s detalles ni se le formularц║n mц║s preguntas.\n"
-"\n"
-" * \"Usar particiцЁn existente\": el asistente ha detectado una o mц║s\n"
-"particiones Linux existentes en su disco rц╜gido. Si desea utilizarlas,\n"
-"elija esta opciцЁn. Entonces se le pedirц║ que elija los puntos de montaje\n"
-"asociados a cada una de las particiones. Los puntos de montaje legados se\n"
-"seleccionan automц║ticamente, y por lo general deberц╜a mantenerlos.\n"
-"\n"
-" * \"Usar el espacio libre en la particiцЁn Windows\": si Microsoft Windows\n"
-"estц║ instalado en su disco rц╜gido y ocupa todo el espacio disponible en el\n"
-"mismo, Usted tiene que liberar espacio para los datos de Linux. Para\n"
-"hacerlo, puede borrar su particiцЁn y datos Microsoft Windows (vea la\n"
-"soluciцЁn \"Borrar el disco completo\") o cambie el tamaц╠o de su particiцЁn\n"
-"Microsoft Windows FAT. El cambio de tamaц╠o se puede realizar sin la pц╘rdida\n"
-"de datos, siempre y cuando Usted haya desfragmentado con anterioridad la\n"
-"particiцЁn Windows y que la misma utiliza el formato FAT. Es altamente\n"
-"recomendable hacer una copia de respaldo de sus datos.. Se recomienda usar\n"
-"esta soluciцЁn si desea utilizar tanto Mandrake Linux como Microsoft Windows\n"
-"en la misma computadora.\n"
+" * \"%s\": esta opciцЁn simplemente llevarц║ a un particionado automц║tico de\n"
+"su(s) disco(s) vacц╜o(s). Si elige esta opciцЁn, no se le pedirц║n mц║s\n"
+"detalles ni se le formularц║n mц║s preguntas.\n"
+"\n"
+" * \"%s\": el asistente ha detectado una o mц║s particiones Linux existentes\n"
+"en su disco rц╜gido. Si desea utilizarlas, elija esta opciцЁn. Entonces se le\n"
+"pedirц║ que elija los puntos de montaje asociados a cada una de las\n"
+"particiones. Los puntos de montaje legados se seleccionan automц║ticamente,\n"
+"y por lo general deberц╜a mantenerlos.\n"
+"\n"
+" * \"%s\": si Microsoft Windows estц║ instalado en su disco rц╜gido y ocupa\n"
+"todo el espacio disponible en el mismo, Usted tiene que liberar espacio\n"
+"para los datos de Linux. Para hacerlo, puede borrar su particiцЁn y datos\n"
+"Microsoft Windows (vea la soluciцЁn \"Borrar el disco completo\") o cambiar\n"
+"el tamaц╠o de su particiцЁn Microsoft Windows FAT. El cambio de tamaц╠o se\n"
+"puede realizar sin la pц╘rdida de datos, siempre y cuando Usted haya\n"
+"desfragmentado con anterioridad la particiцЁn Windows y que la misma utiliza\n"
+"el formato FAT. Es altamente recomendable hacer una copia de respaldo de\n"
+"sus datos. Se recomienda usar esta soluciцЁn si desea utilizar tanto\n"
+"Mandrake Linux como Microsoft Windows en la misma computadora.\n"
 "\n"
 "   Antes de elegir esta opciцЁn, por favor comprenda que despuц╘s de este\n"
-"procedimiento, el tamaц╠o de su particiцЁn Microsoft Windows serц║ mц║s pequeц╠o\n"
+"procedimiento el tamaц╠o de su particiцЁn Microsoft Windows serц║ mц║s pequeц╠o\n"
 "que cuando comenzцЁ. Tendrц║ menos espacio bajo Microsoft Windows para\n"
 "almacenar sus datos o instalar software nuevo.\n"
 "\n"
-" * \"Borrar el disco entero\": si desea borrar todos los datos y todas las\n"
-"particiones presentes en su disco rц╜gido y reemplazarlas con su nuevo\n"
-"sistema Mandrake Linux, elija esta opciцЁn. Tenga cuidado con esta soluciцЁn\n"
-"ya que no podrц║ revertir su elecciцЁn despuц╘s de confirmarla.\n"
+" * \"%s\": si desea borrar todos los datos y todas las particiones\n"
+"presentes en su disco rц╜gido y reemplazarlos con su nuevo sistema Mandrake\n"
+"Linux, elija esta opciцЁn. Tenga cuidado con esta soluciцЁn ya que no podrц║\n"
+"revertir su elecciцЁn despuц╘s de confirmarla.\n"
 "\n"
 "   !! Si elige esta opciцЁn, se perderц║n todos los datos en su disco. !!\n"
 "\n"
-" * \"Quitar Windows\": esto simplemente borrarц║ todo en el disco y\n"
-"comenzarц║ particionando todo desde cero. Se perderц║n todos los datos en su\n"
-"disco.\n"
+" * \"%s\": esto simplemente borrarц║ todo en el disco y comenzarц║\n"
+"particionando todo desde cero. Se perderц║n todos los datos en su disco.\n"
 "\n"
 "   !! Si elige esta opciцЁn, se perderц║n todos los datos en su disco. !!\n"
 "\n"
-" * \"Particionamiento personalizado\": elija esta opciцЁn si desea\n"
-"particionar manualmente su disco rц╜gido. Tenga cuidado - esta es una\n"
-"elecciцЁn potente pero peligrosa y puede perder todos sus datos con\n"
-"facilidad. Esa es la razцЁn por la cual esta opciцЁn realmente sцЁlo se\n"
-"recomienda si ha hecho algo como esto antes y tiene algo de experiencia.\n"
-"Para mц║s instrucciones acerca de la utilizaciцЁn de el utilitario DiskDrake,\n"
-"consulte la secciцЁn \"Administrar sus particiones\" de la \"Guц╜a de\n"
-"Comienzo\"."
+" * \"%s\": elija esta opciцЁn si desea particionar manualmente su disco\n"
+"rц╜gido. Tenga cuidado - esta es una elecciцЁn potente pero peligrosa y puede\n"
+"perder todos sus datos con facilidad. Esa es la razцЁn por la cual esta\n"
+"opciцЁn realmente sцЁlo se recomienda si ha hecho algo como esto antes y\n"
+"tiene algo de experiencia. Para mц║s instrucciones acerca de la utilizaciцЁn\n"
+"del utilitario DiskDrake, consulte la secciцЁn \"Administrar sus\n"
+"particiones\" de la \"Guц╜a de Comienzo\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor."
 msgstr ""
 "ResoluciцЁn\n"
@@ -151,43 +149,42 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
 "system administrator, the users you add at this point will not be\n"
 "authorized to change anything except their own files and their own\n"
-"configuration, protecting the system from unintentional or malicious\n"
-"changes that impact the system as a whole. You will have to create at least\n"
-"one regular user for yourself -- this is the account which you should use\n"
-"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
-"to do anything and everything, it may also be very dangerous! A mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, the worst that will happen is that you will lose\n"
-"some information, but not affect the entire system.\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in and copy it to the \"User name\" field, which is the name this\n"
-"user will enter to log onto the system. If you like, you may override the\n"
-"default and change the username. The next step is to enter a password. From\n"
-"a security point of view, a non-privileged (regular) user password is not\n"
-"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
-"making it blank or too simple: after all, your files could be the ones at\n"
-"risk.\n"
-"\n"
-"Once you click on \"Accept user\", you can add other users. Add a user for\n"
-"each one of your friends: your father or your sister, for example. Click\n"
-"\"Next ->\" when you have finished adding users.\n"
-"\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
-"\n"
-"When you are finished adding all users, you will be asked to choose a user\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the username. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user\n"
 "that can automatically log into the system when the computer boots up. If\n"
 "you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Next\n"
-"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
-"to use this feature?\" box."
+"security), choose the desired user and window manager, then click \"%s\".\n"
+"If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux es un sistema multiusuario, y esto significa que cada usuario\n"
 "puede tener sus preferencias propias, sus archivos propios, y asц╜\n"
@@ -197,39 +194,39 @@ msgstr ""
 "configuraciцЁn y sus archivos propios, protegiendo al sistema contra cambios\n"
 "no intencionales o maliciosos que pueden impactar al sistema como un todo.\n"
 "Tendrц║ que crear al menos un usuario no privilegiado para Usted mismo - esa\n"
-"cuenta es la que deberц╜a utilizar para el uso rutinario, diario. Aunque es\n"
-"muy prц║ctico ingresar como \"root\" para cualquier cosa y de todo, б║tambiц╘n\n"
-"puede ser muy peligroso! Un error podrц╜a significar que su sistema deje de\n"
-"funcionar. Si comete un error serio como usuario no privilegiado, sцЁlo\n"
-"puede llegar a perder algo de informaciцЁn, pero no afectar a todo el\n"
+"cuenta es la que deberц╜a utilizar para el uso rutinario diario. Aunque es\n"
+"muy prц║ctico ingresar como \"root\" para hacer cualquier cosa y de todo,\n"
+"б║tambiц╘n puede ser muy peligroso! Un error podrц╜a significar que su sistema\n"
+"deje de funcionar. Si comete un error serio como usuario no privilegiado,\n"
+"sцЁlo puede llegar a perder algo de informaciцЁn, pero no afectar a todo el\n"
 "sistema.\n"
 "\n"
 "El primer campo le pide un nombre real. Por supuesto, esto no es\n"
 "obligatorio - en realidad, puede ingresar lo que desee. DrakX usarц║ la\n"
-"primer palabra que ingresцЁ y la copiarц║ al campo \"Nombre de usuario\", que\n"
-"es el nombre que este usuario en particular usarц║ para ingresar al sistema.\n"
-"Si lo desea, puede omitir lo predeterminado y cambiar el nombre de usuario.\n"
-"El prцЁximo paso es ingresar una contraseц╠a. La contraseц╠a de un usuario no\n"
+"primer palabra que ingresцЁ y la copiarц║ al campo \"%s\", que es el nombre\n"
+"que este usuario en particular usarц║ para ingresar al sistema. Si lo desea,\n"
+"puede omitir lo predeterminado y cambiar el nombre de usuario. El prцЁximo\n"
+"paso es ingresar una contraseц╠a. La contraseц╠a de un usuario no\n"
 "privilegiado (regular) no es tan crucial como la de \"root\" desde el punto\n"
 "de vista de la seguridad, pero esto no es razцЁn alguna para obviarla o\n"
 "hacerla muy simple: despuц╘s de todo, son sus archivos los que podrц╜an estar\n"
 "en peligro.\n"
 "\n"
-"Una vez que hace clic sobre \"Aceptar usuario\", puede agregar otros\n"
-"usuarios. Agregue un usuario para cada uno de sus amigos: por ejemplo su\n"
-"padre o su hermana. Cuando haya terminado de agregar todos los usuarios que\n"
-"desee, haga clic sobre \"Siguiente ->\".\n"
+"Una vez que hace clic sobre \"%s\", puede agregar otros usuarios. Agregue\n"
+"un usuario para cada uno de sus amigos: por ejemplo su padre o su hermana.\n"
+"Haga clic sobre \"%s\" cuando haya terminado de agregar todos los usuarios\n"
+"que desee.\n"
 "\n"
-"Hacer clic sobre el botцЁn \"Avanzada\" le permite cambiar el \"shell\"\n"
+"Hacer clic sobre el botцЁn \"%s\" le permite cambiar el \"shell\"\n"
 "predeterminado para ese usuario (bash, por defecto)\n"
 "\n"
-"Cuando haya finalizado de aц╠adir todos los usuarios, se le propone elegir\n"
-"un usuario para conectarse automц║ticamente en el sistema cuando arranca la\n"
-"computadora. Si estц║ interesado en esa caracterц╜stica (y no le importa\n"
+"Cuando haya finalizado de aц╠adir todos los usuarios se le propone elegir un\n"
+"usuario para conectarse automц║ticamente en el sistema cuando arranca la\n"
+"computadora. Si estц║ interesado en esta caracterц╜stica (y no le importa\n"
 "mucho la seguridad local), elija el usuario y administrador de ventanas\n"
-"deseado, luego haga clic sobre \"Siguiente ->\". Si no estц║ interesado en\n"
-"esta caracterц╜stica, quite la marca de la casilla \"б©Desea utilizar esta\n"
-"caracterц╜stica?\"."
+"deseado. Si no estц║ interesado en esta caracterц╜stica, quite la marca de la\n"
+"casilla \"%s\". Haga clic sobre \"%s\" una vez que seleccionцЁ su\n"
+"preferencia."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -253,8 +250,8 @@ msgid ""
 "choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
 "\n"
 " * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
 "at the first boot prompt.\n"
@@ -307,13 +304,12 @@ msgid ""
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
 "of an existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": For the most part, this completely wipes out the old\n"
-"system. If you wish to change how your hard drives are partitioned, or\n"
-"change the file system, you should use this option. However, depending on\n"
-"your partitioning scheme, you can prevent some of your existing data from\n"
-"being over- written.\n"
+" * \"%s\": For the most part, this completely wipes out the old system. If\n"
+"you wish to change how your hard drives are partitioned, or change the file\n"
+"system, you should use this option. However, depending on your partitioning\n"
+"scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
-" * \"Upgrade\": this installation class allows you to update the packages\n"
+" * \"%s\": this installation class allows you to update the packages\n"
 "currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
@@ -328,15 +324,15 @@ msgstr ""
 "DrakX ahora necesita saber si desea realizar una instalaciцЁn nueva o una\n"
 "actualizaciцЁn de un sistema Mandrake Linux existente:\n"
 "\n"
-" * \"Instalar\": Esta opciцЁn borrarц║ prц║cticamente por completo el sistema\n"
+" * \"%s\": Esta opciцЁn borrarц║ prц║cticamente por completo el sistema\n"
 "anterior. Si desea cambiar la forma en que se particionan sus discos, o\n"
 "cambiar el sistema de archivos, deberц╜a utilizar esta opciцЁn. Sin embargo,\n"
 "dependiendo de su esquema de particionado, puede evitar que se\n"
 "sobre-escriban algunos datos existentes.\n"
 "\n"
-" * \"ActualizaciцЁn\": Esta clase de instalaciцЁn le permite actualizar los\n"
-"paquetes que en este momento estц║n instalados en su sistema Mandrake Linux.\n"
-"No se alteran las particiones corrientes de sus discos ni los datos de los\n"
+" * \"%s\": Esta clase de instalaciцЁn le permite actualizar los paquetes que\n"
+"en este momento estц║n instalados en su sistema Mandrake Linux. No se\n"
+"alteran las particiones corrientes de sus discos ni los datos de los\n"
 "usuarios. La mayorц╜a de los otros pasos de configuraciцЁn permanecen\n"
 "disponibles, de manera similar a lo que ocurre con una instalaciцЁn\n"
 "estц║ndar.\n"
@@ -352,95 +348,88 @@ msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Bugs may have been\n"
 "fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"Yes\"\n"
-"if you have a working Internet connection, or \"No\" if you prefer to\n"
+"updates, you are now able to download them from the Internet. Check \"%s\"\n"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
 "install updated packages later.\n"
 "\n"
-"Choosing \"Yes\" will display a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. A package-selection tree will\n"
-"appear: review the selection, and press \"Install\" to retrieve and install\n"
-"the selected package(s), or \"Cancel\" to abort."
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one nearer to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Es probable que cuando instale Mandrake Linux algunos paquetes se hayan\n"
 "actualizado desde la publicaciцЁn inicial. Se pueden haber corregido algunos\n"
-"errores, y solucionado problemas de seguridad. Para permitir que Usted se\n"
+"errores y solucionado problemas de seguridad. Para permitir que Usted se\n"
 "beneficie de estas actualizaciones, ahora se le propone transferirlas desde\n"
-"la Internet. Marque \"Sц╜\" si tiene funcionando una conexiцЁn con la\n"
-"Internet, o \"No\" si prefiere instalar los paquetes actualizados mц║s\n"
+"la Internet. Marque \"%s\" si tiene funcionando una conexiцЁn con la\n"
+"Internet, o \"%s\" si prefiere instalar los paquetes actualizados mц║s\n"
 "tarde.\n"
 "\n"
-"Si elige \"Sц╜\" se mostrarц║ una lista de lugares desde los que se pueden\n"
+"Si elige \"%s\" se mostrarц║ una lista de lugares desde los que se pueden\n"
 "obtener las actualizaciones. Elija el mц║s cercano a Usted. Luego aparece un\n"
-"ц║rbol de selecciцЁn de paquetes: revise la selecciцЁn y presione \"Instalar\"\n"
-"para transferir e instalar los paquetes seleccionados, o \"Cancelar\" para\n"
-"abortar."
+"ц║rbol de selecciцЁn de paquetes: revise la selecciцЁn y presione \"%s\" para\n"
+"transferir e instalar los paquetes seleccionados, o \"%s\" para abortar."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"This dialog allows to finely tune your bootloader:\n"
+"This dialog allows you to fine tune your bootloader:\n"
 "\n"
-" * \"Bootloader to use\": there are three choices for your bootloader:\n"
+" * \"%s\": there are three choices for your bootloader:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"%s\": if you prefer grub (text menu).\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
 "\n"
-" * \"Delay before booting the default image\": after a boot or a reboot of\n"
-"the computer, this is the delay given to the user at the console to select\n"
-"a boot entry other than the default.\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
-"system! Be sure you know what you do before changing any of the options. !!\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
-"that are reserved for the expert user."
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
 msgstr ""
 "Este diц║logo le permite un ajuste fino de su cargador de arranque:\n"
 "\n"
-" * \"Cargador de arranque a usar\": hay tres opciones para su cargador de\n"
-"arranque:\n"
+" * \"%s\": hay tres opciones para su cargador de arranque:\n"
 "\n"
-"    * \"GRUB\": si prefiere a grub (menц╨ de texto).\n"
+"    * \"%s\": si prefiere a grub (menц╨ de texto).\n"
 "\n"
-"    * \"LILO con menц╨ de texto\": si prefiere a LILO con su interfaz de\n"
-"texto.\n"
+"    * \"%s\": si prefiere a LILO con su interfaz de texto.\n"
 "\n"
-"    * \"LILO con menц╨ grц║fico\": si prefiere a LILO con su interfaz\n"
-"grц║fica.\n"
+"    * \"%s\": si prefiere a LILO con su interfaz grц║fica.\n"
 "\n"
-" * \"Dispositivo de arranque\": en la mayorц╜a de los casos, no cambiarц║ lo\n"
-"predeterminado (\"/dev/hda\"), pero si lo prefiere, el cargador de arranque\n"
-"se puede instalar en el segundo disco rц╜gido (\"/dev/hdb\"), o incluso en\n"
-"un disquete (\"/dev/fd0\").\n"
+" * \"%s\": en la mayorц╜a de los casos, no cambiarц║ lo predeterminado\n"
+"(\"%s\"), pero si lo prefiere el cargador de arranque se puede instalar en\n"
+"el segundo disco rц╜gido (\"%s\") o incluso en un disquete (\"%s\")\n"
 "\n"
-" * \"Demora antes de arrancar la imagen predeterminada\": luego de arrancar\n"
-"o volver a arrancar la computadora, esta es la demora que se garantiza al\n"
-"usuario para elegir, en el menц╨ del cargador de arranque, una entrada\n"
-"distinta a la predeterminada.\n"
+" * \"%s\": luego de arrancar o volver a arrancar la computadora, esta es la\n"
+"demora que se garantiza al usuario para elegir, en el menц╨ del cargador de\n"
+"arranque, una entrada distinta a la predeterminada.\n"
 "\n"
 "!! Tenga presente que si no elige instalar un cargador de arranque\n"
-"(seleccionando \"Omitir\"), б║debe asegurarse que tiene una forma de\n"
-"arrancar a su sistema Mandrake Linux! Tambiц╘n debe asegurarse que sabe lo\n"
-"que hace antes de cambiar cualquier opciцЁn. !!\n"
+"(seleccionando \"%s\"), б║debe asegurarse que tiene una forma de arrancar a\n"
+"su sistema Mandrake Linux! Tambiц╘n debe asegurarse que sabe lo que hace\n"
+"antes de cambiar cualquier opciцЁn. !!\n"
 "\n"
-"Haciendo clic sobre el botцЁn \"Avanzadas\" en este diц║logo se le ofrecerц║n\n"
+"Haciendo clic sobre el botцЁn \"%s\" en este diц║logo se le ofrecerц║n\n"
 "opciones avanzadas que estц║n reservadas para el usuario experto."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
+"Please choose which one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -470,10 +459,10 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Se ha detectado mц║s de una particiцЁn Microsoft Windows en su disco rц╜gido.\n"
-"Por favor, elija aquella a la cual desea cambiarle el tamaц╠o para poder\n"
+"Por favor, elija aquella a la cual desea cambiar el tamaц╠o para poder\n"
 "instalar su sistema operativo Mandrake Linux nuevo.\n"
 "\n"
-"Cada particiцЁn se lista como sigue: \"Nombre Linux\", \"Nombre Windows\"\n"
+"Cada particiцЁn se lista como sigue: \"Nombre Linux\", \"Nombre Windows\",\n"
 "\"Capacidad\".\n"
 "\n"
 "\"Nombre Linux\" estц║ estructurado: \"tipo de disco rц╜gido\", \"nц╨mero de\n"
@@ -510,32 +499,32 @@ msgid ""
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
-"You will be presented the list of different parameters to change to get an\n"
-"optimal graphical display: Graphic Card\n"
+"You will be presented with a list of different parameters to change to get\n"
+"an optimal graphical display: Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs.\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own.\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor.\n"
 "\n"
 "\n"
@@ -543,7 +532,7 @@ msgid ""
 "Test\n"
 "\n"
 "   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"Yes\",\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
 "then DrakX will proceed to the next step. If you cannot see the message, it\n"
 "means that some part of the autodetected configuration was incorrect and\n"
 "the test will automatically end after 12 seconds, bringing you back to the\n"
@@ -553,9 +542,9 @@ msgid ""
 "\n"
 "Options\n"
 "\n"
-"   You can here choose whether you want to have your machine automatically\n"
+"   Here you can choose whether you want to have your machine automatically\n"
 "switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"No\" if your machine is to act as a server, or if you were not successful\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
 "X (por \"X Window System\") es el corazцЁn de la interfaz grц║fica de\n"
@@ -596,7 +585,7 @@ msgstr ""
 "Probar\n"
 "\n"
 "   El sistema intentarц║ abrir una pantalla grц║fica con la resoluciцЁn\n"
-"deseada. Si puede ver el mensaje durante la prueba, y responde \"Sц╜\",\n"
+"deseada. Si puede ver el mensaje durante la prueba, y responde \"%s\",\n"
 "entonces DrakX continuarц║ con el paso siguiente. Si no puede ver el\n"
 "mensaje, significa que alguna parte de la configuraciцЁn detectada\n"
 "automц║ticamente no era la correcta y la prueba terminarц║ automц║ticamente\n"
@@ -608,7 +597,7 @@ msgstr ""
 "Opciones\n"
 "\n"
 "   Aquц╜ puede elegir si desea que su mц║quina cambie automц║ticamente a la\n"
-"interfaz grц║fica al arrancar. Obviamente, querrц║ marcar \"No\" si su\n"
+"interfaz grц║fica al arrancar. Obviamente, querrц║ marcar \"%s\" si su\n"
 "sistema actuarц║ como servidor, o si no tuvo ц╘xito en la configuraciцЁn de su\n"
 "pantalla."
 
@@ -616,23 +605,23 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
-"is best for a particular type of configuration.\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"is best suited to particular types of configuration.\n"
 "\n"
-" * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"pdq\n"
-"\" will handle only very simple network cases and is somewhat slow when\n"
-"used with networks.) It's recommended that you use \"pdq\" if this is your\n"
-"first experience with GNU/Linux.\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
 "printing to your local printer or to one halfway around the planet. It is\n"
 "simple to configure and can act as a server or a client for the ancient\n"
 "\"lpd \" printing system, so it compatible with older operating systems\n"
-"that may still need print services. While quite powerful, the basic setup\n"
+"which may still need print services. While quite powerful, the basic setup\n"
 "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
 "front-ends for printing or choosing printer options and for managing the\n"
 "printer.\n"
 "\n"
@@ -640,31 +629,31 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mandrake Control\n"
 "Center and clicking the expert button."
 msgstr ""
-"Ahora, es tiempo de seleccionar un sistema de impresiцЁn para su\n"
+"Ahora es el momento de seleccionar un sistema de impresiцЁn para su\n"
 "computadora. Otros sistemas operativos pueden ofrecerle uno, pero Mandrake\n"
 "Linux le ofrece dos. Cada uno de los sistemas de impresiцЁn es mejor para un\n"
 "tipo de configuraciцЁn particular.\n"
 "\n"
-" * \"pdq\" - \"print, don't queue\" (imprimir sin poner en cola), es la\n"
+" * \"%s\" - \"print, don't queue\" (imprimir sin poner en cola) es la\n"
 "elecciцЁn si Usted tiene una conexiцЁn directa a su impresora y desea evitar\n"
 "el pц║nico de los papeles trabados, y no tiene impresora en red alguna\n"
-"(\"pdq\" manejarц║ sцЁlo casos de red muy simples y es algo lento cuando se\n"
+"(\"%s\" manejarц║ sцЁlo casos de red muy simples y es algo lento cuando se\n"
 "utiliza con las redes) Se recomienda utilizar \"pdq\" si esta es su primer\n"
 "experiencia con GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - \"Common Unix Printing System\" (Sistema de ImpresiцЁn Comц╨n\n"
-"de Unix) es una elecciцЁn excelente para imprimir en su impresora local o en\n"
+" * \"%s\" - \"Common Unix Printing System\" (Sistema de ImpresiцЁn Comц╨n de\n"
+"Unix) es una elecciцЁn excelente para imprimir en su impresora local o en\n"
 "una en la otra punta del planeta. Es simple de configurar y puede actuar\n"
 "como servidor o cliente para el sistema de impresiцЁn antiguo \"lpd\", por\n"
 "lo que es compatible con sistemas operativos mц║s antiguos que todavц╜a\n"
 "pueden necesitar servicios de impresiцЁn. Si bien es bastante potente, la\n"
 "configuraciцЁn bц║sica es tan simple como la de \"pdq\". Si necesita que\n"
-"emule a un servidor \"lpd\", debe encender el demonio \"cups-lpd\".\n"
-"\"CUPS\" incluye interfaces grц║ficas para imprimir o elegir las opciones de\n"
-"la impresora y para administrar la impresora.\n"
+"emule a un servidor \"lpd\", debe activar el demonio \"cups-lpd\". \"%s\"\n"
+"incluye interfaces grц║ficas para imprimir o elegir las opciones de la\n"
+"impresora y para administrar la impresora.\n"
 "\n"
-"Si hace una elecciцЁn ahora, y mц║s tarde encuentra que a Usted no le gusta\n"
-"su sistema de impresiцЁn, lo puede cambiar ejecutando PrinterDrake desde el\n"
+"Si hace una elecciцЁn ahora y mц║s tarde encuentra que a Usted no le gusta su\n"
+"sistema de impresiцЁn, puede cambiarlo ejecutando PrinterDrake desde el\n"
 "Centro de Control de Mandrake y haciendo clic sobre el botцЁn para expertos."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -678,47 +667,45 @@ msgid ""
 "Packages are sorted into groups corresponding to a particular use of your\n"
 "machine. Mandrake Linux has four predefined installations available. You\n"
 "can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various containers, so a\n"
+"You can mix and match applications from the various groups, so a\n"
 "``Workstation'' installation can still have applications from the\n"
-"``Development'' container installed.\n"
+"``Development'' group installed.\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the applications that are in the workstation\n"
-"container.\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the applications that are in the workstation group.\n"
 "\n"
-" * \"Development\": if plan on using your machine for programming, choose\n"
-"the appropriate packages from the container.\n"
+" * \"%s\": if plan on using your machine for programming, choose the\n"
+"appropriate packages from that group.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, select which of\n"
-"the more common services you wish to install on your machine.\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical interface available.\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
 "text about that group. If you unselect all groups when performing a regular\n"
 "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the minimum number of packages possible to have a\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server.\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
 "\n"
-" * \"Truly minimal install\": will install the absolute minimum number of\n"
-"packages necessary to get a working Linux system. With this installation\n"
-"you will only have a command line interface. The total size of this\n"
-"installation is 65 megabytes.\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
@@ -730,23 +717,20 @@ msgstr ""
 "su mц║quina. Mandrake Linux tiene cuatro instalaciones predefinidas\n"
 "disponibles. Puede pensar en estas clases de instalaciцЁn como contenedores\n"
 "para los distintos paquetes. Puede mezclar y hacer coincidir aplicaciones\n"
-"de varios contenedores, por lo que una instalaciцЁn de \"EstaciцЁn de\n"
-"trabajo\" puede tener instaladas aplicaciones del contenedor\n"
-"\"Desarrollo\".\n"
+"de varios grupos, por lo que una instalaciцЁn de \"EstaciцЁn de trabajo\"\n"
+"puede tener instaladas aplicaciones del grupo \"Desarrollo\".\n"
 "\n"
-" * \"EstaciцЁn de trabajo\": si planifica utilizar su mц║quina como una\n"
-"estaciцЁn de trabajo, seleccione una o mц║s aplicaciones del contenedor\n"
-"estaciцЁn de trabajo.\n"
+" * \"%s\": si planifica utilizar su mц║quina como una estaciцЁn de trabajo,\n"
+"seleccione una o mц║s aplicaciones del grupo estaciцЁn de trabajo.\n"
 "\n"
-" * \"Desarrollo\": si la mц║quina se utilizarц║ para programaciцЁn, elija los\n"
-"paquetes apropiados del contenedor.\n"
+" * \"%s\": si la mц║quina se utilizarц║ para programaciцЁn, elija los paquetes\n"
+"apropiados de ese grupo.\n"
 "\n"
-" * \"Servidor\": si pretende usar la mц║quina como un servidor, seleccione\n"
-"cuц║les de los servicios mц║s comunes desea instalar en su mц║quina.\n"
+" * \"%s\": si pretende usar la mц║quina como un servidor, seleccione cuц║les\n"
+"de los servicios mц║s comunes desea instalar en su mц║quina.\n"
 "\n"
-" * \"Entorno grц║fico\": aquц╜ es donde seleccionarц║ su entorno grц║fico\n"
-"preferido. Si desea tener una estaciцЁn de trabajo grц║fica, debe seleccionar\n"
-"al menos uno.\n"
+" * \"%s\": aquц╜ es donde seleccionarц║ su entorno grц║fico preferido. Si\n"
+"desea tener una estaciцЁn de trabajo grц║fica, debe seleccionar al menos uno.\n"
 "\n"
 "Si mueve el cursor del ratцЁn sobre el nombre de un grupo se mostrarц║ un\n"
 "pequeц╠o texto explicativo acerca de ese grupo. Si deselecciona todos los\n"
@@ -754,25 +738,24 @@ msgstr ""
 "actualizaciцЁn), aparecerц║ un diц║logo que propone opciones diferentes para\n"
 "una instalaciцЁn mц╜nima:\n"
 "\n"
-" * \"Con X\": instala la menor cantidad de paquetes posible para tener un\n"
+" * \"%s\": instala la menor cantidad de paquetes posible para tener un\n"
 "escritorio grц║fico que funcione.\n"
 "\n"
-" * \"Con documentaciцЁn bц║sica\": instala el sistema base mц║s algunos\n"
-"utilitarios bц║sicos y la documentaciцЁn de los mismos. Esta instalaciцЁn es\n"
-"adecuada para configurar un servidor.\n"
+" * \"%s\": instala el sistema base mц║s algunos utilitarios bц║sicos y la\n"
+"documentaciцЁn de los mismos. Esta instalaciцЁn es adecuada para configurar\n"
+"un servidor.\n"
 "\n"
-" * \"InstalaciцЁn realmente mц╜nima\": instalarц║ el mц╜nimo necesario estricto\n"
-"para obtener un sistema Linux que funciona. Con esta instalaciцЁn sцЁlo\n"
-"tendrц║ una interfaz de lц╜nea de comandos. Esta instalaciцЁn ocupa alrededor\n"
-"de 65 MB.\n"
+" * \"%s\": instalarц║ el mц╜nimo necesario estricto para obtener un sistema\n"
+"Linux que funciona. Con esta instalaciцЁn sцЁlo tendrц║ una interfaz de lц╜nea\n"
+"de comandos. Esta instalaciцЁn ocupa alrededor de 65 MB.\n"
 "\n"
-"Puede marcar la casilla \"SelecciцЁn de paquetes individuales\" que es ц╨til\n"
-"si estц║ familiarizado con los paquetes que se ofrecen o si desea tener un\n"
-"control total sobre lo que se instalarц║.\n"
+"Puede marcar la casilla \"%s\" que es ц╨til si estц║ familiarizado con los\n"
+"paquetes que se ofrecen, o si desea tener un control total sobre lo que se\n"
+"instalarц║.\n"
 "\n"
-"Si iniciцЁ la instalaciцЁn en el modo \"ActualizaciцЁn\", puede deseleccionar\n"
-"todos los grupos para evitar instalar cualquier paquete nuevo. Esto es ц╨til\n"
-"para reparar o actualizar un sistema existente."
+"Si iniciцЁ la instalaciцЁn en el modo \"%s\" puede deseleccionar todos los\n"
+"grupos para evitar instalar cualquier paquete nuevo. Esto es ц╨til para\n"
+"reparar o actualizar un sistema existente."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -781,7 +764,7 @@ msgid ""
 "knows if a selected package is located on another CD-ROM so it will eject\n"
 "the current CD and ask you to insert the correct CD as required."
 msgstr ""
-"La instalaciцЁn de Mandrake Linux se divide en varios CD-ROMs. DrakX sabe si\n"
+"La instalaciцЁn de Mandrake Linux se divide en varios CD-ROM. DrakX sabe si\n"
 "un paquete seleccionado se encuentra en otro CD por lo que expulsarц║ el CD\n"
 "corriente y le pedirц║ que inserte el CD correcto cuando sea necesario."
 
@@ -790,19 +773,20 @@ msgstr ""
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
+"administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
 "guess - DrakX will tell you if the password that you chose too easy. As you\n"
 "can see, you are not forced to enter a password, but we strongly advise you\n"
-"against. GNU/Linux is as prone to operator error as any other operating\n"
-"system. Since \"root\" can overcome all limitations and unintentionally\n"
-"erase all data on partitions by carelessly accessing the partitions\n"
-"themselves, it is important that it be difficult to become \"root\".\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
 "\n"
 "One caveat -- do not make the password too long or complicated because you\n"
 "must be able to remember it!\n"
@@ -810,76 +794,79 @@ msgid ""
 "The password will not be displayed on screen as you type it in. To reduce\n"
 "the chance of a blind typing error you will need to enter the password\n"
 "twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
 "\n"
 "If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"Advanced\" button.\n"
+"server, click the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you do not\n"
-"know which to use, ask your network administrator.\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with reminding passwords, you can choose to\n"
-"have \"No password\", if your computer won't be connected to the Internet,\n"
-"and if you trust anybody having access to it."
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the internet or that you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Este es el punto de decisiцЁn mц║s crucial para la seguridad de su sistema\n"
 "GNU/Linux: tendrц║ que ingresar la contraseц╠a de \"root\". El usuario\n"
 "\"root\" es el administrador del sistema y es el ц╨nico autorizado a hacer\n"
 "actualizaciones, agregar usuarios, cambiar la configuraciцЁn general del\n"
-"sistema, etc. Resumiendo, б║\"root\" puede hacer de todo!. Es por esto que\n"
+"sistema, etc. Resumiendo, б║\"root\" puede hacer de todo! Es por esto que\n"
 "deberц║ elegir una contraseц╠a que sea difц╜cil de adivinar - DrakX le dirц║ si\n"
-"la que eligiцЁ es demasiado fц║cil. Como puede ver, no es forzoso ingresar\n"
-"una contraseц╠a, pero le recomendamos encarecidamente que ingrese una.\n"
-"GNU/Linux es tan propenso a errores del operador como cualquier otro\n"
-"sistema operativo. Debido a que \"root\" puede sobrepasar todas las\n"
-"limitaciones y borrar, sin intenciцЁn, todos los datos que se encuentran en\n"
-"las particiones accediendo a las mismas sin el cuidado suficiente, es que\n"
-"es importante que sea difц╜cil convertirse en \"root\".\n"
+"la que eligiцЁ es demasiado fц║cil. Como puede ver no es forzoso ingresar una\n"
+"contraseц╠a, pero le recomendamos encarecidamente que ingrese una. GNU/Linux\n"
+"es tan propenso a errores del operador como cualquier otro sistema\n"
+"operativo. Es importante que sea difц╜cil convertirse en \"root\" debido a\n"
+"que \"root\" puede sobrepasar todas las limitaciones y borrar, sin\n"
+"intenciцЁn, todos los datos que se encuentran en las particiones accediendo\n"
+"a las mismas sin el cuidado suficiente.\n"
 "\n"
 "La contraseц╠a deberц╜a ser una mezcla de caracteres alfanumц╘ricos y tener al\n"
 "menos una longitud de 8 caracteres. Nunca escriba la contraseц╠a de \"root\"\n"
-"- en un papel, eso hace que sea muy fц║cil comprometer a un sistema.\n"
+"- por ejemplo, en un papel - eso hace que sea muy fц║cil comprometer a un\n"
+"sistema.\n"
 "\n"
 "Sin embargo, no deberц╜a hacer la contraseц╠a muy larga o complicada б║debido\n"
 "a que Usted debe poder recordarla!\n"
 "\n"
 "La contraseц╠a no se mostrarц║ en la pantalla a medida que Usted la teclee.\n"
-"Por lo tanto, tendrц║ que teclear la contraseц╠a dos veces para reducir la\n"
+"Por lo tanto tendrц║ que teclear la contraseц╠a dos veces para reducir la\n"
 "posibilidad de un error de tecleo. Si ocurre que Usted comete dos veces el\n"
 "mismo error de tecleo, tendrц║ que utilizar esta contraseц╠a \"incorrecta\"\n"
 "la primera vez que se conecte.\n"
 "\n"
 "Si desea que el acceso a esta computadora estц╘ controlado por un servidor\n"
-"de autenticaciцЁn, haga clic sobre el botцЁn \"Avanzadas\".\n"
+"de autenticaciцЁn, haga clic sobre el botцЁn \"%s\".\n"
 "\n"
 "Si su red usa los protocolos LDAP, NIS, o servicios de autenticaciцЁn de PDC\n"
-"Dominio de Windows, seleccione el botцЁn apropiado como \"autenticaciцЁn\".\n"
-"Si no sabe cual utilizar, pregunte al administrador de su red.\n"
+"Dominio de Windows, seleccione el botцЁn apropiado como mц╘todo de\n"
+"autenticaciцЁn. Si no sabe cual utilizar, deberц╜a preguntar al administrador\n"
+"de su red.\n"
 "\n"
 "Si ocurre que tiene problemas para recordar contraseц╠as, puede elegir el\n"
-"botцЁn \"Sin contraseц╠a\", si es que su computadora no estarц║ conectada a la\n"
-"Internet y Usted confц╜a en cualquier persona que tenga acceso a la misma."
+"botцЁn \"%s\", si es que su computadora nunca estarц║ conectada a la Internet\n"
+"o Usted confц╜a absolutamente en cualquier persona que tenga acceso a la\n"
+"misma."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"Click on \"Next ->\" if you want to delete all data and partitions present\n"
-"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
-"be able to recover any data and partitions present on this hard drive,\n"
-"including any Windows data.\n"
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"Click on \"%s\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Haga clic sobre \"Siguiente ->\" si desea borrar todos los datos y\n"
-"particiones presentes en esta unidad de disco. Tenga cuidado, luego de\n"
-"hacer clic sobre \"Siguiente ->\", no podrц║ recuperar los datos y las\n"
-"particiones presentes en esta unidad de disco, incluyendo los datos de\n"
-"Windows.\n"
+"Haga clic sobre \"%s\" si desea borrar todos los datos y particiones\n"
+"presentes en esta unidad de disco. Tenga cuidado, luego de hacer clic sobre\n"
+"\"%s\", no podrц║ recuperar los datos y las particiones presentes en esta\n"
+"unidad de disco, incluyendo los datos de Windows.\n"
 "\n"
-"Haga clic sobre \"<- Anterior\" para detener esta operaciцЁn sin perder los\n"
-"datos ni las particiones presentes en esta unidad de disco."
+"Haga clic sobre \"%s\" para detener esta operaciцЁn sin perder los datos ni\n"
+"las particiones presentes en esta unidad de disco."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -898,17 +885,17 @@ msgid ""
 "installed. By default Mandrake Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes are discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
 "default during boot. !!\n"
 "\n"
-"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
-"which appears whenever the installer automatically selects a package to\n"
-"resolve a dependency issue. Some packages have relationships between each\n"
-"other such that installation of a package requires that some other program\n"
-"is already installed. The installer can determine which packages are\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each other such\n"
+"that installation of a package requires that some other program is also\n"
+"rerquired to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -920,7 +907,7 @@ msgid ""
 msgstr ""
 "Si le dijo al instalador que deseaba seleccionar los paquetes individuales,\n"
 "el mismo presentarц║ un ц║rbol que contiene todos los paquetes clasificados\n"
-"por grupos y subgrupos. Mientras navega por el ц║rbol, puede seleccionar\n"
+"por grupos y subgrupos. Mientras navega por el ц║rbol puede seleccionar\n"
 "grupos enteros, subgrupos, o paquetes individuales.\n"
 "\n"
 "Tan pronto como selecciona un paquete en el ц║rbol, aparece una descripciцЁn\n"
@@ -939,17 +926,17 @@ msgstr ""
 "vulnerabilidades en la seguridad luego que se terminцЁ con esta versiцЁn de\n"
 "Mandrake Linux. En particular, si no sabe que es lo que se supone que hace\n"
 "un servicio o la razцЁn por la cual se estц║ instalando, entonces haga clic\n"
-"sobre \"No\". Si hace clic sobre \"Sц╜\" se instalarц║n todos los servicios\n"
+"sobre \"%s\". Si hace clic sobre \"%s\" se instalarц║n todos los servicios\n"
 "listados y de manera predeterminada los mismos arrancarц║n automц║ticamente.\n"
 "!!\n"
 "\n"
-"La opciцЁn \"Dependencias automц║ticas\" simplemente deshabilita el diц║logo\n"
-"de advertencia que aparece cuando el instalador selecciona automц║ticamente\n"
-"un paquete para resolver un problema de dependencias. Algunos paquetes\n"
-"tienen relaciones entre ellos tales que la instalaciцЁn de un paquete\n"
-"necesita que algц╨n otro programa ya estц╘ instalado. El instalador puede\n"
-"determinar quц╘ paquetes se necesitan para satisfacer una dependencia para\n"
-"completar la instalaciцЁn de manera satisfactoria.\n"
+"La opciцЁn \"%s\" simplemente deshabilita el diц║logo de advertencia que\n"
+"aparece cuando el instalador selecciona automц║ticamente un paquete para\n"
+"resolver un problema de dependencias. Algunos paquetes tienen relaciones\n"
+"entre ellos tales que la instalaciцЁn de un paquete necesita que algц╨n otro\n"
+"programa ya estц╘ instalado. El instalador puede determinar quц╘ paquetes se\n"
+"necesitan para satisfacer una dependencia para completar la instalaciцЁn de\n"
+"manera satisfactoria.\n"
 "\n"
 "El pequeц╠o icono del disquete al final de la lista le permite cargar la\n"
 "lista de paquetes elegida durante una instalaciцЁn previa. Esto es ц╨til si\n"
@@ -973,14 +960,9 @@ msgid ""
 "one.\n"
 "\n"
 "If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader.\n"
-"\n"
-"\"Boot device\": in most cases, you will not change the default (\"First\n"
-"sector of drive (MBR)\"), but if you prefer, the bootloader can be\n"
-"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
-"(\"On Floppy\")."
+"bootloader."
 msgstr ""
-"LILO y grub son cargadores de arranque para GNU/Linux. Normalmente, esta\n"
+"LILO y grub son cargadores de arranque para GNU/Linux. Normalmente esta\n"
 "etapa estц║ completamente automatizada. DrakX analizarц║ el sector de\n"
 "arranque del disco y actuarц║ en funciцЁn de lo que encuentre allц╜:\n"
 "\n"
@@ -991,13 +973,8 @@ msgstr ""
 " * si encuentra un sector de arranque de grub o LILO, lo reemplazarц║ con\n"
 "uno nuevo;\n"
 "\n"
-"Si no puede realizar una determinaciцЁn, DrakX le pedirц║ dцЁnde colocar el\n"
-"cargador de arranque.\n"
-"\n"
-"\"Dispositivo de arranque\": en la mayorц╜a de los casos, Usted no cambiarц║\n"
-"lo predeterminado (\"Primer sector del disco (MBR)\"), pero si prefiere, el\n"
-"cargador de arranque se puede instalar en el segundo disco rц╜gido\n"
-"(\"/dev/hdb\"), o incluso en un disquete (\"En disquete\")"
+"Si no puede realizar una determinaciцЁn, DrakX le preguntarц║ dцЁnde colocar\n"
+"el cargador de arranque."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -1007,7 +984,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, You'll have to specify your hardware by hand.\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1025,8 +1002,8 @@ msgstr ""
 "automц║ticamente.\n"
 "\n"
 "Debido a que la detecciцЁn de hardware a veces puede no detectar alguna\n"
-"pieza de hardware, DrakX puede fallar al detectar sus discos rц╜gidos. De\n"
-"ser asц╜, tendrц║ que especificar su hardware a mano.\n"
+"pieza de hardware, DrakX puede no detectar sus discos rц╜gidos. De ser asц╜,\n"
+"tendrц║ que especificar su hardware a mano.\n"
 "\n"
 "Si tiene que seleccionar su adaptador SCSI PCI manualmente, DrakX le\n"
 "preguntarц║ si desea especificar opciones para el mismo. Deberц╜a permitir\n"
@@ -1051,8 +1028,8 @@ msgid ""
 " * Label: this is the name you will have to type at the yaboot prompt to\n"
 "select this boot option.\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
 "\n"
 " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
@@ -1142,21 +1119,20 @@ msgid ""
 "documentation, the installer and the system in general. Select first the\n"
 "region you are located in, and then the language you speak.\n"
 "\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation, thereby installing the\n"
-"language-specific files for system documentation and applications. For\n"
-"example, if you will host users from Spain on your machine, select English\n"
-"as the default language in the tree view and \"Espanol\" in the Advanced\n"
-"section.\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"All\n"
-"languages\" box. Selecting support for a language means translations,\n"
-"fonts, spell checkers, etc. for that language will be installed.\n"
-"Additionally, the \"Use Unicode by default\" checkbox allows to force the\n"
-"system to use unicode (UTF-8). Note however that this is an experimental\n"
-"feature. If you select different languages requiring different encoding the\n"
-"unicode support will be installed anyway.\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will be installed. Additionally, the\n"
+"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
+"however that this is an experimental feature. If you select different\n"
+"languages requiring different encoding the unicode support will be\n"
+"installed anyway.\n"
 "\n"
 "To switch between the various languages installed on the system, you can\n"
 "launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
@@ -1164,48 +1140,44 @@ msgid ""
 "will only change the language settings for that particular user."
 msgstr ""
 "El primer paso es elegir el idioma de instalaciцЁn. En el ejemplo se elige\n"
-"\"Spanish (Argentina)\"(*).\n"
+"\"%s\" como regiцЁn y \"%s\" como idioma.\n"
 "\n"
-"Su elecciцЁn de idioma preferido afectarц║ el idioma de la documentaciцЁn, el\n"
+"Su elecciцЁn de idioma preferido afectarц║ al idioma de la documentaciцЁn, el\n"
 "instalador y el sistema en general. Seleccione primero la regiцЁn en la que\n"
 "se encuentra, y luego el idioma que habla.\n"
 "\n"
-"Al hacer clic sobre el botцЁn \"Avanzado\" podrц║ seleccionar otros idiomas\n"
-"para instalar en su estaciцЁn de trabajo, instalando asц╜ los archivos\n"
-"especц╜ficos para esos idiomas para la documentaciцЁn y las aplicaciones. Por\n"
-"ejemplo, si albergarц║ a gente de Francia en su mц║quina, seleccione Espaц╠ol\n"
-"como idioma principal en la vista de ц║rbol y \"Francц╘s|Francia\" en la\n"
-"secciцЁn avanzada.\n"
+"Al hacer clic sobre el botцЁn \"%s\" podrц║ seleccionar otros idiomas para\n"
+"instalar en su estaciцЁn de trabajo, instalando asц╜ los archivos especц╜ficos\n"
+"para esos idiomas para la documentaciцЁn y las aplicaciones. Por ejemplo, si\n"
+"albergarц║ a gente de Francia en su mц║quina, seleccione Espaц╠ol como idioma\n"
+"principal en la vista de ц║rbol y \"%s\" en la secciцЁn avanzada.\n"
 "\n"
 "Note que no estц║ limitado a elegir un ц╨nico idioma adicional. Puede elegir\n"
-"varios, o incluso instalarlos a todos eligiendo la casilla \"Todos los\n"
-"idiomas\". Seleccionar el soporte para un idioma significa que se\n"
-"instalarц║n las traducciones, tipografц╜as, correctores ortogrц║ficos, etc.\n"
-"para dicho idioma. Adicionalmente, la casilla \"Usar Unicode\n"
-"predeterminadamente\" permite forzar al sistema a utilizar Unicode (UTF-8)\n"
-"Sin embargo, note que esta es una caracterц╜stica experimental. Si\n"
-"selecciona diferentes idiomas que necesitan codificaciones diferentes de\n"
-"todas formas se instalarц║ el soporte para Unicode.\n"
-"\n"
-"Para cambiar de un idioma a otro, Usted puede ejecutar, como \"root\", el\n"
-"comando \"/usr/sbin/localedrake\" para cambiar el idioma de todo el\n"
-"sistema, o ejecutarlo como usuario no privilegiado para cambiar sцЁlo el\n"
-"idioma predeterminado de ese usuario.\n"
-"\n"
-"(*) Ya que de ahц╜ viene el traductor [:-)]"
+"varios, o incluso instalarlos a todos eligiendo la casilla \"%s\".\n"
+"Seleccionar el soporte para un idioma significa que se instalarц║n las\n"
+"traducciones, tipografц╜as, correctores ortogrц║ficos, etc. para dicho\n"
+"idioma. Adicionalmente, la casilla \"%s\" permite que fuerce al sistema a\n"
+"utilizar Unicode (UTF-8) Sin embargo, note que esta es una caracterц╜stica\n"
+"experimental. Si selecciona diferentes idiomas que necesitan codificaciones\n"
+"diferentes, de cualquier manera se instalarц║ el soporte para Unicode.\n"
+"\n"
+"Para cambiar de un idioma a otro, Usted puede ejecutar el comando\n"
+"\"localedrake\". Si lo hace como \"root\" cambiarц║ el idioma todo el\n"
+"sistema, si lo hace como usuario no privilegiado cambiarц║ sцЁlo el idioma\n"
+"predeterminado de ese usuario."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"\"Sound card\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver."
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
 msgstr ""
-"\"Tarjeta de sonido\": si se detecta una tarjeta de sonido en su sistema,\n"
-"la misma se muestra aquц╜. Si nota que la tarjeta de sonido mostrada no es\n"
-"la que estц║ realmente instalada en su sistema, puede hacer clic sobre el\n"
-"botцЁn y elegir otro controlador."
+"\"%s\": si se detecta una tarjeta de sonido en su sistema, la misma se\n"
+"muestra aquц╜. Si nota que la tarjeta de sonido mostrada no es la que estц║\n"
+"realmente instalada en su sistema, puede hacer clic sobre el botцЁn y elegir\n"
+"otro controlador."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -1215,9 +1187,9 @@ msgid ""
 "\n"
 "If there are other operating systems installed on your machine they will\n"
 "automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
-"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
-"your changes.\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
 "anyone who goes to the console and reboots the machine. You can delete the\n"
@@ -1231,12 +1203,12 @@ msgstr ""
 "\n"
 "Si hay otros sistemas operativos instalados en su mц║quina los mismos se\n"
 "agregarц║n automц║ticamente al menц╨ de arranque. Aquц╜ puede elegir ajustar\n"
-"las opciones existentes haciendo clic sobre \"Aц╠adir\" para crear una nueva\n"
-"entrada; seleccionando una entrada y haciendo clic sobre \"Modificar\" o\n"
-"\"Quitar\" para modificarla o quitarla. \"Aceptar\" valida sus cambios.\n"
+"las opciones existentes haciendo clic sobre \"%s\" para crear una nueva\n"
+"entrada; seleccionando una entrada y haciendo clic sobre \"%s\" o \"%s\"\n"
+"para modificarla o quitarla. \"%s\" valida sus cambios.\n"
 "\n"
-"Tambiц╘n, puede ser que no desee dar acceso a los otros sistemas operativos\n"
-"a cualquiera que vaya a la consola y reinicie la mц║quina. Puede borrar las\n"
+"Tambiц╘n puede ser que no desee dar acceso a los otros sistemas operativos a\n"
+"cualquiera que vaya a la consola y reinicie la mц║quina. Puede borrar las\n"
 "entradas correspondientes para los sistemas operativos para quitarlas del\n"
 "menц╨, pero б║necesitarц║ un disquete de arranque para poder arrancar esos\n"
 "otros sistemas operativos!"
@@ -1245,8 +1217,8 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Mandrake Linux partition. Be careful, all data present on this partition\n"
+"will be lost and will not be recoverable!"
 msgstr ""
 "Elija la unidad de disco que desea borrar para instalar su particiцЁn\n"
 "Mandrake Linux nueva. Tenga cuidado, б║se perderц║n todos los datos de la\n"
@@ -1255,30 +1227,31 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"\"Printer\": clicking on the \"Configure\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation."
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
 msgstr ""
-"\"Impresora\": al hacer clic sobre el botцЁn \"Configurar\" se abrirц║ el\n"
-"asistente de configuraciцЁn de la impresora. Consulte el capц╜tulo\n"
-"correspondiente de la \"Guц╜a de Comienzo\" para mц║s informaciцЁn sobre cцЁmo\n"
-"configurar una impresora nueva. La interfaz presentada allц╜ es similar a la\n"
-"utilizada durante la instalaciцЁn."
+"\"%s\": al hacer clic sobre el botцЁn \"%s\" se abrirц║ el asistente de\n"
+"configuraciцЁn de la impresora. Consulte el capц╜tulo correspondiente de la\n"
+"\"Guц╜a de Comienzo\" para mц║s informaciцЁn sobre cцЁmo configurar una\n"
+"impresora nueva. La interfaz presentada allц╜ es similar a la utilizada\n"
+"durante la instalaciцЁn."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
 msgstr ""
 "Opciones\n"
 "\n"
 "   Aquц╜ puede elegir si desea que su mц║quina cambie automц║ticamente a la\n"
-"interfaz grц║fica al arrancar. Obviamente, querrц║ marcar \"No\" si su\n"
+"interfaz grц║fica al arrancar. Obviamente, querrц║ marcar \"%s\" si su\n"
 "sistema actuarц║ como servidor, o si no tuvo ц╘xito en la configuraciцЁn de su\n"
 "pantalla."
 
@@ -1300,153 +1273,151 @@ msgid ""
 "directly exposed to the Internet. The trade-off of a higher security level\n"
 "is generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, keep the default option."
+"If you do not know what to choose, stay with the default option."
 msgstr ""
 "En este punto, DrakX le permitirц║ elegir el nivel de seguridad deseado para\n"
 "la mц║quina. Como regla general, el nivel de seguridad deberц╜a ser mayor\n"
-"cuanto mц║s cruciales sean los datos que tenga almacenados, o si serц║ una\n"
-"mц║quina directamente expuesta a la Internet. Sin embargo, un nivel de\n"
+"cuanto mц║s cruciales sean los datos que tenga almacenados, o si la mц║quina\n"
+"estarц║ directamente expuesta a la Internet. No obstante, un nivel de\n"
 "seguridad mц║s alto generalmente se obtiene a expensas de la facilidad de\n"
 "uso.\n"
 "\n"
-"Si no sabe que elegir, mantenga la opciцЁn predeterminada."
+"Si no sabe cual elegir, no cambie la opciцЁn predeterminada."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"As a review, DrakX will present a summary of various information it has\n"
-"about your system. Depending on your installed hardware, you may have some\n"
-"or all of the following entries. Each entry is made up of the configuration\n"
-"item to be configured, followed by a quick summary of the current\n"
-"configuration. Click on the corresponding \"Configure\" button to change\n"
-"that.\n"
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
 "\n"
-" * \"Keyboard\": check the current keyboard map configuration and change\n"
-"that if necessary.\n"
+" * \"%s\": check the current keyboard map configuration and change that if\n"
+"necessary.\n"
 "\n"
-" * \"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list.\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
 "\n"
-" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
-"country you have chosen. You can click on the \"Configure\" button here if\n"
-"this is not correct.\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
 "\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary.\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
 "\n"
-" * \"Printer\": clicking on the \"Configure\" button will open the printer\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
 "presented there is similar to the one used during installation.\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. If you notice the sound card displayed is not the one that\n"
-"is actually present on your system, you can click on the button and choose\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
 "another driver.\n"
 "\n"
-" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
-"interface in \"800x600\" or \"1024x768\" resolution. If that does not suits\n"
-"you, click on \"Configure\" to reconfigure your graphical interface.\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. If you have a TV card and it is not detected, click on \"Configure\"\n"
-"to try to configure it manually.\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on \"Configure\" to change the parameters\n"
-"associated with the card.\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
 "\n"
-" * \"Network\": If you want to configure your Internet or local network\n"
-"access now.\n"
+" * \"%s\": If you want to configure your Internet or local network access\n"
+"now.\n"
 "\n"
-" * \"Security Level\": this entry offers you to redefine the security level\n"
-"as set in a previous step ().\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
 "\n"
-" * \"Firewall\": if you plan to connect your machine to the Internet, it's\n"
-"a good idea to protect you from intrusions by setting up a firewall.\n"
-"Consult the corresponding section of the ``Starter Guide'' for details\n"
-"about firewall settings.\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
 "\n"
-" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
-"click that button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
 "\n"
-" * \"Services\": you'll be able here to control finely which services will\n"
-"be run on your machine. If you plan to use this machine as a server it's a\n"
-"good idea to review this setup."
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
 msgstr ""
 "A manera de revisiцЁn, DrakX presentarц║ un resumen de las distintas\n"
 "informaciones que tiene acerca de su sistema. Dependiendo del hardware\n"
-"instalado, puede tener algunas o todas las entradas siguientes. Cada\n"
-"entrada estц║ compuesta de el elemento de configuraciцЁn a configurar,\n"
-"seguido de un pequeц╠o resumen de la configuraciцЁn corriente. Haga clic\n"
-"sobre el botцЁn \"Configurar\" correspondiente para cambiar eso.\n"
+"instalado puede tener algunas o todas las entradas siguientes. Cada entrada\n"
+"estц║ compuesta del elemento de configuraciцЁn a configurar, seguido de un\n"
+"pequeц╠o resumen de la configuraciцЁn corriente. Haga clic sobre el botцЁn\n"
+"\"%s\" correspondiente para cambiar eso.\n"
 "\n"
-" * \"Teclado\": verifique la configuraciцЁn de la disposiciцЁn corriente del\n"
+" * \"%s\": verifique la configuraciцЁn de la disposiciцЁn corriente del\n"
 "teclado y cц║mbiela si es necesario.\n"
 "\n"
-" * \"Paц╜s\": verifique la selecciцЁn corriente del paц╜s. Si Usted no se\n"
-"encuentra en este paц╜s, haga clic sobre el botцЁn \"Configurar\" y elija\n"
-"otro. Si su paц╜s no se muestra en la primer lista, haga clic sobre el botцЁn\n"
-"\"Mц║s\" para obtener la lista completa de paц╜ses.\n"
+" * \"%s\": verifique la selecciцЁn corriente del paц╜s. Si Usted no se\n"
+"encuentra en este paц╜s haga clic sobre el botцЁn \"%s\" y elija otro. Si su\n"
+"paц╜s no se muestra en la primer lista haga clic sobre el botцЁn \"%s\" para\n"
+"obtener la lista completa de paц╜ses.\n"
 "\n"
-" * \"Huso horario\": De manera predeterminada, DrakX deduce su huso horario\n"
-"basц║ndose en el paц╜s que ha elegido. Puede hacer clic sobre el botцЁn\n"
-"\"Configurar\" si esto no es correcto.\n"
+" * \"%s\": De manera predeterminada DrakX deduce su huso horario basц║ndose\n"
+"en el paц╜s que ha elegido. Puede hacer clic sobre el botцЁn \"%s\" si esto\n"
+"no es correcto.\n"
 "\n"
-" * \"RatцЁn\": verifique la configuraciцЁn del ratцЁn y haga clic sobre el\n"
-"botцЁn para cambiarla, si es necesario.\n"
+" * \"%s\": verifique la configuraciцЁn del ratцЁn y haga clic sobre el botцЁn\n"
+"para cambiarla, si es necesario.\n"
 "\n"
-" * \"Impresora\": al hacer clic sobre el botцЁn \"Configurar\" se abrirц║ el\n"
-"asistente de configuraciцЁn de la impresora. Consulte el capц╜tulo\n"
-"correspondiente de la \"Guц╜a de Comienzo\" para mц║s informaciцЁn sobre cцЁmo\n"
-"configurar una impresora nueva. La interfaz presentada allц╜ es similar a la\n"
-"utilizada durante la instalaciцЁn.\n"
+" * \"%s\": al hacer clic sobre el botцЁn \"%s\" se abrirц║ el asistente de\n"
+"configuraciцЁn de la impresora. Consulte el capц╜tulo correspondiente de la\n"
+"\"Guц╜a de Comienzo\" para mц║s informaciцЁn sobre cцЁmo configurar una\n"
+"impresora nueva. La interfaz presentada allц╜ es similar a la utilizada\n"
+"durante la instalaciцЁn.\n"
 "\n"
-" * \"Tarjeta de sonido\": si se detecta una tarjeta de sonido en su\n"
-"sistema, la misma se muestra aquц╜. Si nota que la tarjeta de sonido\n"
-"mostrada no es la que estц║ realmente instalada en su sistema, puede hacer\n"
-"clic sobre el botцЁn y elegir otro controlador.\n"
+" * \"%s\": si se detecta una tarjeta de sonido en su sistema, la misma se\n"
+"muestra aquц╜. Si nota que la tarjeta de sonido mostrada no es la que estц║\n"
+"realmente instalada en su sistema, puede hacer clic sobre el botцЁn y elegir\n"
+"otro controlador.\n"
 "\n"
-" * \"Interfaz grц║fica\": de manera predeterminada, DrakX configura su\n"
-"interfaz grц║fica en \"800x600\" o \"1024x768\" de resoluciцЁn. Si eso no le\n"
-"satisface, haga clic sobre \"Configurar\" para volver a configurar su\n"
-"interfaz grц║fica.\n"
+" * \"%s\": de manera predeterminada DrakX configura su interfaz grц║fica en\n"
+"\"800x600\" o \"1024x768\" de resoluciцЁn. Si eso no le satisface, haga clic\n"
+"sobre \"%s\" para volver a configurar su interfaz grц║fica.\n"
 "\n"
-" * \"Tarjeta de TV\": si se detecta una tarjeta de TV en su sistema, la\n"
-"misma se muestra aquц╜. Si tiene una tarjeta de TV y la misma no se detecta,\n"
-"haga clic sobre \"Configurar\" para intentar configurarla a mano.\n"
+" * \"%s\": si se detecta una tarjeta de TV en su sistema, la misma se\n"
+"muestra aquц╜. Si tiene una tarjeta de TV y la misma no se detecta, haga\n"
+"clic sobre \"%s\" para intentar configurarla a mano.\n"
 "\n"
-" * \"Tarjeta RDSI\": si se detecta una tarjeta RDSI en su sistema, la misma\n"
-"se muestra aquц╜. Puede hacer clic sobre \"Configurar\" para cambiar los\n"
-"parц║metros asociados a la misma.\n"
+" * \"%s\": si se detecta una tarjeta RDSI en su sistema, la misma se\n"
+"muestra aquц╜. Puede hacer clic sobre \"%s\" para cambiar los parц║metros\n"
+"asociados a la misma.\n"
 "\n"
-" * \"Red\": se desea configurar ahora el acceso a la Internet o su red\n"
-"local.\n"
+" * \"%s\": haga clic sobre \"%s\" si desea configurar ahora el acceso a la\n"
+"Internet o a su red local.\n"
 "\n"
-" * \"Nivel de seguridad\": esta entrada le ofrece volver a definir el nivel\n"
-"de seguridad como se ajustцЁ en un paso previo ()\n"
+" * \"%s\": esta entrada le ofrece volver a definir el nivel de seguridad\n"
+"como se ajustцЁ en un paso previo ()\n"
 "\n"
-" * \"Cortafuegos\": si planifica conectar su mц║quina a la Internet, es una\n"
-"buena idea protegerse de las intrusiones configurando un cortafuegos.\n"
-"Consulte la secciцЁn correspondiente de la \"Guц╜a de Comienzo\" para\n"
-"detalles acerca de los ajustes del cortafuegos.\n"
+" * \"%s\": si planifica conectar su mц║quina a la Internet, es una buena\n"
+"idea protegerse de las intrusiones configurando un cortafuegos. Consulte la\n"
+"secciцЁn correspondiente de la \"Guц╜a de Comienzo\" para detalles acerca de\n"
+"los ajustes del cortafuegos.\n"
 "\n"
-" * \"Cargador de arranque\": si desea cambiar la configuraciцЁn de su\n"
-"cargador de arranque, haga clic sobre ese botцЁn. Esto deberц╜a estar\n"
-"reservado para usuarios avanzados.\n"
+" * \"%s\": si desea cambiar la configuraciцЁn de su cargador de arranque,\n"
+"haga clic sobre ese botцЁn. Esto deberц╜a estar reservado para usuarios\n"
+"avanzados.\n"
 "\n"
-" * \"Servicios\": aquц╜ podrц║ tener un control fino sobre quц╘ servicios\n"
-"correrц║n en su mц║quina. Si planifica utilizar esta mц║quina como servidor es\n"
-"una buena idea revisar estos ajustes."
+" * \"%s\": aquц╜ podrц║ tener un control fino sobre quц╘ servicios correrц║n en\n"
+"su mц║quina. Si planifica utilizar esta mц║quina como servidor es una buena\n"
+"idea revisar estos ajustes."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "En caso que estц╘n disponibles diferentes servidores para su tarjeta, con o\n"
 "sin aceleraciцЁn de 3D, entonces se le propone elegir el servidor que mejor\n"
@@ -1463,7 +1434,7 @@ msgid ""
 "a PS/2, serial or USB interface.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
-"from the provided list.\n"
+"from the list provided.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
@@ -1474,11 +1445,11 @@ msgid ""
 "Wheel mice are occasionally not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
-"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
-"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
-"the buttons and check that the mouse pointer moves on-screen as you move\n"
-"your mouse."
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
 msgstr ""
 "Por lo general, DrakX no tiene problemas en detectar la cantidad de botones\n"
 "que tiene su ratцЁn. En caso contrario, asume que Usted tiene un ratцЁn de\n"
@@ -1496,25 +1467,25 @@ msgstr ""
 "estц║ funcionando bien, presione la barra espaciadora o [Intro] para\n"
 "cancelar la prueba y volver a la lista de opciones.\n"
 "\n"
-"Los ratones con rueda a veces no se detectan automц║ticamente, por lo que\n"
+"Los ratones con rueda a veces no se detectan automц║ticamente por lo que\n"
 "deberц║ seleccionar su ratцЁn de una lista. Debe asegurarse de seleccionar el\n"
 "correspondiente al puerto en el cual estц║ conectado su ratцЁn. Despuц╘s de\n"
-"seleccionar un ratцЁn y presionar el botцЁn \"Siguiente ->\", se muestra una\n"
-"imagen de un ratцЁn en la pantalla. Mueva la rueda de su ratцЁn para\n"
-"asegurarse que estц║ activa correctamente. Una vez que ve que se mueve la\n"
-"rueda en la pantalla a medida que mueve la rueda de su ratцЁn, pruebe los\n"
-"botones y verifique que el puntero del ratцЁn se mueve en la pantalla a\n"
-"medida que mueve su ratцЁn."
+"seleccionar un ratцЁn y presionar el botцЁn \"%s\", se muestra una imagen de\n"
+"un ratцЁn en la pantalla. Mueva la rueda de su ratцЁn para asegurarse que\n"
+"estц║ activa correctamente. Una vez que ve que se mueve la rueda en la\n"
+"pantalla a medida que mueve la rueda de su ratцЁn, pruebe los botones y\n"
+"verifique que el puntero del ratцЁn se mueve en la pantalla a medida que\n"
+"mueve su ratцЁn."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"Next\n"
-"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
-"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
-"also choose not to configure the network, or to do it later, in which case\n"
-"clicking the \"Cancel\" button will take you to the next step.\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\n"
+"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
+"configure the network, or to do it later, in which case clicking the \"%s\"\n"
+"button will take you to the next step.\n"
 "\n"
 "When configuring your network, the available connections options are:\n"
 "traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
@@ -1528,15 +1499,14 @@ msgid ""
 "for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection."
 msgstr ""
-"Ahora se le propone configurar su conexiцЁn de red/Internet. Si desea\n"
-"conectar su computadora a la Internet o a una red de ц║rea local, haga clic\n"
-"sobre \"Siguiente ->\". Mandrake Linux intentarц║ detectar automц║ticamente\n"
-"los dispositivos de red y mцЁdems. Si esta detecciцЁn falla, quite la marca\n"
-"de la casilla \"Usar detecciцЁn automц║tica\". Tambiц╘n puede elegir no\n"
-"configurar la red, o hacerlo mц║s tarde, en cuyo caso hacer clic sobre el\n"
-"botцЁn \"Cancelar\" lo llevarц║ al paso siguiente.\n"
-"\n"
-"Cuando configura su red, los tipos de conexiцЁn disponibles son: mцЁdem\n"
+"Ahora se le propone configurar su conexiцЁn de red/Internet. Haga clic sobre\n"
+"\"%s\" si desea conectar su computadora a la Internet o a una red de ц║rea\n"
+"local. Mandrake Linux intentarц║ detectar automц║ticamente los dispositivos\n"
+"de red y mцЁdems. Si esta detecciцЁn falla, quite la marca de la casilla\n"
+"\"%s\". Tambiц╘n puede elegir no configurar la red, o hacerlo mц║s tarde, en\n"
+"cuyo caso hacer clic sobre el botцЁn \"%s\" lo llevarц║ al paso siguiente.\n"
+"\n"
+"Cuando configura su red los tipos de conexiцЁn disponibles son: mцЁdem\n"
 "tradicional, mцЁdem RDSI (ISDN), conexiцЁn ADSL, cable mцЁdem, y finalmente\n"
 "una simple conexiцЁn LAN (Ethernet).\n"
 "\n"
@@ -1556,26 +1526,25 @@ msgstr ""
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
 "covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
-"computer."
+"terms in it, check the \"%s\" box. If not, simply turn off your computer."
 msgstr ""
 "Antes de continuar, deberц╜a leer cuidadosamente los tц╘rminos de la\n"
-"licencia. La misma cubre a toda la distribuciцЁn Mandrake Linux. Si acepta\n"
-"con todos los tц╘rminos en la misma, marque la casilla \"Aceptar\". Si no,\n"
-"simplemente apague su computadora."
+"licencia. La misma cubre a toda la distribuciцЁn Mandrake Linux. Si estц║ de\n"
+"acuerdo con todos los tц╘rminos en la misma, marque la casilla \"%s\". Si\n"
+"no, simplemente apague su computadora."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Tarjeta grц║fica\n"
 "\n"
@@ -1594,8 +1563,8 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not always needed at\n"
-"boot time.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
 "selected. However, if you are not sure whether a service is useful or not,\n"
@@ -1629,9 +1598,9 @@ msgstr ""
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own."
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
 msgstr ""
 "Monitor\n"
 "\n"
@@ -1645,34 +1614,34 @@ msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
 "motherboard is set to local time, you may deactivate this by unselecting\n"
-"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
-"system clock and the hardware clock are in the same timezone. This is\n"
-"useful when the machine also hosts another operating system like Windows.\n"
-"\n"
-"The \"Automatic time synchronization \" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. For this\n"
-"feature to work, you must have a working Internet connection. It is best to\n"
-"choose a time server located near you. This option actually installs a time\n"
-"server that can used by other machines on your local network."
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same timezone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can used by\n"
+"other machines on your local network as well."
 msgstr ""
 "GNU/Linux administra la hora en GMT (\"Greenwich Mean Time\", Hora del\n"
 "Meridiano de Greenwich) y la traduce a la hora local de acuerdo al huso\n"
 "horario que Usted seleccionцЁ. Sin embargo, es posible desactivar esto\n"
-"quitando la marca de la casilla \"Reloj interno puesto a GMT\", lo que harц║\n"
-"que GNU/Linux sepa que el reloj del sistema y el reloj de hardware estц║n en\n"
-"el mismo huso horario. Esto es ц╨til cuando la mц║quina tambiц╘n alberga otro\n"
-"sistema operativo como Windows.\n"
-"\n"
-"La opciцЁn \"SincronizaciцЁn automц║tica de hora (usando NTP)\" regularц║\n"
-"automц║ticamente el reloj conectц║ndose a un servidor remoto de la hora en la\n"
-"Internet. Para que esta caracterц╜stica funcione, debe tener una conexiцЁn\n"
-"con la Internet funcionando. En realidad, esta opciцЁn instala un servidor\n"
-"de la hora que puede ser utilizado por otras mц║quinas en su red local."
+"quitando la marca de la casilla \"%s\", lo que harц║ que GNU/Linux sepa que\n"
+"el reloj del sistema y el reloj de hardware estц║n en el mismo huso horario.\n"
+"Esto es ц╨til cuando la mц║quina tambiц╘n alberga otro sistema operativo como\n"
+"Windows.\n"
+"\n"
+"La opciцЁn \"%s\" regularц║ automц║ticamente el reloj conectц║ndose a un\n"
+"servidor remoto de la hora en la Internet. Para que esta caracterц╜stica\n"
+"funcione debe tener una conexiцЁn con la Internet funcionando. En realidad,\n"
+"esta opciцЁn instala un servidor de la hora que puede ser utilizado por\n"
+"otras mц║quinas en su red local."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"Here are Listed the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -1740,15 +1709,15 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
-"\"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list."
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
 msgstr ""
-"\"Paц╜s\": verifique la selecciцЁn corriente del paц╜s. Si Usted no se\n"
-"encuentra en este paц╜s, haga clic sobre el botцЁn \"Configurar\" y elija\n"
-"otro. Si su paц╜s no se muestra en la primer lista, haga clic sobre el botцЁn\n"
-"\"Mц║s\" para obtener la lista completa de paц╜ses."
+"\"%s\": verifique la selecciцЁn corriente del paц╜s. Si Usted no se encuentra\n"
+"en este paц╜s haga clic sobre el botцЁn \"%s\" y elija otro. Si su paц╜s no se\n"
+"muestra en la primer lista haga clic sobre el botцЁn \"%s\" para obtener la\n"
+"lista completa de paц╜ses."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
@@ -1770,13 +1739,13 @@ msgid ""
 "the selected partitions will be deleted and you will not be able to recover\n"
 "it.\n"
 "\n"
-"Click on \"Next ->\" when you are ready to format partitions.\n"
+"Click on \"%s\" when you are ready to format partitions.\n"
 "\n"
-"Click on \"<- Previous\" if you want to choose another partition for your\n"
-"new Mandrake Linux operating system installation.\n"
+"Click on \"%s\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
+"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"bad blocks on the disk."
 msgstr ""
 "Se debe formatear cualquier particiцЁn nueva que ha sido definida para que\n"
 "se pueda utilizar (formatear significa crear un sistema de archivos)\n"
@@ -1792,31 +1761,30 @@ msgstr ""
 "(tц╜picamente \"/home\")\n"
 "\n"
 "Por favor, tenga sumo cuidado cuando selecciona las particiones. Despuц╘s de\n"
-"formatear, se borrarц║n todos los datos en las particiones seleccionadas y\n"
-"no podrц║ recuperarlos en absoluto.\n"
+"formatear se borrarц║n todos los datos en las particiones seleccionadas y no\n"
+"podrц║ recuperarlos en absoluto.\n"
 "\n"
-"Haga clic sobre \"Siguiente ->\" cuando estц╘ listo para formatear las\n"
-"particiones.\n"
+"Haga clic sobre \"%s\" cuando estц╘ listo para formatear las particiones.\n"
 "\n"
-"Haga clic sobre \"<- Anterior\" si desea elegir otra particiцЁn para la\n"
-"instalaciцЁn de su sistema operativo Mandrake Linux nuevo.\n"
+"Haga clic sobre \"%s\" si desea elegir otra particiцЁn para la instalaciцЁn\n"
+"de su sistema operativo Mandrake Linux nuevo.\n"
 "\n"
-"Haga clic sobre \"Avanzada\" si desea seleccionar las particiones en las\n"
-"que se buscarц║n bloques defectuosos en el disco."
+"Haga clic sobre \"%s\" si desea seleccionar las particiones en las que se\n"
+"buscarц║n bloques defectuosos en el disco."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "Depending on the default language you chose in Section , DrakX will\n"
 "automatically select a particular type of keyboard configuration. However,\n"
-"you might not have a keyboard that corresponds exactly to your language:\n"
-"for example, if you are an English speaking Swiss person, you may have a\n"
-"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
-"find yourself in the same situation where your native language and keyboard\n"
-"do not match. In either case, this installation step will allow you to\n"
-"select an appropriate keyboard from a list.\n"
-"\n"
-"Click on the \"More \" button to be presented with the complete list of\n"
+"you may not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may have a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation where your native language and keyboard do\n"
+"not match. In either case, this installation step will allow you to select\n"
+"an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
@@ -1827,12 +1795,12 @@ msgstr ""
 "automц║ticamente un tipo particular de configuraciцЁn del teclado. Sin\n"
 "embargo, podrц╜a no tener un teclado que se corresponde exactamente con su\n"
 "idioma: por ejemplo, si Usted es un argentino que habla inglц╘s, todavц╜a\n"
-"podrц╜a desear que su teclado sea un teclado Latinoamericano. O si habla\n"
-"castellano pero estц║ en Inglaterra puede estar en la misma situaciцЁn en la\n"
-"cual su idioma nativo y su teclado no coinciden. En cualquier caso, este\n"
-"paso de instalaciцЁn le permitirц║ elegir un teclado apropiado de una lista.\n"
+"podrц╜a desear que su teclado sea un teclado inglц╘s. O si habla castellano\n"
+"pero estц║ en Inglaterra puede estar en la misma situaciцЁn en la cual su\n"
+"idioma nativo y su teclado no coinciden. En cualquier caso, este paso de\n"
+"instalaciцЁn le permitirц║ elegir un teclado apropiado de una lista.\n"
 "\n"
-"Haga clic sobre el botцЁn \"Mц║s\" para que se le presente la lista completa\n"
+"Haga clic sobre el botцЁn \"%s\" para que se le presente la lista completa\n"
 "de los teclados soportados.\n"
 "\n"
 "Si eligiцЁ una distribuciцЁn de teclado basada en un alfabeto no latino, el\n"
@@ -1843,67 +1811,64 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/es/drakx-chapter.xml
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"Next ->\" to reboot the system. The first thing\n"
-"you should see after your computer has finished doing its hardware tests is\n"
-"the bootloader menu, giving you the choice of which operating system to\n"
-"start.\n"
+"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
 "\n"
-"The \"Advanced\" button shows two more buttons to:\n"
+"The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"that will automatically perform a whole installation without the help of an\n"
-"operator, similar to the installation you just configured.\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
 "\n"
 "   Note that two different options are available after clicking the button:\n"
 "\n"
-"    * \"Replay\". This is a partially automated installation. The\n"
-"partitioning step is the only interactive procedure.\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
 "\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
 "   This feature is very handy when installing a number of similar machines.\n"
 "See the Auto install section on our web site for more information.\n"
 "\n"
-" * \"Save packages selection\"(*): saves a list of the package selected in\n"
-"this installation. To use this selection with another installation, insert\n"
-"the floppy and start the installation. At the prompt, press the [F1] key\n"
-"and type >>linux defcfg=\"floppy\" <<.\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<.\n"
 "\n"
 "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
 "\"mformat a:\")"
 msgstr ""
 "Ya estц║. Ahora la instalaciцЁn estц║ completa y su sistema GNU/Linux estц║\n"
-"listo para ser utilizado. Simplemente haga clic sobre \"Siguiente ->\" para\n"
-"volver a arrancar el sistema. Lo primero que deberц╜a ver tan pronto como su\n"
-"mц║quina haya finalizado sus pruebas de hardware es el menц╨ del cargador de\n"
-"arranque, dц║ndole la elecciцЁn de cuц║l sistema operativo arrancar.\n"
+"listo para ser utilizado. Simplemente haga clic sobre \"%s\" para volver a\n"
+"arrancar el sistema. Lo primero que deberц╜a ver tan pronto como su mц║quina\n"
+"haya finalizado sus pruebas de hardware, es el menц╨ del cargador de\n"
+"arranque dц║ndole la opciцЁn de elegir que sistema operativo arrancar.\n"
 "\n"
-"El botцЁn \"Avanzada\" le muestra dos botones mц║s para:\n"
+"El botцЁn \"%s\" le muestra dos botones mц║s para:\n"
 "\n"
-" * \"Generar un disquete de instalaciцЁn automц║tica\": para crear un\n"
-"disquete de instalaciцЁn que realizarц║ una instalaciцЁn completa\n"
-"automц║ticamente, sin la asistencia de un operador, similar a la instalaciцЁn\n"
-"que ha configurado reciц╘n.\n"
+" * \"%s\": para crear un disquete de instalaciцЁn que realizarц║ una\n"
+"instalaciцЁn completa automц║ticamente, sin la asistencia de un operador,\n"
+"similar a la instalaciцЁn que ha configurado reciц╘n.\n"
 "\n"
 "   Note que hay dos opciones diferentes disponibles despuц╘s de hacer clic\n"
 "sobre el botцЁn:\n"
 "\n"
-"    * \"Reproducir\" . Esta es una instalaciцЁn parcialmente automatizada.\n"
-"La etapa de particionado es el ц╨nico procedimiento interactivo.\n"
+"    * \"%s\" . Esta es una instalaciцЁn parcialmente automatizada. La etapa\n"
+"de particionado es el ц╨nico procedimiento interactivo.\n"
 "\n"
-"    * \"Automatizada\" . InstalaciцЁn completamente automatizada: el disco\n"
-"rц╜gido se sobreescribe por completo, y se pierden todos los datos.\n"
+"    * \"%s\" . InstalaciцЁn completamente automatizada: el disco rц╜gido se\n"
+"sobreescribe por completo, y se pierden todos los datos.\n"
 "\n"
 "   Esta caracterц╜stica es muy ц╨til cuando se instala una cantidad grande de\n"
 "mц║quinas similares. Consulte la secciцЁn Auto install (en inglц╘s) en nuestro\n"
 "sitio web para mц║s informaciцЁn.\n"
 "\n"
-" * \"Guardar selecciцЁn de paquetes\"(*): guarda una lista de los paquetes\n"
-"seleccionados en esta instalaciцЁn. Para usar esta selecciцЁn con otra\n"
-"instalaciцЁn, inserte el disquete en la disquetera y comience la\n"
-"instalaciцЁn. En el prompt, presione la tecla [F1], y a continuaciцЁn ingrese\n"
-">>linux defcfg=\"floppy\"<<.\n"
+" * \"%s\"(*): guarda una lista de los paquetes seleccionados en esta\n"
+"instalaciцЁn. Para usar esta selecciцЁn con otra instalaciцЁn, inserte el\n"
+"disquete en la disquetera y comience la instalaciцЁn. En el prompt, presione\n"
+"la tecla [F1], y a continuaciцЁn ingrese >>linux defcfg=\"floppy\"<<.\n"
 "\n"
 "(*) Necesita un disquete formateado con FAT (para crear uno bajo GNU/Linux\n"
 "teclee \"mformat a:\")"
@@ -1913,7 +1878,7 @@ msgstr ""
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
-"defined, either from a previous installation of GNU/Linux or from another\n"
+"defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
@@ -1923,43 +1888,40 @@ msgid ""
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
-" * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
 "\n"
-" * \"Auto allocate\": this option enables you to automatically create ext3\n"
-"and swap partitions in free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
 "\n"
-"\"More\": gives access to additional features:\n"
+"\"%s\": gives access to additional features:\n"
 "\n"
-" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery, if necessary. It is strongly\n"
-"recommended that you perform this step.\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows you to restore a previously saved\n"
-"partition table from a floppy disk.\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"doesn't always work.\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and reloads the\n"
-"partition table that was originally on the hard drive.\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
 "\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
-"users to manually mount and unmount removable medias such as floppies and\n"
-"CD-ROMs.\n"
+" * \"%s\": unchecking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good\n"
-"understanding of partitioning.\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+" * \"%s\": use this option to cancel your changes.\n"
 "\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information about the\n"
-"hard drive.\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1999,42 +1961,42 @@ msgstr ""
 "Para particionar el disco rц╜gido seleccionado, puede utilizar estas\n"
 "opciones:\n"
 "\n"
-" * \"Borrar todo\": esta opciцЁn borra todas las particiones sobre el disco\n"
+" * \"%s\": esta opciцЁn borra todas las particiones sobre el disco\n"
 "seleccionado.\n"
 "\n"
-" * \"AsignaciцЁn automц║tica\": esta opciцЁn le permite crear particiones ext3\n"
-"y swap automц║ticamente en el espacio libre de su disco rц╜gido.\n"
+" * \"%s\": esta opciцЁn le permite crear particiones ext3 y swap\n"
+"automц║ticamente en el espacio libre de su disco rц╜gido.\n"
 "\n"
-" * \"Mц║s\": le da acceso a caracterц╜sticas adicionales:\n"
+" * \"%s\": le da acceso a caracterц╜sticas adicionales:\n"
 "\n"
-"    * \"Guardar tabla de particiones\": guarda la tabla de particiones en\n"
-"un disquete. ц til para recuperar la tabla de particiones mц║s adelante en\n"
-"caso que sea necesario. Es altamente recomendable realizar este paso.\n"
+"    * \"%s\": guarda la tabla de particiones en un disquete. ц til para\n"
+"recuperar la tabla de particiones mц║s adelante en caso que sea necesario.\n"
+"Es altamente recomendable realizar este paso.\n"
 "\n"
-"    * \"Recuperar tabla de particiones\": esta opciцЁn le permitirц║\n"
-"restaurar una tabla de particiones guardada previamente en un disquete.\n"
+"    * \"%s\": esta opciцЁn le permitirц║ restaurar una tabla de particiones\n"
+"guardada previamente en un disquete.\n"
 "\n"
-"    * \"Rescatar tabla de particiones\": si su tabla de particiones estц║\n"
-"daц╠ada puede intentar recuperarla utilizando esta opciцЁn. Por favor, tenga\n"
-"cuidado y recuerde que puede fallar.\n"
+"    * \"%s\": si su tabla de particiones estц║ daц╠ada puede intentar\n"
+"recuperarla utilizando esta opciцЁn. Por favor, tenga cuidado y recuerde que\n"
+"puede fallar.\n"
 "\n"
-"    * \"Volver a cargar\": descarta todos los cambios y carga su tabla de\n"
-"particiones inicial.\n"
+"    * \"%s\": descarta todos los cambios y carga su tabla de particiones\n"
+"inicial.\n"
 "\n"
-"    * \"Montaje automц║tico de soportes removibles\": si desmarca esta\n"
-"opciцЁn los usuarios estarц║n forzados a montar y desmontar manualmente los\n"
-"soportes removibles como los disquetes y los CD-ROMs.\n"
+"    * \"%s\": si desmarca esta opciцЁn los usuarios estarц║n forzados a\n"
+"montar y desmontar manualmente los soportes removibles como los disquetes y\n"
+"los CD-ROM.\n"
 "\n"
-" * \"Asistente\": use esta opciцЁn si desea utilizar un asistente para\n"
-"particionar su disco rц╜gido. Se recomienda esto si no tiene un buen\n"
-"conocimiento del particionado.\n"
+" * \"%s\": use esta opciцЁn si desea utilizar un asistente para particionar\n"
+"su disco rц╜gido. Se recomienda esto si no tiene un buen conocimiento del\n"
+"particionado.\n"
 "\n"
-" * \"Deshacer\": use esta opciцЁn para cancelar sus cambios.\n"
+" * \"%s\": use esta opciцЁn para cancelar sus cambios.\n"
 "\n"
-" * \"Cambiar a modo normal/experto\": permite realizar acciones adicionales\n"
-"sobre las particiones (tipo, opciones, formatear) y brinda mц║s informaciцЁn.\n"
+" * \"%s\": permite realizar acciones adicionales sobre las particiones\n"
+"(tipo, opciones, formatear) y brinda mц║s informaciцЁn.\n"
 "\n"
-" * \"Hecho\": cuando ha terminado de particionar su disco rц╜gido, esto\n"
+" * \"%s\": cuando ha terminado de particionar su disco rц╜gido, esto\n"
 "guardarц║ sus cambios en el disco.\n"
 "\n"
 "Cuando se define el tamaц╠o de una particiцЁn, puede realizar un ajuste fino\n"
diff --git a/perl-install/share/po/help-fr.pot b/perl-install/share/po/help-fr.pot
index 009098f95..7b7474dbe 100644
--- a/perl-install/share/po/help-fr.pot
+++ b/perl-install/share/po/help-fr.pot
@@ -1,3 +1,6 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=ISO-8859-15\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -18,51 +21,49 @@ msgid ""
 "\n"
 "Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Use free space\": this option will perform an automatic partitioning\n"
-"of your blank drive(s). If you use this option there will be no further\n"
-"prompts.\n"
-"\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated with\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and for the most part it's a good idea to keep them.\n"
-"\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see ``Erase entire disk'' solution)\n"
-"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
-"without the loss of any data, provided you previously defragment the\n"
-"Windows partition and that it uses the FAT format. Backing up your data is\n"
-"strongly recommended.. Using this option is recommended if you want to use\n"
-"both Mandrake Linux and Microsoft Windows on the same computer.\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
+"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
+"partition. Resizing can be performed without the loss of any data, provided\n"
+"you have previously defragmented the Windows partition and that it uses the\n"
+"FAT format. Backing up your data is strongly recommended.. Using this\n"
+"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
 "then when you started. You will have less free space under Microsoft\n"
 "Windows to store your data or to install new software.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful, because you will not be able to\n"
-"undo your choice after you confirm.\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"Custom disk partitioning\": choose this option if you want to manually\n"
-"partition your hard drive. Be careful -- it is a powerful but dangerous\n"
-"choice and you can very easily lose all your data. That's why this option\n"
-"is really only recommended if you have done something like this before and\n"
-"have some experience. For more instructions on how to use the DiskDrake\n"
-"utility, refer to the ``Managing Your Partitions '' section in the\n"
-"``Starter Guide''."
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
+"Guide''."
 msgstr ""
 "Cette Иtape vous permet de dИterminer prИcisИment l'emplacement de votre\n"
 "installation de Mandrake Linux. Si votre disque est vide ou utilisИ par un\n"
@@ -79,63 +80,61 @@ msgstr ""
 "Selon la configuration de votre disque, plusieurs options sont disponibles\n"
 ":\n"
 "\n"
-" * ╚═Utilisez l'espace disponible═╩ : cette option tentera simplement de\n"
-"partitionner automatiquement l'espace inutilisИ sur votre disque. Il n'y\n"
-"aura pas d'autre question.\n"
-"\n"
-" * ╚═Utiliser les partitions existantes═╩ : l' assistant a dИtectИ une ou\n"
-"plusieurs partitions existants sur votre disque. Si vous voulez les\n"
-"utiliser, choisissez cette option. Il vous sera alors demandИ de choisir\n"
-"les points de montage associИs Ю chacune des partitions. Les anciens points\n"
-"de montage sont sИlectionnИs par dИfaut, et vous devriez gИnИralement les\n"
-"garder.\n"
-"\n"
-" * ╚═Utilisez l'espace libre sur une partition Windows═╩ : si Microsoft\n"
-"Windows est installИ sur votre disque et en prend toute la place vous devez\n"
-"faire de la place pour votre installation Linux. Pour ce faire, vous pouvez\n"
-"tout effacer (voir ╚═effacer tout le disque═╩) ou vous pouvez\n"
-"redimensionner la partition FAT Windows. Le redimensionnement peut Йtre\n"
-"effectuИ sans pertes de donnИes, Ю condition que vous ayez prИalablement\n"
-"dИfragmentИ la partition Windows, et qu'elle utilise le format FAT. Une\n"
-"sauvegarde de vos donnИes ne fera pas de mal non plus. Cette solution est\n"
-"recommandИe pour faire cohabiter Linux et Windows sur le mЙme ordinateur.\n"
+" * ╚═%s═╩ : cette option tentera simplement de partitionner automatiquement\n"
+"l'espace inutilisИ sur votre disque. Il n'y aura pas d'autre question.\n"
+"\n"
+" * ╚═%s═╩ : l' assistant a dИtectИ une ou plusieurs partitions existants\n"
+"sur votre disque. Si vous voulez les utiliser, choisissez cette option. Il\n"
+"vous sera alors demandИ de choisir les points de montage associИs Ю chacune\n"
+"des partitions. Les anciens points de montage sont sИlectionnИs par dИfaut,\n"
+"et vous devriez gИnИralement les garder.\n"
+"\n"
+" * ╚═%s═╩ : si Microsoft Windows est installИ sur votre disque et en prend\n"
+"toute la place vous devez faire de la place pour votre installation Linux.\n"
+"Pour ce faire, vous pouvez tout effacer (voir ╚═effacer tout le disque═╩)\n"
+"ou vous pouvez redimensionner la partition FAT Windows. Le\n"
+"redimensionnement peut Йtre effectuИ sans pertes de donnИes, Ю condition\n"
+"que vous ayez prИalablement dИfragmentИ la partition Windows, et qu'elle\n"
+"utilise le format FAT. Une sauvegarde de vos donnИes ne fera pas de mal non\n"
+"plus. Cette solution est recommandИe pour faire cohabiter Linux et Windows\n"
+"sur le mЙme ordinateur.\n"
 "\n"
 "   Avant de choisir cette option, il faut comprendre qu'aprХs cette\n"
 "procИdure l'espace disponible pour Windows sera rИduit. Vous aurez moins\n"
 "d'espace pour installer des logiciels ou sauvegarder de l'information avec\n"
 "Windows.\n"
 "\n"
-" * ╚═Effacer tout le disque═╩: si vous voulez effacer toutes les donnИes et\n"
-"les applications installИes sur votre systХme et les remplacer par votre\n"
-"nouveau systХme Mandrake Linux, choisissez cette option. Soyez prudent, car\n"
-"ce choix est irrИversible et permanent. Il vous sera impossible de\n"
-"retrouver vos donnИes effacИes.\n"
+" * ╚═%s═╩: si vous voulez effacer toutes les donnИes et les applications\n"
+"installИes sur votre systХme et les remplacer par votre nouveau systХme\n"
+"Mandrake Linux, choisissez cette option. Soyez prudent, car ce choix est\n"
+"irrИversible et permanent. Il vous sera impossible de retrouver vos donnИes\n"
+"effacИes.\n"
 "\n"
 "   !! En choisissant cette option, l'ensemble du contenu de votre disque\n"
 "sera dИtruit. !!\n"
 "\n"
-" * ╚═Supprimer Microsoft Windows═╩: ce choix effacera tout simplement ce\n"
-"que contient le disque et recommencera Ю zИro. Toutes les donnИes et les\n"
-"programmes prИsents sur le disque seront effacИs.\n"
+" * ╚═%s═╩: ce choix effacera tout simplement ce que contient le disque et\n"
+"recommencera Ю zИro. Toutes les donnИes et les programmes prИsents sur le\n"
+"disque seront effacИs.\n"
 "\n"
 "   !! En choisissant cette option, l'ensemble de votre disque sera effacИ\n"
 "!!\n"
 "\n"
-" * ╚═Partitionnement personnalisИ═╩ : permet de partitionner manuellement\n"
-"votre disque. Soyez prudent, car bien que plus puissante, cette option est\n"
-"dangereuse. Vous pouvez facilement perdre l'ensemble du contenu d'un\n"
-"disque. Donc, ne choisissez pas cette option si vous ne savez pas\n"
-"exactement ce que vous devez faire. Pour en savoir plus sur DiskDrake,\n"
-"rИfИrez vous Ю ╚═GИrer ses partitions═╩ du ╚═Guide de dИmarrage═╩."
+" * ╚═%s═╩ : permet de partitionner manuellement votre disque. Soyez\n"
+"prudent, car bien que plus puissante, cette option est dangereuse. Vous\n"
+"pouvez facilement perdre l'ensemble du contenu d'un disque. Donc, ne\n"
+"choisissez pas cette option si vous ne savez pas exactement ce que vous\n"
+"devez faire. Pour en savoir plus sur DiskDrake, rИfИrez vous Ю ╚═GИrer ses\n"
+"partitions═╩ du ╚═Guide de dИmarrage═╩."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor."
 msgstr ""
 "RИsolution\n"
@@ -149,43 +148,42 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
 "system administrator, the users you add at this point will not be\n"
 "authorized to change anything except their own files and their own\n"
-"configuration, protecting the system from unintentional or malicious\n"
-"changes that impact the system as a whole. You will have to create at least\n"
-"one regular user for yourself -- this is the account which you should use\n"
-"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
-"to do anything and everything, it may also be very dangerous! A mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, the worst that will happen is that you will lose\n"
-"some information, but not affect the entire system.\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in and copy it to the \"User name\" field, which is the name this\n"
-"user will enter to log onto the system. If you like, you may override the\n"
-"default and change the username. The next step is to enter a password. From\n"
-"a security point of view, a non-privileged (regular) user password is not\n"
-"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
-"making it blank or too simple: after all, your files could be the ones at\n"
-"risk.\n"
-"\n"
-"Once you click on \"Accept user\", you can add other users. Add a user for\n"
-"each one of your friends: your father or your sister, for example. Click\n"
-"\"Next ->\" when you have finished adding users.\n"
-"\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
-"\n"
-"When you are finished adding all users, you will be asked to choose a user\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the username. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user\n"
 "that can automatically log into the system when the computer boots up. If\n"
 "you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Next\n"
-"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
-"to use this feature?\" box."
+"security), choose the desired user and window manager, then click \"%s\".\n"
+"If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux est un systХme multiutilisateurs, ce qui signifie gИnИralement\n"
 "que chaque utilisateur peut avoir des prИfИrences diffИrentes, ses propres\n"
@@ -202,27 +200,26 @@ msgstr ""
 "\n"
 "Il faut d'abord entrer le vrai nom de la personne. иvidemment, vous pouvez\n"
 "y inscrire n'importe quoi. DrakX prendra le premier mot insИrИ et le\n"
-"transposera comme ╚═Nom de login═╩. C'est le nom qui sera utilisИ pour se\n"
-"connecter au systХme. Vous pouvez le modifier. Il faut maintenant entrer un\n"
-"mot de passe. Celui-ci n'est pas aussi crucial que le mot de passe de\n"
-"╚═root═╩, mais ce n'est pas une raison pour rentrer 123456. AprХs tout,\n"
-"ceci mettrait vos fichiers en pИril.\n"
+"transposera comme ╚═%s═╩. C'est le nom qui sera utilisИ pour se connecter\n"
+"au systХme. Vous pouvez le modifier. Il faut maintenant entrer un mot de\n"
+"passe. Celui-ci n'est pas aussi crucial que le mot de passe de ╚═root═╩,\n"
+"mais ce n'est pas une raison pour rentrer 123456. AprХs tout, ceci mettrait\n"
+"vos fichiers en pИril.\n"
 "\n"
-"AprХs avoir cliquИ sur ╚═Accepter l'utilisateur═╩, il vous sera possible\n"
-"d'ajouter d'autres utilisateurs. CrИez un utilisateur diffИrent pour chaque\n"
-"personne devant utiliser votre ordinateur. Une fois chaque utilisateur\n"
-"dИfini, cliquez sur ╚═Suivant ->═╩.\n"
+"AprХs avoir cliquИ sur ╚═%s═╩, il vous sera possible d'ajouter d'autres\n"
+"utilisateurs. CrИez un utilisateur diffИrent pour chaque personne devant\n"
+"utiliser votre ordinateur. Une fois chaque utilisateur dИfini, cliquez sur\n"
+"╚═%s═╩.\n"
 "\n"
-"En cliquant sur ╚═AvancИ═╩, vous pourrez sИlectionner un ╚═shell═╩\n"
-"diffИrent pour cet utilisateur (bash est assignИ par dИfaut).\n"
+"En cliquant sur ╚═%s═╩, vous pourrez sИlectionner un ╚═shell═╩ diffИrent\n"
+"pour cet utilisateur (bash est assignИ par dИfaut).\n"
 "\n"
 "Lorsque vous avez fini d'installer tous les utilisateurs, il vous est\n"
 "proposИ de choisir un utilisateur qui sera automatiquement connectИ lors du\n"
 "dИmarrage de l'ordinateur. Si cela vous intИresse (et que la sИcuritИ\n"
 "locale n'est pas trop un problХme), choisissez l'utilisateur et le\n"
-"gestionnaire de fenЙtres, puis cliquez sur ╚═Suivant ->═╩. Si cela ne vous\n"
-"intИresse pas, dИcochez la case ╚═Voulez-vous utiliser cette\n"
-"fonctionnalitИ?═╩."
+"gestionnaire de fenЙtres, puis cliquez sur ╚═%s═╩. Si cela ne vous\n"
+"intИresse pas, dИcochez la case ╚═%s═╩."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -246,8 +243,8 @@ msgid ""
 "choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
 "\n"
 " * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
 "at the first boot prompt.\n"
@@ -258,36 +255,42 @@ msgid ""
 " * Default OS: you can select which OS will boot by default when the Open\n"
 "Firmware Delay expires."
 msgstr ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
-"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
-"these other operating systems are correctly detected and installed. If this\n"
-"is not the case, you can add an entry by hand in this screen. Be careful to\n"
-"choose the correct parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt;\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information;\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ╚═C═╩ for CD\n"
-"at the first boot prompt;\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ╚═N═╩ for\n"
-"Open Firmware at the first boot prompt;\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
+"Yaboot est un chargeur de dИmarrage pour les Иquipements NewWorld\n"
+"MacIntosh. Il est capable de dИmarrer soit GNU/Linux, MacOS ou MacOSX,\n"
+"s'ils sont prИsents sur votre ordinateur bien entendu. Normalement, ces\n"
+"systХmes d'exploitation sont correctement dИtectИs et installИs. Si ce\n"
+"n'est pas le cas, vous pouvez maintenant ajouter une entrИe Ю la main.\n"
+"Soyez prudent et choisissez les bons paramХtres.\n"
+"\n"
+"Les options principales de Yaboot sont :\n"
+"\n"
+" * Message Init : un message texte apparaНt l'invite de dИmarrage ;\n"
+"\n"
+" * PИriphИrique de dИmarrage (╚═Boot═╩) : indique oЫ vous voulez placer\n"
+"l'information nИcessaire pour dИmarrer GNU/Linux. GИnИralement, il est\n"
+"prИfИrable de crИer une partition bootstrap avant l'installation pour\n"
+"contenir cette information ;\n"
+"\n"
+" * DИlai Open Firmware : contrairement Ю LILO, deux dИlais sont disponibles\n"
+"pour yaboot. Le premier se mesure en secondes et Ю cette Иtape, vous pouvez\n"
+"choisir entre le CD, l'amorГage OF (Open Firmware), MacOS ou Linux ;\n"
+"\n"
+" * Expiration du dИmarrage du noyau (╚═Kernel Boot Timeout═╩ : cette\n"
+"expiration de temps est similaire au dИlai de dИmarrage de LILO. AprХs\n"
+"avoir choisi Linux, il y aura un dИlai de 0,1 secondes avant que le noyau\n"
+"par dИfaut soit choisi ;\n"
+"\n"
+" * Activer le dИmarrage via un CD ? : en cochant cette option, vous pourrez\n"
+"choisir l'option ╚═C═╩ pour dИmarrer avec un CD lors de la premiХre invite\n"
+"de dИmarrage ;\n"
+"\n"
+" * Activer le dИmarrage OF ? : en choisissant cette option, vous pourrez\n"
+"sИlectionner la touche ╚═N═╩ pour activer Open Firmware lors de la premiХre\n"
+"invite de dИmarrage ;\n"
+"\n"
+" * OS par dИfaut : vous pouvez choisir le systХme d'exploitation qui\n"
+"dИmarrera par dИfaut lorsque le dИlai de temps attribuИ Ю Open Firmware\n"
+"expire."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -298,13 +301,12 @@ msgid ""
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
 "of an existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": For the most part, this completely wipes out the old\n"
-"system. If you wish to change how your hard drives are partitioned, or\n"
-"change the file system, you should use this option. However, depending on\n"
-"your partitioning scheme, you can prevent some of your existing data from\n"
-"being over- written.\n"
+" * \"%s\": For the most part, this completely wipes out the old system. If\n"
+"you wish to change how your hard drives are partitioned, or change the file\n"
+"system, you should use this option. However, depending on your partitioning\n"
+"scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
-" * \"Upgrade\": this installation class allows you to update the packages\n"
+" * \"%s\": this installation class allows you to update the packages\n"
 "currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
@@ -317,22 +319,20 @@ msgstr ""
 "votre disque dur.\n"
 "\n"
 "DrakX doit maintenant savoir quel type d'installation vous dИsirez\n"
-"rИaliser. Deux types d'installations sont proposИs : Par dИfaut (╚═\n"
-"RecommandИe═╩), qui limite le nombre de questions Ю l'utilisateur au\n"
-"minimum ou ╚═Expert═╩ qui vous permet de sИlectionner individuellement\n"
-"chacune des composantes Ю installer. Il vous est Иgalement proposИ de faire\n"
-"une ╚═Installation═╩ ou une ╚═Mise Ю jour═╩ d'un systХme Mandrake Linux\n"
-"dИjЮ installИ :\n"
-"\n"
-" * ╚═Installation═╩ : Remplace l'ancien systХme. En fait, selon ce que\n"
-"votre machine comporte, vous pourrez garder intactes certaines des\n"
-"anciennes partitions (Linux ou autres) ;\n"
-"\n"
-" * ╚═Mise Ю jour═╩ : cette classe d'installation permet de mettre Ю jour\n"
-"seulement les paquetages qui composent votre systХme Mandrake Linux. Elle\n"
-"conserve les partitions existantes, ainsi que la configuration des\n"
-"utilisateurs. La plupart des autres Иtapes d'une installation classique\n"
-"sont accessibles ;\n"
+"rИaliser. Deux types d'installations sont proposИs : Par dИfaut (╚═%s═╩),\n"
+"qui limite le nombre de questions Ю l'utilisateur au minimum ou ╚═%s═╩ qui\n"
+"vous permet de sИlectionner individuellement chacune des composantes Ю\n"
+"installer. Il vous est Иgalement proposИ de faire une ╚═%s═╩ ou une ╚═%s═╩\n"
+"d'un systХme Mandrake Linux dИjЮ installИ :\n"
+"\n"
+" * ╚═%s═╩ : Remplace l'ancien systХme. En fait, selon ce que votre machine\n"
+"comporte, vous pourrez garder intactes certaines des anciennes partitions\n"
+"(Linux ou autres) ;\n"
+"\n"
+" * ╚═%s═╩ : cette classe d'installation permet de mettre Ю jour seulement\n"
+"les paquetages qui composent votre systХme Mandrake Linux. Elle conserve\n"
+"les partitions existantes, ainsi que la configuration des utilisateurs. La\n"
+"plupart des autres Иtapes d'une installation classique sont accessibles ;\n"
 "\n"
 "La mise Ю jour devrait fonctionner correctement pour les systХme Mandrake\n"
 "Linux Ю partir de la version ╚═8.1═╩. Essayer de lancer une mise Ю jour sur\n"
@@ -344,84 +344,82 @@ msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Bugs may have been\n"
 "fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"Yes\"\n"
-"if you have a working Internet connection, or \"No\" if you prefer to\n"
+"updates, you are now able to download them from the Internet. Check \"%s\"\n"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
 "install updated packages later.\n"
 "\n"
-"Choosing \"Yes\" will display a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. A package-selection tree will\n"
-"appear: review the selection, and press \"Install\" to retrieve and install\n"
-"the selected package(s), or \"Cancel\" to abort."
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one nearer to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "Au moment oЫ vous Йtes en train d'installer Mandrake Linux, il est possible\n"
 "que certains paquetages aient ИtИ mis Ю jour depuis la sortie du produit.\n"
 "Des bogues ont pu Йtre corrigИs, et des problХmes de sИcuritИ rИsolus. Pour\n"
 "vous permettre de bИnИficier de ces mises Ю jour, il vous est maintenant\n"
-"proposИ de les tИlИcharger depuis Internet. Choisissez ╚═Oui═╩ si vous avez\n"
-"une connexion Internet, ou ╚═Non═╩ si vous prИfИrez installer les mises Ю\n"
+"proposИ de les tИlИcharger depuis Internet. Choisissez ╚═%s═╩ si vous avez\n"
+"une connexion Internet, ou ╚═%s═╩ si vous prИfИrez installer les mises Ю\n"
 "jour plus tard.\n"
 "\n"
-"En choisissant ╚═Oui═╩, la liste des sites depuis lesquels les mises Ю jour\n"
+"En choisissant ╚═%s═╩, la liste des sites depuis lesquels les mises Ю jour\n"
 "peuvent Йtre tИlИchargИes est affichИe. Choisissez le site le plus proche.\n"
 "Puis un arbre de choix des paquetages apparaНt : vИrifiez la sИlection,\n"
-"puis cliquez sur ╚═Installer═╩ pour tИlИ-charger et installer les mises Ю\n"
-"jour sИlectionnИes, ou ╚═Annuler═╩ pour abandonner."
+"puis cliquez sur ╚═%s═╩ pour tИlИ-charger et installer les mises Ю jour\n"
+"sИlectionnИes, ou ╚═%s═╩ pour abandonner."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"This dialog allows to finely tune your bootloader:\n"
+"This dialog allows you to fine tune your bootloader:\n"
 "\n"
-" * \"Bootloader to use\": there are three choices for your bootloader:\n"
+" * \"%s\": there are three choices for your bootloader:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"%s\": if you prefer grub (text menu).\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
 "\n"
-" * \"Delay before booting the default image\": after a boot or a reboot of\n"
-"the computer, this is the delay given to the user at the console to select\n"
-"a boot entry other than the default.\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
-"system! Be sure you know what you do before changing any of the options. !!\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
-"that are reserved for the expert user."
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
 msgstr ""
 "Ce dialogue permet de contrТler finement le chargeur de dИmarrage :\n"
 "\n"
-" * ╚═Programme d'amorГage Ю utiliser═╩ vous propose trois choix :\n"
+" * ╚═%s═╩ vous propose trois choix :\n"
 "\n"
-"    * ╚═GRUB═╩ : si vous prИfИrez GRUB (menu texte).\n"
+"    * ╚═%s═╩ : si vous prИfИrez GRUB (menu texte).\n"
 "\n"
-"    * ╚═LILO en mode texte═╩ : si vous prИfИrez la version texte de LILO.\n"
+"    * ╚═%s═╩ : si vous prИfИrez la version texte de LILO.\n"
 "\n"
-"    * ╚═LILO en mode graphique═╩ : si vous prИfИrez l'interface graphique.\n"
+"    * ╚═%s═╩ : si vous prИfИrez l'interface graphique.\n"
 "\n"
-" * ╚═PИriphИriques de dИmarrage═╩: dans la plupart des cas, vous n'aurez\n"
-"pas Ю changer le disque par dИfaut (╚═/dev/hda═╩, mais si vous le dИsirez,\n"
-"le programme d'amorce peut Йtre installИ sur un second disque,\n"
-"╚═/dev/hdb═╩, ou mЙme sur une disquette, ╚═/dev/fd0═╩.\n"
+" * ╚═%s═╩: dans la plupart des cas, vous n'aurez pas Ю changer le disque\n"
+"par dИfaut (╚═%s═╩, mais si vous le dИsirez, le programme d'amorce peut\n"
+"Йtre installИ sur un second disque, ╚═%s═╩, ou mЙme sur une disquette,\n"
+"╚═%s═╩.\n"
 "\n"
-" * ╚═DИlais avant l'activation du choix par dИfaut═╩: au redИmarrage de\n"
-"l'ordinateur, il s'agit du temps accordИ Ю l'utilisateur pour dИmarrer un\n"
-"autre systХme d'exploitation.\n"
+" * ╚═%s═╩: au redИmarrage de l'ordinateur, il s'agit du temps accordИ Ю\n"
+"l'utilisateur pour dИmarrer un autre systХme d'exploitation.\n"
 "\n"
 "!! Prenez garde, si vous dИcidez de ne pas installer de programme d'amorce\n"
-"(en cliquant sur ╚═Passer═╩), vous devez vous assurer d'avoir une mИthode\n"
-"pour dИmarrer le systХme. Aussi, assurez-vous de bien savoir ce que vous\n"
-"faites si vous modifiez les options. !!\n"
+"(en cliquant sur ╚═%s═╩), vous devez vous assurer d'avoir une mИthode pour\n"
+"dИmarrer le systХme. Aussi, assurez-vous de bien savoir ce que vous faites\n"
+"si vous modifiez les options. !!\n"
 "\n"
-"En cliquant sur ╚═AvancИe═╩, vous aurez accХs Ю plusieurs autres options de\n"
+"En cliquant sur ╚═%s═╩, vous aurez accХs Ю plusieurs autres options de\n"
 "configuration. Sachez que celles-ci sont rИservИes aux experts en la\n"
 "matiХre."
 
@@ -429,7 +427,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
+"Please choose which one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -496,32 +494,32 @@ msgid ""
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
-"You will be presented the list of different parameters to change to get an\n"
-"optimal graphical display: Graphic Card\n"
+"You will be presented with a list of different parameters to change to get\n"
+"an optimal graphical display: Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs.\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own.\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor.\n"
 "\n"
 "\n"
@@ -529,7 +527,7 @@ msgid ""
 "Test\n"
 "\n"
 "   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"Yes\",\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
 "then DrakX will proceed to the next step. If you cannot see the message, it\n"
 "means that some part of the autodetected configuration was incorrect and\n"
 "the test will automatically end after 12 seconds, bringing you back to the\n"
@@ -539,14 +537,14 @@ msgid ""
 "\n"
 "Options\n"
 "\n"
-"   You can here choose whether you want to have your machine automatically\n"
+"   Here you can choose whether you want to have your machine automatically\n"
 "switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"No\" if your machine is to act as a server, or if you were not successful\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
 "X (pour le systХme X Window) est le coeur de votre interface graphique sous\n"
-"GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker et.)\n"
-"prИsents sur Mandrake Linux dИpendent de X.\n"
+"GNU/Linux. Tous les environnements graphiques (KDE, GNOME, WindowMaker\n"
+"etc.) prИsents sur Mandrake Linux dИpendent de X.\n"
 "\n"
 "Il vous sera prИsentИ la liste de divers paramХtres Ю changer pour obtenir\n"
 "un affichage optimal : Carte graphique\n"
@@ -584,7 +582,7 @@ msgstr ""
 "\n"
 "   le systХme va ici essayer d'ouvrir un Иcran graphique Ю la rИsolution\n"
 "choisie. Si vous pouvez voir le message pendant le test, et rИpondez\n"
-"╚═Oui═╩, alors DrakX passera Ю l'Иtape suivante. Si vous ne pouvez pas voir\n"
+"╚═%s═╩, alors DrakX passera Ю l'Иtape suivante. Si vous ne pouvez pas voir\n"
 "de message, cela signifie que vos paramХtres sont incompatibles, et le test\n"
 "terminera automatiquement aprХs 12 secondes. Changez la configuration\n"
 "jusqu'Ю obtenir un affichage correct lors du test.\n"
@@ -594,7 +592,7 @@ msgstr ""
 "Options\n"
 "\n"
 "   Vous pourrez finalement choisir ici de dИmarrer l'interface graphique au\n"
-"lancement de la machine. Il est prИfИrable de choisir ╚═Non═╩ si vous Йtes\n"
+"lancement de la machine. Il est prИfИrable de choisir ╚═%s═╩ si vous Йtes\n"
 "en train d'installer un serveur, ou si vous n'avez pas rИussi Ю configurer\n"
 "l'Иcran correctement."
 
@@ -602,23 +600,23 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
-"is best for a particular type of configuration.\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"is best suited to particular types of configuration.\n"
 "\n"
-" * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"pdq\n"
-"\" will handle only very simple network cases and is somewhat slow when\n"
-"used with networks.) It's recommended that you use \"pdq\" if this is your\n"
-"first experience with GNU/Linux.\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
 "printing to your local printer or to one halfway around the planet. It is\n"
 "simple to configure and can act as a server or a client for the ancient\n"
 "\"lpd \" printing system, so it compatible with older operating systems\n"
-"that may still need print services. While quite powerful, the basic setup\n"
+"which may still need print services. While quite powerful, the basic setup\n"
 "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
 "front-ends for printing or choosing printer options and for managing the\n"
 "printer.\n"
 "\n"
@@ -629,7 +627,7 @@ msgstr ""
 "Il faut choisir ici un systХme d'impression pour votre ordinateur. D'autres\n"
 "OSs offrent un, Mandrake Linux en propose deux.\n"
 "\n"
-" * ╚═pdq═╩ - qui veut dire ╚═print, don't queue═╩, (ou, impression sans\n"
+" * ╚═%s═╩ - qui veut dire ╚═print, don't queue═╩, (ou, impression sans\n"
 "passer par la file d'attente) est un bon choix si votre imprimante est\n"
 "branchИe directement sur votre poste et que vous voulez pouvoir arrЙter\n"
 "l'impression directement en cas de problХme et que vous n'avez pas\n"
@@ -637,9 +635,9 @@ msgstr ""
 "les performances sont plutТt mauvaises dans ces cas. Choisissez pdq si vous\n"
 "Йtes Ю une premiХre expИrience avec Linux. Vous pourrez toujours changer de\n"
 "systХme plus tard avec PrinterDrake Ю partir du Centre de contrТle Mandrake\n"
-"en cliquant sur ╚═Expert═╩.\n"
+"en cliquant sur ╚═%s═╩.\n"
 "\n"
-" * ╚═CUPS═╩ - ╚═Common Unix Printing System═╩, est fabuleux tant pour\n"
+" * ╚═%s═╩ - ╚═Common Unix Printing System═╩, est fabuleux tant pour\n"
 "imprimante local que pour imprimer Ю l'autre bout du monde. C'est simple et\n"
 "il peu agir comme serveur ou un client avec l'ancien systХme d'impression\n"
 "╚═lpd═╩. Il s'agit d'un outil trХs puissant, mais les configurations de\n"
@@ -648,7 +646,7 @@ msgstr ""
 "pour imprimer et choisir les imprimantes.\n"
 "\n"
 "Vous pourrez changer ultИrieurement de systХme d'impression en lanГant\n"
-"PrinterDrake depuis le Mandrake Control Center."
+"PrinterDrake depuis le Centre de contrТle Mandrake."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -661,47 +659,45 @@ msgid ""
 "Packages are sorted into groups corresponding to a particular use of your\n"
 "machine. Mandrake Linux has four predefined installations available. You\n"
 "can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various containers, so a\n"
+"You can mix and match applications from the various groups, so a\n"
 "``Workstation'' installation can still have applications from the\n"
-"``Development'' container installed.\n"
+"``Development'' group installed.\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the applications that are in the workstation\n"
-"container.\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the applications that are in the workstation group.\n"
 "\n"
-" * \"Development\": if plan on using your machine for programming, choose\n"
-"the appropriate packages from the container.\n"
+" * \"%s\": if plan on using your machine for programming, choose the\n"
+"appropriate packages from that group.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, select which of\n"
-"the more common services you wish to install on your machine.\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical interface available.\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
 "text about that group. If you unselect all groups when performing a regular\n"
 "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the minimum number of packages possible to have a\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server.\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
 "\n"
-" * \"Truly minimal install\": will install the absolute minimum number of\n"
-"packages necessary to get a working Linux system. With this installation\n"
-"you will only have a command line interface. The total size of this\n"
-"installation is 65 megabytes.\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installИs\n"
@@ -712,18 +708,18 @@ msgstr ""
 "Les paquetages sont regroupИs selon la nature de l'installation. Les\n"
 "groupes sont divisИs en quatre sections principales :\n"
 "\n"
-" * ╚═Station de travail═╩: si vous comptez utiliser votre machine ainsi,\n"
-"sИlectionner un ou plusieurs groupes y correspondant.\n"
+" * ╚═%s═╩: si vous comptez utiliser votre machine ainsi, sИlectionner un ou\n"
+"plusieurs groupes y correspondant.\n"
 "\n"
-" * ╚═DИveloppement═╩: si votre systХme doit Йtre utilisИ pour la\n"
-"programmation, choisissez les groupes dИsirИs.\n"
+" * ╚═%s═╩: si votre systХme doit Йtre utilisИ pour la programmation,\n"
+"choisissez les groupes dИsirИs.\n"
 "\n"
-" * ╚═Serveur═╩: finalement, si votre systХme doit agir en tant que serveur,\n"
-"vous pourrez sИlectionner les services que vous voulez installer.\n"
+" * ╚═%s═╩: finalement, si votre systХme doit agir en tant que serveur, vous\n"
+"pourrez sИlectionner les services que vous voulez installer.\n"
 "\n"
-" * ╚═Environnement graphique═╩: ce groupe vous permettra de dИterminer quel\n"
-"environnement graphique vous voulez avoir sur votre systХme. иvidemment, il\n"
-"vous en faut au moins un pour utiliser votre station en mode graphique.\n"
+" * ╚═%s═╩: ce groupe vous permettra de dИterminer quel environnement\n"
+"graphique vous voulez avoir sur votre systХme. иvidemment, il vous en faut\n"
+"au moins un pour utiliser votre station en mode graphique.\n"
 "\n"
 "En plaГant votre souris au dessus d'un nom de groupe, vous verrez\n"
 "apparaНtre une courte description de ce groupe. Si vous dИ-sИlectionnez\n"
@@ -731,23 +727,22 @@ msgstr ""
 "mise Ю jour), un dialogue apparaНtra proposant diffИrentes options pour une\n"
 "installation minimale :\n"
 "\n"
-" * ╚═Avec X═╩ : installe le moins de paquetages possible pour avoir un\n"
+" * ╚═%s═╩ : installe le moins de paquetages possible pour avoir un\n"
 "environnement de travail graphique ;\n"
 "\n"
-" * ╚═Avec la documentation de base═╩ : installe le systХme de base plus\n"
-"certains utilitaires de base et leur documentation. Cette installation est\n"
-"utilisable comme base pour monter un serveur ;\n"
+" * ╚═%s═╩ : installe le systХme de base plus certains utilitaires de base\n"
+"et leur documentation. Cette installation est utilisable comme base pour\n"
+"monter un serveur ;\n"
 "\n"
-" * ╚═Installation vraiment minimale═╩ : installera le strict minimum\n"
-"nИcessaire pour obtenir un systХme GNU/Linux fonctionnel, en ligne de\n"
-"commande. Cette installation prends Ю peu prХs 65Mo.\n"
+" * ╚═%s═╩ : installera le strict minimum nИcessaire pour obtenir un systХme\n"
+"GNU/Linux fonctionnel, en ligne de commande. Cette installation prends Ю\n"
+"peu prХs 65 MO.\n"
 "\n"
-"Vous pouvez finalement cocher l'option ╚═SИlection individuelle des\n"
-"paquetages═╩. Cette option est Ю utiliser si vous connaissez exactement le\n"
-"paquetage dИsirИ ou si vous voulez avoir le contrТle total de votre\n"
-"installation.\n"
+"Vous pouvez finalement cocher l'option ╚═%s═╩. Cette option est Ю utiliser\n"
+"si vous connaissez exactement le paquetage dИsirИ ou si vous voulez avoir\n"
+"le contrТle total de votre installation.\n"
 "\n"
-"Si vous avez dИmarrИ l'installation en mode ╚═mise Ю jour═╩, vous pouvez\n"
+"Si vous avez dИmarrИ l'installation en mode ╚═%s═╩, vous pouvez\n"
 "╚═dИ-sИlectionner═╩ tous les groupes afin d'Иviter l'installation de\n"
 "nouveaux programmes. Cette option est trХs utile pour restaurer un systХme\n"
 "dИfectueux."
@@ -769,19 +764,20 @@ msgstr ""
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
+"administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
 "guess - DrakX will tell you if the password that you chose too easy. As you\n"
 "can see, you are not forced to enter a password, but we strongly advise you\n"
-"against. GNU/Linux is as prone to operator error as any other operating\n"
-"system. Since \"root\" can overcome all limitations and unintentionally\n"
-"erase all data on partitions by carelessly accessing the partitions\n"
-"themselves, it is important that it be difficult to become \"root\".\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
 "\n"
 "One caveat -- do not make the password too long or complicated because you\n"
 "must be able to remember it!\n"
@@ -789,18 +785,19 @@ msgid ""
 "The password will not be displayed on screen as you type it in. To reduce\n"
 "the chance of a blind typing error you will need to enter the password\n"
 "twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
 "\n"
 "If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"Advanced\" button.\n"
+"server, click the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you do not\n"
-"know which to use, ask your network administrator.\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with reminding passwords, you can choose to\n"
-"have \"No password\", if your computer won't be connected to the Internet,\n"
-"and if you trust anybody having access to it."
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the internet or that you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Vous devez prendre ici une dИcision cruciale pour la sИcuritИ de votre\n"
 "systХme. L'utilisateur ╚═root═╩ est l'administrateur du systХme qui a tous\n"
@@ -831,34 +828,33 @@ msgstr ""
 "demandez Ю votre administrateur de rИseau.\n"
 "\n"
 "Si vous souhaitez que l'accХs Ю cette machine soit contrТlИ par un serveur\n"
-"d'authentification, cliquez sur le bouton ╚═AvancИ═╩.\n"
+"d'authentification, cliquez sur le bouton ╚═%s═╩.\n"
 "\n"
 "Si votre rИseau utilise soit LDAP, NIS, ou un PDC Windows, choisissez-le\n"
 "comme protocole d'authentification. En cas de doute, demandez Ю votre\n"
 "administrateur rИseau.\n"
 "\n"
 "Si vous avez des problХmes Ю vous souvenir de vos mots de passe, vous\n"
-"pouvez choisir ╚═Pas de mot de passe═╩, si votre ordinateur ne sera pas\n"
-"connectИ Ю Internet, et si vous avez confiance en tous ceux qui auront\n"
-"accХs Ю cette machine."
+"pouvez choisir ╚═%s═╩, si votre ordinateur ne sera pas connectИ Ю Internet,\n"
+"et si vous avez confiance en tous ceux qui auront accХs Ю cette machine."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"Click on \"Next ->\" if you want to delete all data and partitions present\n"
-"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
-"be able to recover any data and partitions present on this hard drive,\n"
-"including any Windows data.\n"
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"Click on \"%s\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Cliquez sur ╚═OK═╩ si vous voulez vraiment effacer toute l'information et\n"
-"les partitions. Soyez prudent, aprХs avoir cliquИ sur ╚═OK═╩, vous ne\n"
+"Cliquez sur ╚═%s═╩ si vous voulez vraiment effacer toute l'information et\n"
+"les partitions. Soyez prudent, aprХs avoir cliquИ sur ╚═%s═╩, vous ne\n"
 "pourrez plus rИcupИrer les donnИes ou les partitions, y compris les donnИes\n"
 "Windows.\n"
 "\n"
-"Cliquez ╚═annuler═╩ pour annuler cette opИration sans perdre de donnИes."
+"Cliquez ╚═%s═╩ pour annuler cette opИration sans perdre de donnИes."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -877,17 +873,17 @@ msgid ""
 "installed. By default Mandrake Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes are discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
 "default during boot. !!\n"
 "\n"
-"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
-"which appears whenever the installer automatically selects a package to\n"
-"resolve a dependency issue. Some packages have relationships between each\n"
-"other such that installation of a package requires that some other program\n"
-"is already installed. The installer can determine which packages are\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each other such\n"
+"that installation of a package requires that some other program is also\n"
+"rerquired to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -904,10 +900,10 @@ msgstr ""
 "paquetages individuels.\n"
 "\n"
 "DХs que vous sИlectionnez un paquetage dans l'arbre, une description\n"
-"apparaНt Ю droite. Une fois votre sИlection terminИe, cliquez sur\n"
-"╚═Installation═╩ pour lancer le processus. Soyez patient, car en fonction\n"
-"du type d'installation choisi ou du nombre de paquetages sИlectionnИs, le\n"
-"temps requis peut Йtre substantiellement diffИrent. Une estimation du temps\n"
+"apparaНt Ю droite. Une fois votre sИlection terminИe, cliquez sur ╚═%s═╩\n"
+"pour lancer le processus. Soyez patient, car en fonction du type\n"
+"d'installation choisi ou du nombre de paquetages sИlectionnИs, le temps\n"
+"requis peut Йtre substantiellement diffИrent. Une estimation du temps\n"
 "requis est prИsentИe sur l'Иcran en cours d'opИration afin de vous\n"
 "permettre d'Иvaluer de combien de temps vous disposez pour prendre votre\n"
 "dИjeuner.\n"
@@ -919,13 +915,13 @@ msgstr ""
 "possible que certaines failles de sИcuritИ affectes les serveurs installИs\n"
 "au-delЮ de la date de publication. Si vous ne savez pas prИcisИment Ю quoi\n"
 "sert un serveur en particulier ou pourquoi il est installИ, cliquez sur\n"
-"╚═NON═╩. En cliquant sur ╚═OUI═╩, le serveur sera installИ et le service\n"
+"╚═%s═╩. En cliquant sur ╚═%s═╩, le serveur sera installИ et le service\n"
 "rendu disponible au dИmarrage. !!\n"
 "\n"
-"L'option ╚═DИpendances automatiques═╩ dИsactive les avertissements qui\n"
-"apparaissent Ю chaque fois que l'installeur sИlectionne un nouveau paquet.\n"
-"Ces avertissements surviennent parce que DrakX a dИterminИ que pour qu'un\n"
-"paquetage soit fonctionnel, il lui en faut un autre dont il est dИpendant.\n"
+"L'option ╚═%s═╩ dИsactive les avertissements qui apparaissent Ю chaque fois\n"
+"que l'installeur sИlectionne un nouveau paquet. Ces avertissements\n"
+"surviennent parce que DrakX a dИterminИ que pour qu'un paquetage soit\n"
+"fonctionnel, il lui en faut un autre dont il est dИpendant.\n"
 "\n"
 "La petite icТne de disquette qui apparaНt au bas de la liste permet de\n"
 "rИcupИrer une liste de paquetages sИlectionnИs durant une autre\n"
@@ -948,17 +944,12 @@ msgid ""
 "one.\n"
 "\n"
 "If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader.\n"
-"\n"
-"\"Boot device\": in most cases, you will not change the default (\"First\n"
-"sector of drive (MBR)\"), but if you prefer, the bootloader can be\n"
-"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
-"(\"On Floppy\")."
+"bootloader."
 msgstr ""
 "LILO et grub sont deux programmes d'amorce pour GNU/Linux. Cette Иtape est\n"
 "normalement complХtement automatique. En fait, DrakX analyse le secteur de\n"
-"dИmarrage (master boot record) et agit en fonction de ce qu'il peut y lire\n"
-":\n"
+"dИmarrage (╚═master boot record═╩) et agit en fonction de ce qu'il peut y\n"
+"lire :\n"
 "\n"
 " * Si un secteur de dИmarrage Windows est dИtectИ, il sera remplacИ par\n"
 "grub/LILO. Donc, vous serez capable de dИmarrer GNU/Linux et tout autre\n"
@@ -966,12 +957,7 @@ msgstr ""
 "\n"
 " * si grub ou LILO est dИtectИ, il sera remplacИ par la nouvelle version;\n"
 "\n"
-"En cas de doute, DrakX affiche diffИrentes options.\n"
-"\n"
-"╚═PИriphИrique d'amorГage═╩ : dans la plupart des cas vous ne devrez pas\n"
-"changer la configuration proposИe (╚═Premier secteur du lecteur (MBR)═╩),\n"
-"mais si vous prИfИrez, le chargeur peut Йtre installИ sur le deuxiХme\n"
-"disque (╚═/dev/hdb═╩), ou mЙme sur une disquette (╚═Sur disquette═╩)."
+"En cas de doute, DrakX affiche diffИrentes options."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -981,7 +967,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, You'll have to specify your hardware by hand.\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1025,8 +1011,8 @@ msgid ""
 " * Label: this is the name you will have to type at the yaboot prompt to\n"
 "select this boot option.\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
 "\n"
 " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
@@ -1060,51 +1046,56 @@ msgid ""
 "selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
 "highlighted with a ``*'' if you press [Tab] to see the boot selections."
 msgstr ""
-"You can add additional entries for yaboot, either for other operating\n"
-"systems, alternate kernels, or for an emergency boot image.\n"
+"Vous pouvez ajouter des entrИes supplИmentaires au menu yaboot, soit pour\n"
+"d'autres systХmes d'exploitation, des noyaux alternatifs, ou pour des\n"
+"images de dИmarrage en cas de problХme.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the ╚═root═╩\n"
-"partition.\n"
+"Pour les autres OS, l'entrИe n'est constituИe que d'une Иtiquette et d'une\n"
+"partition ╚═root═╩.\n"
 "\n"
-"For Linux, there are a few possible options:\n"
+"Pour Linux, quelques options sont disponibles :\n"
 "\n"
-" * Label: this is simply the name you will have to type at the yaboot\n"
-"prompt to select this boot option;\n"
+" * иtiquette : c'est simplement le nom que vous devrez taper lors de\n"
+"l'invite yaboot pour choisir cette option de dИmarrage ;\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension;\n"
+" * Image : c'est le nom de l'image noyau Ю dИmarrer. GИnИralement, on\n"
+"utilise vmlinux ou une variante de vmlinux avec une extension ;\n"
 "\n"
-" * Root: the ╚═root═╩ device or ╚═/═╩ for your Linux installation;\n"
+" * Root : le pИriphИrique ╚═root═╩ ou ╚═/═╩ pour votre installation Linux ;\n"
 "\n"
-" * Append: on Apple hardware, the kernel append option is used quite often\n"
-"to assist in initializing video hardware, or to enable keyboard mouse\n"
-"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
-"Apple mouse. The following are some examples:\n"
+" * Adjonction (╚═Append═╩) : sur le matИriel Apple, l'option d'adjonction\n"
+"noyau est utilisИe assez souvent afin d'aider Ю l'initialisation de\n"
+"matИriel vidИo ou pour permettre l'Иmulation de la souris clavier, vu que\n"
+"les souris Apple n'ont souvent qu'un bouton. Voici quelques exemples :\n"
 "\n"
 "   video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
 "hda=autotune\n"
 "\n"
 "   video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-" * Initrd: this option can be used either to load initial modules, before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation;\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
-"need to allocate a large ramdisk, this option can be used;\n"
-"\n"
-" * Read-write: normally the ╚═root═╩ partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ╚═live═╩.\n"
-"Here, you can override this option;\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ╚═novideo═╩ mode, with\n"
-"native frame buffer support;\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
-"also be highlighted with a ╚═*═╩, if you press [Tab] to see the boot\n"
-"selections."
+" * Initrd : cette option peut Йtre utilisИe pour charger des modules\n"
+"initiaux avant que le pИriphИrique de dИmarrage ne soit disponible, ou pour\n"
+"charger une image de disque virtuel (╚═ramdisk═╩) dans le cas oЫ une\n"
+"situation de dИmarrage d'urgence surviendrait ;\n"
+"\n"
+" * Initrd-size : la taille par dИfaut de l'image de disque virtuel est\n"
+"normalement 4 096 octets. Si vous avez besoin d'un grand espace de disque\n"
+"virtuel, cette option peut Йtre utilisИe ;\n"
+"\n"
+" * Lecture-Иcriture : normalement, la partition ╚═root═╩ est montИe en\n"
+"╚═lecture seulement═╩ pour permettre une vИrification du systХme de\n"
+"fichiers avant que le systХme ne soit ╚═live═╩. Vous pouvez changer ces\n"
+"options dans cette section ;\n"
+"\n"
+" * NoVideo : si le matИriel vidИo Apple devait trХs mal fonctionner, vous\n"
+"pouvez sИlectionner cette option pour dИmarrer en mode ╚═novideo═╩, avec\n"
+"une prise en charge native de la mИmoire d'image (╚═frame buffer═╩) ;\n"
+"\n"
+" * DИfaut : sИlectionne cette entrИe en tant que choix Linux par dИfaut. En\n"
+"tapant sur ENTRиE lors de l'invite de yaboot, vous y accИderez\n"
+"automatiquement. Cette entrИe sera mise en Иvidence par le biais d'une\n"
+"astИrisque (╚═*═╩) et si vous cliquez sur la touche [Tab], vous verrez\n"
+"toutes les sИlections de dИmarrage possibles."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -1113,21 +1104,20 @@ msgid ""
 "documentation, the installer and the system in general. Select first the\n"
 "region you are located in, and then the language you speak.\n"
 "\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation, thereby installing the\n"
-"language-specific files for system documentation and applications. For\n"
-"example, if you will host users from Spain on your machine, select English\n"
-"as the default language in the tree view and \"Espanol\" in the Advanced\n"
-"section.\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"All\n"
-"languages\" box. Selecting support for a language means translations,\n"
-"fonts, spell checkers, etc. for that language will be installed.\n"
-"Additionally, the \"Use Unicode by default\" checkbox allows to force the\n"
-"system to use unicode (UTF-8). Note however that this is an experimental\n"
-"feature. If you select different languages requiring different encoding the\n"
-"unicode support will be installed anyway.\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will be installed. Additionally, the\n"
+"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
+"however that this is an experimental feature. If you select different\n"
+"languages requiring different encoding the unicode support will be\n"
+"installed anyway.\n"
 "\n"
 "To switch between the various languages installed on the system, you can\n"
 "launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
@@ -1140,23 +1130,22 @@ msgstr ""
 "le systХme en gИnИral. Commencez par choisir la rИgion oЫ vous vous situez,\n"
 "puis la langue que vous parlez.\n"
 "\n"
-"En cliquant sur ╚═AvancИ═╩, le programme vous proposera Иgalement des\n"
-"langues complИmentaires pouvant Йtre installИes sur votre station de\n"
-"travail. En choisissant des langues supplИmentaires, le programme vous\n"
-"installera toute la documentation et les applications nИcessaires Ю\n"
-"l'utilisation de ces langues. Par exemple, si vous prИvoyez d'accueillir\n"
-"des utilisateurs d'Espagne sur votre machine, choisissez le franГais comme\n"
-"langue principale dans l'arborescence, et ╚═EspaЯol═╩, dans la section\n"
-"avancИe.\n"
+"En cliquant sur ╚═%s═╩, le programme vous proposera Иgalement des langues\n"
+"complИmentaires pouvant Йtre installИes sur votre station de travail. En\n"
+"choisissant des langues supplИmentaires, le programme vous installera toute\n"
+"la documentation et les applications nИcessaires Ю l'utilisation de ces\n"
+"langues. Par exemple, si vous prИvoyez d'accueillir des utilisateurs\n"
+"d'Espagne sur votre machine, choisissez le franГais comme langue principale\n"
+"dans l'arborescence, et ╚═%s═╩, dans la section avancИe.\n"
 "\n"
 "Remarquez que vous n'Йtes pas limitИ Ю une langue supplИmentaire. Vous\n"
 "pouvez en choisir plusieurs, ou mЙme les installer toutes en choisissant\n"
-"╚═Toutes les langues═╩. Choisir le support pour une langue signifie ajouter\n"
-"les traductions, les polices, correcteurs orthographiques, etc. La case\n"
-"╚═Utiliser Unicode par dИfaut═╩ force le systХme Ю utiliser l'encodage\n"
-"unicode (UTF-8). Mais c'est une fonctionnalitИ expИrimentale. Toutefois, si\n"
-"vous sИlectionnez des langages qui nИcessitent des encodages incompatibles,\n"
-"le support unicode sera installИ de toutes faГons.\n"
+"╚═%s═╩. Choisir le support pour une langue signifie ajouter les\n"
+"traductions, les polices, correcteurs orthographiques, etc. La case ╚═%s═╩\n"
+"force le systХme Ю utiliser l'encodage unicode (UTF-8). Mais c'est une\n"
+"fonctionnalitИ expИrimentale. Toutefois, si vous sИlectionnez des langages\n"
+"qui nИcessitent des encodages incompatibles, le support unicode sera\n"
+"installИ de toutes faГons.\n"
 "\n"
 "Pour passer d'une langue Ю l'autre, vous pouvez lancer l'utilitaire\n"
 "╚═/usr/sbin/localedrake═╩ en tant que ╚═root═╩ pour changer la langue\n"
@@ -1166,13 +1155,13 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"\"Sound card\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver."
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
 msgstr ""
-"╚═Carte son═╩ : si une carte son a ИtИ dИtectИe, elle apparaНtra ici. Si\n"
-"vous remarquez que la carte configurИe n'est pas celle qui se trouve\n"
+"╚═%s═╩ : si une carte son a ИtИ dИtectИe, elle apparaНtra ici. Si vous\n"
+"remarquez que la carte configurИe n'est pas celle qui se trouve\n"
 "effectivement sur votre systХme, vous pouvez cliquer sur le bouton pour en\n"
 "choisir une autre."
 
@@ -1184,9 +1173,9 @@ msgid ""
 "\n"
 "If there are other operating systems installed on your machine they will\n"
 "automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
-"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
-"your changes.\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
 "anyone who goes to the console and reboots the machine. You can delete the\n"
@@ -1199,9 +1188,9 @@ msgstr ""
 "\n"
 "Si d'autres systХmes d'exploitation sont dИtectИs, il seront\n"
 "automatiquement ajoutИs au menu dИmarrage. Vous pouvez ici affiner votre\n"
-"configuration. Cliquez sur ╚═Ajouter═╩ pour crИer une nouvelle entrИe;\n"
-"Choisissez une entrИe, cliquez ╚═Modifier═╩ pour l'Иditer, ou ╚═Supprimer═╩\n"
-"pour l'enlever. ╚═OK═╩ validera vos changements.\n"
+"configuration. Cliquez sur ╚═%s═╩ pour crИer une nouvelle entrИe;\n"
+"Choisissez une entrИe, cliquez ╚═%s═╩ pour l'Иditer, ou ╚═%s═╩ pour\n"
+"l'enlever. ╚═%s═╩ validera vos changements.\n"
 "\n"
 "Il est possible que vous vouliez limiter l'accХs Ю ce systХme\n"
 "d'exploitation. Il vous suffit de retirer l'entrИe dans les options de\n"
@@ -1211,8 +1200,8 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Mandrake Linux partition. Be careful, all data present on this partition\n"
+"will be lost and will not be recoverable!"
 msgstr ""
 "Choisissez le disque dur Ю effacer pour installer votre partition\n"
 "GNU/Linux. Soyez prudent, toute l'information stockИe sur le disque sera\n"
@@ -1221,29 +1210,30 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"\"Printer\": clicking on the \"Configure\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation."
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
 msgstr ""
-"╚═Imprimante═╩: en cliquant sur ╚═Configurer═╩, l'outil de configuration\n"
-"d'impression sera dИmarrИ. Consultez le chapitre correspondant du ╚═Guide\n"
-"de dИmarrage═╩ pour plus de renseignements. L'interface qui y est\n"
-"documentИe est similaire Ю celle rencontrИe lors de l'installation."
+"╚═%s═╩: en cliquant sur ╚═%s═╩, l'outil de configuration d'impression sera\n"
+"dИmarrИ. Consultez le chapitre correspondant du ╚═Guide de dИmarrage═╩ pour\n"
+"plus de renseignements. L'interface qui y est documentИe est similaire Ю\n"
+"celle rencontrИe lors de l'installation."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
 msgstr ""
 "Options\n"
 "\n"
 "   Vous pourrez finalement choisir ici de dИmarrer l'interface graphique au\n"
-"lancement de la machine. Il est prИfИrable de choisir ╚═Non═╩ si vous Йtes\n"
+"lancement de la machine. Il est prИfИrable de choisir ╚═%s═╩ si vous Йtes\n"
 "en train d'installer un serveur, ou si vous n'avez pas rИussi Ю configurer\n"
 "l'Иcran correctement."
 
@@ -1265,149 +1255,146 @@ msgid ""
 "directly exposed to the Internet. The trade-off of a higher security level\n"
 "is generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, keep the default option."
+"If you do not know what to choose, stay with the default option."
 msgstr ""
 "ю cette Иtape, vous devrez dИterminer le niveau de sИcuritИ requis par\n"
 "votre systХme. Le niveau de sИcuritИ requis se dИtermine en fonction de\n"
 "l'exposition du systХme Ю d'autres utilisateurs (s'il est connectИ\n"
 "directement sur Internet par exemple) et selon le niveau de sensibilitИ de\n"
-"l'information contenu dans le systХme (des numИros de carte de crИdit par\n"
-"exemple). Sachez que, de maniХre gИnИrale, plus la sИcuritИ d'un systХme\n"
-"est ИlevИe, plus il est complexe Ю utiliser.\n"
+"l'information contenu dans le systХme. Sachez que, de maniХre gИnИrale,\n"
+"plus la sИcuritИ d'un systХme est ИlevИe, plus il est complexe Ю utiliser.\n"
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sИlection par dИfaut."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"As a review, DrakX will present a summary of various information it has\n"
-"about your system. Depending on your installed hardware, you may have some\n"
-"or all of the following entries. Each entry is made up of the configuration\n"
-"item to be configured, followed by a quick summary of the current\n"
-"configuration. Click on the corresponding \"Configure\" button to change\n"
-"that.\n"
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
 "\n"
-" * \"Keyboard\": check the current keyboard map configuration and change\n"
-"that if necessary.\n"
+" * \"%s\": check the current keyboard map configuration and change that if\n"
+"necessary.\n"
 "\n"
-" * \"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list.\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
 "\n"
-" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
-"country you have chosen. You can click on the \"Configure\" button here if\n"
-"this is not correct.\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
 "\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary.\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
 "\n"
-" * \"Printer\": clicking on the \"Configure\" button will open the printer\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
 "presented there is similar to the one used during installation.\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. If you notice the sound card displayed is not the one that\n"
-"is actually present on your system, you can click on the button and choose\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
 "another driver.\n"
 "\n"
-" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
-"interface in \"800x600\" or \"1024x768\" resolution. If that does not suits\n"
-"you, click on \"Configure\" to reconfigure your graphical interface.\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. If you have a TV card and it is not detected, click on \"Configure\"\n"
-"to try to configure it manually.\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on \"Configure\" to change the parameters\n"
-"associated with the card.\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
 "\n"
-" * \"Network\": If you want to configure your Internet or local network\n"
-"access now.\n"
+" * \"%s\": If you want to configure your Internet or local network access\n"
+"now.\n"
 "\n"
-" * \"Security Level\": this entry offers you to redefine the security level\n"
-"as set in a previous step ().\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
 "\n"
-" * \"Firewall\": if you plan to connect your machine to the Internet, it's\n"
-"a good idea to protect you from intrusions by setting up a firewall.\n"
-"Consult the corresponding section of the ``Starter Guide'' for details\n"
-"about firewall settings.\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
 "\n"
-" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
-"click that button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
 "\n"
-" * \"Services\": you'll be able here to control finely which services will\n"
-"be run on your machine. If you plan to use this machine as a server it's a\n"
-"good idea to review this setup."
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
 msgstr ""
 "On vous prИsente ici diverses informations sur la configuration actuelle.\n"
 "Selon le matИriel installИ, certaines entrИes seront prИsentes et d'autres\n"
 "pas. Chaque paramХtre est constituИ du nom de la configuration, suivi d'un\n"
-"cours rИsumИ de la configuration actuelle. Cliquez sur le bouton\n"
-"╚═Configurer═╩ correspondant pour changer cela.\n"
+"cours rИsumИ de la configuration actuelle. Cliquez sur le bouton ╚═%s═╩\n"
+"correspondant pour changer cela.\n"
 "\n"
-" * ╚═Clavier═╩: vИrifiez la configuration choisie pour le clavier.\n"
+" * ╚═%s═╩: vИrifiez la configuration choisie pour le clavier.\n"
 "\n"
-" * ╚═Country═╩: vИrifiez la section du pays. Si vous ne vous trouvez pas\n"
-"dans ce pays, cliquez sur le bouton ╚═Configurer═╩ et choisissez le bon. Si\n"
-"votre pays ne se trouve pas dans la premiХre liste, cliquez sur ╚═Plus═╩\n"
-"pour avoir la liste complХte.\n"
+" * ╚═%s═╩: vИrifiez la section du pays. Si vous ne vous trouvez pas dans ce\n"
+"pays, cliquez sur le bouton ╚═%s═╩ et choisissez le bon. Si votre pays ne\n"
+"se trouve pas dans la premiХre liste, cliquez sur ╚═%s═╩ pour avoir la\n"
+"liste complХte.\n"
 "\n"
-" * ╚═Fuseau horaire═╩: DrakX, par dИfaut, configure le fuseau horaire selon\n"
-"le pays dans lequel vous Йtes.\n"
+" * ╚═%s═╩: DrakX, par dИfaut, configure le fuseau horaire selon le pays\n"
+"dans lequel vous Йtes.\n"
 "\n"
-" * ╚═Souris═╩: pour vИrifier la configuration actuelle de la souris.\n"
-"Cliquez sur le bouton pour modifier les options.\n"
+" * ╚═%s═╩: pour vИrifier la configuration actuelle de la souris. Cliquez\n"
+"sur le bouton pour modifier les options.\n"
 "\n"
-" * ╚═Imprimante═╩: en cliquant sur ╚═Configurer═╩, l'outil de configuration\n"
-"d'impression sera dИmarrИ. Consultez le chapitre correspondant du ╚═Guide\n"
-"de dИmarrage═╩ pour plus de renseignements. L'interface qui y est\n"
-"documentИe est similaire Ю celle rencontrИe lors de l'installation.\n"
+" * ╚═%s═╩: en cliquant sur ╚═%s═╩, l'outil de configuration d'impression\n"
+"sera dИmarrИ. Consultez le chapitre correspondant du ╚═Guide de dИmarrage═╩\n"
+"pour plus de renseignements. L'interface qui y est documentИe est similaire\n"
+"Ю celle rencontrИe lors de l'installation.\n"
 "\n"
-" * ╚═Carte son═╩ : si une carte son a ИtИ dИtectИe, elle apparaНtra ici. Si\n"
-"vous remarquez que la carte configurИe n'est pas celle qui se trouve\n"
+" * ╚═%s═╩ : si une carte son a ИtИ dИtectИe, elle apparaНtra ici. Si vous\n"
+"remarquez que la carte configurИe n'est pas celle qui se trouve\n"
 "effectivement sur votre systХme, vous pouvez cliquer sur le bouton pour en\n"
 "choisir une autre.\n"
 "\n"
-" * ╚═Interface graphique═╩ : par dИfaut, DrakX configure votre interface\n"
-"graphique avec une rИsolution de ╚═800x600═╩ ou ╚═1024x768═╩. Si cela ne\n"
-"vous convient pas, cliquez sur ╚═Configurer═╩ pour changer la configuration\n"
-"de votre interface graphique.\n"
+" * ╚═%s═╩ : par dИfaut, DrakX configure votre interface graphique avec une\n"
+"rИsolution de ╚═800x600═╩ ou ╚═1024x768═╩. Si cela ne vous convient pas,\n"
+"cliquez sur ╚═%s═╩ pour changer la configuration de votre interface\n"
+"graphique.\n"
 "\n"
-" * ╚═Carte TV═╩ : si une carte d'entrИe/sortie vidИo (carte TV) a ИtИ\n"
-"dИtectИe, elle apparaНtra ici. Si vous avez une carte TV et qu'elle n'a pas\n"
-"ИtИ dИtectИe, cliquez sur ce bouton pour la configurer Ю la main.\n"
+" * ╚═%s═╩ : si une carte d'entrИe/sortie vidИo (carte TV) a ИtИ dИtectИe,\n"
+"elle apparaНtra ici. Si vous avez une carte TV et qu'elle n'a pas ИtИ\n"
+"dИtectИe, cliquez sur ce bouton pour la configurer Ю la main.\n"
 "\n"
-" * ╚═Carte RNIS═╩ : si une carte RNIS (ISDN) est dИtectИe, elle apparaНtra\n"
-"ici. Vous pouvez cliquer sur le bouton pour en modifier les paramХtres.\n"
+" * ╚═%s═╩ : si une carte RNIS (ISDN) est dИtectИe, elle apparaНtra ici.\n"
+"Vous pouvez cliquer sur le bouton pour en modifier les paramХtres.\n"
 "\n"
-" * ╚═RИseau═╩ : Si vous souhaitez configurer votre accХs Internet ou rИseau\n"
+" * ╚═%s═╩ : Si vous souhaitez configurer votre accХs Internet ou rИseau\n"
 "local dХs maintenant.\n"
 "\n"
-" * ╚═Niveau de sИcuritИ═╩: il vous est ici proposИ de redИfinir votre\n"
-"niveau de sИcuritИ tel que dИfini dans une Иtape prИcИdente ().\n"
+" * ╚═%s═╩: il vous est ici proposИ de redИfinir votre niveau de sИcuritИ\n"
+"tel que dИfini dans une Иtape prИcИdente ().\n"
 "\n"
-" * ╚═Pare-feu═╩ : si vous avez l'intention de connecter votre ordinateur Ю\n"
+" * ╚═%s═╩ : si vous avez l'intention de connecter votre ordinateur Ю\n"
 "Internet, c'est une bonne idИe de le protИger des intrusions grБce Ю un\n"
 "pare-feu. Consultez la section correspondante du ╚═Guide de dИmarrage═╩\n"
 "pour plus de renseignements.\n"
 "\n"
-" * ╚═Chargeur de dИmarrage═╩ : Si vous souhaitez changer la configuration\n"
-"par dИfaut de votre chargeur de dИmarrage. ю rИserver aux utilisateurs\n"
-"expИrimentИs.\n"
+" * ╚═%s═╩ : Si vous souhaitez changer la configuration par dИfaut de votre\n"
+"chargeur de dИmarrage. ю rИserver aux utilisateurs expИrimentИs.\n"
 "\n"
-" * ╚═Services═╩ : vous pourrez ici contrТler finement les services\n"
-"disponibles sur votre machine. si vous envisagez de monter un serveur,\n"
-"c'est une bonne idИe de vИrifier cette configuration."
+" * ╚═%s═╩ : vous pourrez ici contrТler finement les services disponibles\n"
+"sur votre machine. si vous envisagez de monter un serveur, c'est une bonne\n"
+"idИe de vИrifier cette configuration."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Dans le cas oЫ diffИrents serveurs seraient disponible pour votre carte,\n"
 "avec ou sans accИlИration 3D, il vous est alors proposИ de choisir le\n"
@@ -1424,7 +1411,7 @@ msgid ""
 "a PS/2, serial or USB interface.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
-"from the provided list.\n"
+"from the list provided.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
@@ -1435,11 +1422,11 @@ msgid ""
 "Wheel mice are occasionally not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
-"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
-"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
-"the buttons and check that the mouse pointer moves on-screen as you move\n"
-"your mouse."
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
 msgstr ""
 "DrakX dИtecte gИnИralement le nombre de boutons de votre souris. Sinon, il\n"
 "prend pour acquis que vous avez une souris Ю deux boutons et configurera\n"
@@ -1459,7 +1446,7 @@ msgstr ""
 "Les souris Ю roulette ne sont pas dИtectИes parfois. Vous devrez alors\n"
 "sИlectionner manuellement une souris dans la liste. Assurez vous de choisir\n"
 "celle qui correspond Ю votre modХle et au bon port de connexion. AprХs\n"
-"avoir pressИ le bouton ╚═OK═╩, une image de souris apparaНt. Vous devez\n"
+"avoir pressИ le bouton ╚═%s═╩, une image de souris apparaНt. Vous devez\n"
 "alors faire tourner la molette afin de l'activer correctement. Testez alors\n"
 "que tous les mouvements et boutons fonctionnent correctement."
 
@@ -1467,11 +1454,11 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"Next\n"
-"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
-"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
-"also choose not to configure the network, or to do it later, in which case\n"
-"clicking the \"Cancel\" button will take you to the next step.\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\n"
+"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
+"configure the network, or to do it later, in which case clicking the \"%s\"\n"
+"button will take you to the next step.\n"
 "\n"
 "When configuring your network, the available connections options are:\n"
 "traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
@@ -1486,11 +1473,10 @@ msgid ""
 "installed and use the program described there to configure your connection."
 msgstr ""
 "Si vous dИsirez connecter votre systХme Ю un rИseau ou Ю Internet, cliquez\n"
-"sur ╚═OK═╩. L'auto-dИtection des pИriphИriques rИseau et modem sera alors\n"
-"lancИe. Si cette dИtection Иchoue, dИcochez la case ╚═Utiliser\n"
-"l'auto-dИtection═╩. Vous pouvez aussi choisir de ne pas configurer le\n"
-"rИseau, ou de le faire plus tard. Dans ce cas, cliquez simplement sur\n"
-"╚═Annuler═╩.\n"
+"sur ╚═%s═╩. L'auto-dИtection des pИriphИriques rИseau et modem sera alors\n"
+"lancИe. Si cette dИtection Иchoue, dИcochez la case ╚═%s═╩. Vous pouvez\n"
+"aussi choisir de ne pas configurer le rИseau, ou de le faire plus tard.\n"
+"Dans ce cas, cliquez simplement sur ╚═%s═╩.\n"
 "\n"
 "Les types de connexion supportИes sont : modem tИlИphonique, modem ISDN,\n"
 "connexion ADSL, modem cБble ou simplement LAN (rИseau Ethernet).\n"
@@ -1509,27 +1495,25 @@ msgstr ""
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
 "covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
-"computer."
+"terms in it, check the \"%s\" box. If not, simply turn off your computer."
 msgstr ""
 "Avant d'aller plus loin, il est fortement recommandИ de lire attentivement\n"
 "les termes et conditions d'utilisations de la licence. Celle-ci rИgit\n"
 "l'ensemble de la distribution Mandrake Linux. Si vous en acceptez tous les\n"
-"termes, cochez la case ╚═Accepter═╩, sinon, Иteignez simplement votre\n"
-"ordinateur."
+"termes, cochez la case ╚═%s═╩, sinon, Иteignez simplement votre ordinateur."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Carte graphique\n"
 "\n"
@@ -1548,8 +1532,8 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not always needed at\n"
-"boot time.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
 "selected. However, if you are not sure whether a service is useful or not,\n"
@@ -1581,9 +1565,9 @@ msgstr ""
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own."
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
 msgstr ""
 "Moniteur\n"
 "\n"
@@ -1598,35 +1582,34 @@ msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
 "motherboard is set to local time, you may deactivate this by unselecting\n"
-"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
-"system clock and the hardware clock are in the same timezone. This is\n"
-"useful when the machine also hosts another operating system like Windows.\n"
-"\n"
-"The \"Automatic time synchronization \" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. For this\n"
-"feature to work, you must have a working Internet connection. It is best to\n"
-"choose a time server located near you. This option actually installs a time\n"
-"server that can used by other machines on your local network."
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same timezone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can used by\n"
+"other machines on your local network as well."
 msgstr ""
-"GNU/Linux manipule l'heure au format GMT (Greenwich Mean Time) et la\n"
+"GNU/Linux manipule l'heure au format GMT (╚═Greenwich Mean Time═╩) et la\n"
 "convertit en temps local selon le fuseau horaire choisi. Il est nИanmoins\n"
-"possible de dИsactiver cela en dИsИlectionnant ╚═Horloge systХme rИglИe sur\n"
-"le mИridien de Greenwich═╩ de faГon Ю ce que l'horloge matИrielle soit la\n"
-"mЙme que celle du systХme. Cela est particuliХrement utile si la machine\n"
-"accueille un autre systХme d'exploitation tel que Windows.\n"
-"\n"
-"La ╚═Synchronisation automatique═╩ permet de rИgler l'heure automatiquement\n"
-"en se connectant Ю un serveur de temps sur Internet. Dans la liste qui est\n"
-"alors prИsentИe, choisissez un serveur gИographiquement proche de vous.\n"
-"Vous devez avoir une connexion Internet pour que cela fonctionne bien\n"
-"entendu. Cela installera en fait sur votre machine un serveur de temps\n"
-"local qui pourra, en option, Йtre lui-mЙme utilisИ par d'autres machines de\n"
-"votre rИseau local."
+"possible de dИsactiver cela en dИsИlectionnant ╚═%s═╩ de faГon Ю ce que\n"
+"l'horloge matИrielle soit la mЙme que celle du systХme. Cela est\n"
+"particuliХrement utile si la machine accueille un autre systХme\n"
+"d'exploitation tel que Windows.\n"
+"\n"
+"La ╚═%s═╩ permet de rИgler l'heure automatiquement en se connectant Ю un\n"
+"serveur de temps sur Internet. Dans la liste qui est alors prИsentИe,\n"
+"choisissez un serveur gИographiquement proche de vous. Vous devez avoir une\n"
+"connexion Internet pour que cela fonctionne bien entendu. Cela installera\n"
+"en fait sur votre machine un serveur de temps local qui pourra, en option,\n"
+"Йtre lui-mЙme utilisИ par d'autres machines de votre rИseau local."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"Here are Listed the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -1694,15 +1677,15 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
-"\"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list."
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
 msgstr ""
-"╚═Country═╩: vИrifiez la section du pays. Si vous ne vous trouvez pas dans\n"
-"ce pays, cliquez sur le bouton ╚═Configurer═╩ et choisissez le bon. Si\n"
-"votre pays ne se trouve pas dans la premiХre liste, cliquez sur ╚═Plus═╩\n"
-"pour avoir la liste complХte."
+"╚═%s═╩: vИrifiez la section du pays. Si vous ne vous trouvez pas dans ce\n"
+"pays, cliquez sur le bouton ╚═%s═╩ et choisissez le bon. Si votre pays ne\n"
+"se trouve pas dans la premiХre liste, cliquez sur ╚═%s═╩ pour avoir la\n"
+"liste complХte."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -1724,13 +1707,13 @@ msgid ""
 "the selected partitions will be deleted and you will not be able to recover\n"
 "it.\n"
 "\n"
-"Click on \"Next ->\" when you are ready to format partitions.\n"
+"Click on \"%s\" when you are ready to format partitions.\n"
 "\n"
-"Click on \"<- Previous\" if you want to choose another partition for your\n"
-"new Mandrake Linux operating system installation.\n"
+"Click on \"%s\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
+"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"bad blocks on the disk."
 msgstr ""
 "Les partitions ayant ИtИ nouvellement dИfinies doivent Йtre formatИes (ce\n"
 "qui implique la crИation d'un systХme de fichiers).\n"
@@ -1741,32 +1724,32 @@ msgstr ""
 "\n"
 "Sachez qu'il n'est pas nИcessaire de reformater toutes les partitions\n"
 "existantes. Vous devez formater les partitions contenant le systХme\n"
-"d'exploitation (comme ╚═/═╩,╚═ /usr═╩ ou ╚═/var═╩, mais il n'est pas\n"
+"d'exploitation (comme ╚═/═╩, ╚═/usr═╩ ou ╚═/var═╩, mais il n'est pas\n"
 "nИcessaire de formater les partitions de donnИes, notamment ╚═/home═╩...\n"
 "\n"
 "Soyez prudent. Une fois que les partitions sИlectionnИes seront\n"
 "reformatИes, il sera impossible de rИcupИrer des donnИes.\n"
 "\n"
-"Cliquez sur ╚═OK═╩ lorsque vous Йtes prЙt Ю formater les partitions.\n"
+"Cliquez sur ╚═%s═╩ lorsque vous Йtes prЙt Ю formater les partitions.\n"
 "\n"
-"Cliquez sur ╚═Annuler═╩ pour ajouter ou enlever une partition Ю formater.\n"
+"Cliquez sur ╚═%s═╩ pour ajouter ou enlever une partition Ю formater.\n"
 "\n"
-"Cliquer sur ╚═Avancer═╩ si vous dИsirez sИlectionner des partitions pour\n"
-"une vИrification des secteurs dИfectueux (╚═Bad Blocks═╩)."
+"Cliquer sur ╚═%s═╩ si vous dИsirez sИlectionner des partitions pour une\n"
+"vИrification des secteurs dИfectueux (╚═Bad Blocks═╩)."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "Depending on the default language you chose in Section , DrakX will\n"
 "automatically select a particular type of keyboard configuration. However,\n"
-"you might not have a keyboard that corresponds exactly to your language:\n"
-"for example, if you are an English speaking Swiss person, you may have a\n"
-"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
-"find yourself in the same situation where your native language and keyboard\n"
-"do not match. In either case, this installation step will allow you to\n"
-"select an appropriate keyboard from a list.\n"
-"\n"
-"Click on the \"More \" button to be presented with the complete list of\n"
+"you may not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may have a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation where your native language and keyboard do\n"
+"not match. In either case, this installation step will allow you to select\n"
+"an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
@@ -1782,7 +1765,7 @@ msgstr ""
 "poИsie. Dans ces cas, il vous faudra revenir Ю cette Иtape d'installation\n"
 "et sИlectionner un autre clavier Ю partir de la liste.\n"
 "\n"
-"Cliquez sur ╚═Davantage═╩ pour voir toutes les options proposИes.\n"
+"Cliquez sur ╚═%s═╩ pour voir toutes les options proposИes.\n"
 "\n"
 "Si vous choisissez un clavier basИ sur un alphabet non-latin, on vous\n"
 "demandera au prochain Иcran de choisir la combinaison de clИs permettant\n"
@@ -1792,64 +1775,62 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"Next ->\" to reboot the system. The first thing\n"
-"you should see after your computer has finished doing its hardware tests is\n"
-"the bootloader menu, giving you the choice of which operating system to\n"
-"start.\n"
+"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
 "\n"
-"The \"Advanced\" button shows two more buttons to:\n"
+"The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"that will automatically perform a whole installation without the help of an\n"
-"operator, similar to the installation you just configured.\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
 "\n"
 "   Note that two different options are available after clicking the button:\n"
 "\n"
-"    * \"Replay\". This is a partially automated installation. The\n"
-"partitioning step is the only interactive procedure.\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
 "\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
 "   This feature is very handy when installing a number of similar machines.\n"
 "See the Auto install section on our web site for more information.\n"
 "\n"
-" * \"Save packages selection\"(*): saves a list of the package selected in\n"
-"this installation. To use this selection with another installation, insert\n"
-"the floppy and start the installation. At the prompt, press the [F1] key\n"
-"and type >>linux defcfg=\"floppy\" <<.\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<.\n"
 "\n"
 "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
 "\"mformat a:\")"
 msgstr ""
 "Votre installation de Mandrake Linux est maintenant terminИe et votre\n"
-"systХme est prЙt Ю Йtre utilisИ. Cliquez sur ╚═OK═╩ pour redИmarrer votre\n"
+"systХme est prЙt Ю Йtre utilisИ. Cliquez sur ╚═%s═╩ pour redИmarrer votre\n"
 "systХme. Vous aurez alors le choix de dИmarrer GNU/Linux ou Windows (s'il\n"
 "est prИsent).\n"
 "\n"
-"Le bouton ╚═AvancИe═╩ (en mode Expert uniquement) permet deux autres\n"
-"options :\n"
+"Le bouton ╚═%s═╩ (en mode Expert uniquement) permet deux autres options :\n"
 "\n"
-" * ╚═GИnИrer une disquette d'auto-install═╩: Pour crИer une disquette\n"
-"d'installation qui permettra de reproduire l'installation que vous venez de\n"
-"rИaliser sans l'aide d'un administrateur.\n"
+" * ╚═%s═╩: Pour crИer une disquette d'installation qui permettra de\n"
+"reproduire l'installation que vous venez de rИaliser sans l'aide d'un\n"
+"administrateur.\n"
 "\n"
 "   Notez que les deux options suivantes apparaissent aprХs avoir cliquИ sur\n"
 "le bouton :\n"
 "\n"
-"    * ╚═Replay═╩. C'est une installation partiellement automatique oЫ il\n"
-"est possible de personnaliser le partitionnement du disque (exclusivement).\n"
+"    * ╚═%s═╩. C'est une installation partiellement automatique oЫ il est\n"
+"possible de personnaliser le partitionnement du disque (exclusivement).\n"
 "\n"
-"    * ╚═Automatique═╩. ComplХtement automatique, cette installation\n"
-"reformate le disque au complet.\n"
+"    * ╚═%s═╩. ComplХtement automatique, cette installation reformate le\n"
+"disque au complet.\n"
 "\n"
 "   Cette fonctionnalitИ est particuliХrement pratique pour l'installation\n"
-"de multiples systХmes. Voir la sectionAuto install de notre site Web.\n"
+"de multiples systХmes. Voir la section Auto install de notre site Web.\n"
 "\n"
-" * ╚═Sauvegarder les paquetages sИlectionnИs═╩ (*) sauve la sИlection des\n"
-"paquetages installИs. Puis, lorsque vous ferez une autre installation,\n"
-"insИrez la disquette dans le lecteur et accИdez au menu d'aide en tapant\n"
-"[f1], et entrez la commande suivante : ╚═linux defcfg=\"floppy\"═╩.\n"
+" * ╚═%s═╩ (*) sauve la sИlection des paquetages installИs. Puis, lorsque\n"
+"vous ferez une autre installation, insИrez la disquette dans le lecteur et\n"
+"accИdez au menu d'aide en tapant [f1], et entrez la commande suivante :\n"
+"╚═linux defcfg=\"floppy\"═╩.\n"
 "\n"
 "(*) Vous avez besoin d'une disquette formatИe avec FAT (pour la crИer sous\n"
 "Linux, tapez ╚═mformat a:═╩)"
@@ -1859,7 +1840,7 @@ msgstr ""
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
-"defined, either from a previous installation of GNU/Linux or from another\n"
+"defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
@@ -1869,43 +1850,40 @@ msgid ""
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
-" * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
 "\n"
-" * \"Auto allocate\": this option enables you to automatically create ext3\n"
-"and swap partitions in free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
 "\n"
-"\"More\": gives access to additional features:\n"
+"\"%s\": gives access to additional features:\n"
 "\n"
-" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery, if necessary. It is strongly\n"
-"recommended that you perform this step.\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows you to restore a previously saved\n"
-"partition table from a floppy disk.\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"doesn't always work.\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and reloads the\n"
-"partition table that was originally on the hard drive.\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
 "\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
-"users to manually mount and unmount removable medias such as floppies and\n"
-"CD-ROMs.\n"
+" * \"%s\": unchecking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good\n"
-"understanding of partitioning.\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+" * \"%s\": use this option to cancel your changes.\n"
 "\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information about the\n"
-"hard drive.\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1945,44 +1923,41 @@ msgstr ""
 "Pour partitionner, le disque dur sИlectionnИ, vous pouvez utiliser les\n"
 "options suivantes :\n"
 "\n"
-" * ╚═Tout effacer═╩: cette option effacera toutes les partitions sur le\n"
-"disque sИlectionnИ;\n"
+" * ╚═%s═╩: cette option effacera toutes les partitions sur le disque\n"
+"sИlectionnИ;\n"
 "\n"
-" * ╚═Attribution Automatique═╩: cette option permet de crИer un systХme de\n"
-"ficher ext3 et ╚═Swap═╩ dans l'espace libre sur votre disque;\n"
+" * ╚═%s═╩: cette option permet de crИer un systХme de ficher ext3 et\n"
+"╚═Swap═╩ dans l'espace libre sur votre disque;\n"
 "\n"
-"╚═Plus d'options═╩: permet d'accИder Ю des fonctionnalitИs additionnelles :\n"
+"╚═%s═╩: permet d'accИder Ю des fonctionnalitИs additionnelles :\n"
 "\n"
-" * ╚═Sauvegarder la table de partition═╩: sauve la table de partition sur\n"
-"un disque amovibles. Cette option s'avХre particuliХrement pratique pour\n"
-"rИparer des partitions endommagИes. Il est fortement recommandИ de procИder\n"
-"ainsi;\n"
+" * ╚═%s═╩: sauve la table de partition sur un disque amovibles. Cette\n"
+"option s'avХre particuliХrement pratique pour rИparer des partitions\n"
+"endommagИes. Il est fortement recommandИ de procИder ainsi;\n"
 "\n"
-" * ╚═Restaurer la table de partition═╩: permet de restaurer une table de\n"
-"partition sauvИe au prИalable sur une disquette.\n"
+" * ╚═%s═╩: permet de restaurer une table de partition sauvИe au prИalable\n"
+"sur une disquette.\n"
 "\n"
-" * ╚═RИcupИrer une partition═╩: si votre table de partition est endommagИe,\n"
-"vous pouvez essayer de la rИcupИrer avec ces options. Soyez prudent et\n"
-"sachez que cela ne fonctionne pas Ю coup sШr.\n"
+" * ╚═%s═╩: si votre table de partition est endommagИe, vous pouvez essayer\n"
+"de la rИcupИrer avec ces options. Soyez prudent et sachez que cela ne\n"
+"fonctionne pas Ю coup sШr.\n"
 "\n"
-" * ╚═Recharger la table de partition═╩: Иcarte les changements et charge la\n"
-"table de partition initiale;\n"
+" * ╚═%s═╩: Иcarte les changements et charge la table de partition initiale;\n"
 "\n"
-" * ╚═Chargement automatique des mИdias amovibles═╩: en cochant cette case,\n"
-"les CD-ROM et disquettes (et autres support) seront chargИs\n"
-"automatiquement.\n"
+" * ╚═%s═╩: en cochant cette case, les CD-ROM et disquettes (et autres\n"
+"support) seront chargИs automatiquement.\n"
 "\n"
-" * ╚═Assistant═╩: utilisez cette option si vous souhaitez utiliser un\n"
-"assistant pour partitionner votre disque. Cette option est particuliХrement\n"
+" * ╚═%s═╩: utilisez cette option si vous souhaitez utiliser un assistant\n"
+"pour partitionner votre disque. Cette option est particuliХrement\n"
 "recommandИe si vous faites vos premiers pas avec les partitions.\n"
 "\n"
-" * ╚═DИfaire═╩: utilisez cette option pour annuler vos changements;\n"
+" * ╚═%s═╩: utilisez cette option pour annuler vos changements;\n"
 "\n"
-" * ╚═ Changez de mode normal/expert═╩: permet des actions additionnelles\n"
-"sur les partitions (type, options, format) et donne plus d'informations;\n"
+" * ╚═%s═╩: permet des actions additionnelles sur les partitions (type,\n"
+"options, format) et donne plus d'informations;\n"
 "\n"
-" * ╚═Terminer═╩: une fois le partitionnement terminИ, ce bouton vous\n"
-"permettra de sauvegarder vos changements sur le disque.\n"
+" * ╚═%s═╩: une fois le partitionnement terminИ, ce bouton vous permettra de\n"
+"sauvegarder vos changements sur le disque.\n"
 "\n"
 "Lorsque vous dИfinissez la taille d'une partition, vous pouvez choisir\n"
 "prИcisИment la taille de celle-ci en utilisant les FlХches de votre\n"
diff --git a/perl-install/share/po/help-it.pot b/perl-install/share/po/help-it.pot
index 1257b489e..14c511349 100644
--- a/perl-install/share/po/help-it.pot
+++ b/perl-install/share/po/help-it.pot
@@ -1,80 +1,6 @@
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
-"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
-"your changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
 msgstr ""
-"Dopo aver configurato i parametri generali del bootloader, verrц═ mostrata\n"
-"la lista delle opzioni che saranno disponibili al momento dell'avvio del\n"
-"sistema.\n"
-"\n"
-"Se sulla vostra macchina ц╗ installato un altro sistema operativo, verrц═\n"
-"automaticamente aggiunto al menu di avvio. Qui potete scegliere una\n"
-"configurazione piц╧ precisa delle opzioni disponibili. Cliccate su una delle\n"
-"voci e poi su \"Modifica\" per modificarla o rimuoverla; \"Aggiungi\" crea\n"
-"una nuova voce; cliccando su \"Fatto\" passerete alla fase successiva.\n"
-"\n"
-"Potreste anche non voler dare l'accesso a questi sistemi operativi a\n"
-"chiunque, nel qual caso potete cancellare le voci corrispondenti, ma cosц╛\n"
-"facendo, per caricarli, avrete bisogno di un boot disk!"
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
-"\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation, thereby installing the\n"
-"language-specific files for system documentation and applications. For\n"
-"example, if you will host users from Spain on your machine, select English\n"
-"as the default language in the tree view and \"Espanol\" in the Advanced\n"
-"section.\n"
-"\n"
-"Note that you're not limited to choosing a single additional language. Once\n"
-"you have selected additional locales, click the \"Next ->\" button to\n"
-"continue.\n"
-"\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
-msgstr ""
-"Il primo passo ц╗ scegliere la lingua che preferite.\n"
-"\n"
-"Scegliete la lingua che intendete usare per la fase di installazione e\n"
-"l'uso del sistema.\n"
-"\n"
-"Cliccando sul pulsante \"Avanzato\" potrete scegliere altre lingue da\n"
-"installare sul vostro computer. La selezione di altre lingue comporta\n"
-"l'installazione dei file relativi alla documentazione e alle applicazioni\n"
-"per ciascuna di esse. Se il vostro computer dovrц═ essere usato, ad esempio,\n"
-"anche da persone di madre lingua spagnola, potete scegliere l'italiano come\n"
-"lingua principale nella struttura ad albero e, nella sezione \"Avanzato\",\n"
-"apporre un segno di spunta sul pulsante grigio corrispondente a\n"
-"\"Spanish|Spain\".\n"
-"\n"
-"ц┬ possibile installare i file per piц╧ lingue allo stesso tempo. Dopo aver\n"
-"scelto quelle che preferite cliccate sul pulsante \"Ok\" per proseguire.\n"
-"\n"
-"Per passare da una lingua all'altra potete utilizzare il comando\n"
-"\"/usr/sbin/localedrake\": come \"root\" per cambiare la lingua utilizzata\n"
-"in tutto il sistema, o come utente normale per cambiare solamente la lingua\n"
-"usata da quell'utente."
+"Content-Type: text/plain; charset=UTF-8\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -95,51 +21,49 @@ msgid ""
 "\n"
 "Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Use free space\": this option will perform an automatic partitioning\n"
-"of your blank drive(s). If you use this option there will be no further\n"
-"prompts.\n"
-"\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated with\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and for the most part it's a good idea to keep them.\n"
-"\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see `` Erase entire disk'' solution)\n"
-"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
-"without the loss of any data, provided you previously defragment the\n"
-"Windows partition and that it uses the FAT format. Backing up your data is\n"
-"strongly recommended.. Using this option is recommended if you want to use\n"
-"both Mandrake Linux and Microsoft Windows on the same computer.\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
+"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
+"partition. Resizing can be performed without the loss of any data, provided\n"
+"you have previously defragmented the Windows partition and that it uses the\n"
+"FAT format. Backing up your data is strongly recommended.. Using this\n"
+"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
 "then when you started. You will have less free space under Microsoft\n"
 "Windows to store your data or to install new software.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful, because you will not be able to\n"
-"undo your choice after you confirm.\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"Custom disk partitionning\": choose this option if you want to\n"
-"manually partition your hard drive. Be careful -- it is a powerful but\n"
-"dangerous choice and you can very easily lose all your data. That's why\n"
-"this option is really only recommended if you have done something like this\n"
-"before and have some experience. For more instructions on how to use the\n"
-"DiskDrake utility, refer to the ``Managing Your Partitions '' section in\n"
-"the ``Starter Guide''."
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
+"Guide''."
 msgstr ""
 "A questo punto dovete scegliere dove installare il vostro sistema operativo\n"
 "Mandrake Linux sul disco rigido. Se il vostro disco ц╗ vuoto, oppure se un\n"
@@ -148,129 +72,124 @@ msgstr ""
 "suddividerlo logicamente in maniera da creare lo spazio sufficiente per\n"
 "installare il vostro nuovo sistema operativo Mandrake Linux.\n"
 "\n"
-"Dato che gli effetti del partizionamento sono di solito irreversibili,\n"
-"questa operazione puц╡ intimidire e rivelarsi stressante per un utente\n"
-"inesperto. Fortunatamente, avete a vostra disposizione un assistente che\n"
-"semplifica questo passo. Prima di iniziare leggete attentamente il manuale,\n"
-"e prendete tutto il tempo che vi serve.\n"
-"\n"
-"Se state effettuando l'installazione in modalitц═ Esperto, verrц═ lanciato\n"
-"DiskDrake, il programma di partizionamento di Mandrake Linux, che vi\n"
-"permetterц═ di impostare accuratamente le vostre partizioni. Consultate il\n"
-"capitolo relativo a DiskDrake nella ''Guida introduttiva''. Dal programma\n"
-"di installazione potete richiamare gli assistenti descritti qui di seguito\n"
-"cliccando sul pulsante \"Assistente\" (ingl. ''Wizard'').\n"
-"\n"
-"Se le partizioni sono giц═ state definite (per una precedente installazione,\n"
-"o da un'altra utilitц═ di partizionamento), dovrete solo scegliere quelle da\n"
-"usare per installare il vostro sistema Linux.\n"
-"\n"
-"Se le partizioni non sono ancora state definite, dovete crearle usando\n"
-"l'assistente. In base alla configurazione del vostro disco rigido, saranno\n"
-"disponibili diverse soluzioni:\n"
-"\n"
-" * \"Usa spazio disponibile\": questa opzione causerц═ un partizionamento\n"
-"automatico del vostro disco rigido (o dischi, se ne avete piц╧ di uno). Non\n"
-"vi verrц═ posta nessun'altra domanda.\n"
-"\n"
-" * \"Usa partizioni esistenti\": l'assistente ha trovato una o piц╧\n"
-"partizioni Linux sul vostro disco rigido. Se desiderate usarle scegliete\n"
-"questa opzione. Vi verrц═ chiesto di scegliere il punto di mount associato a\n"
-"ciascuna partizione. Come opzione predefinita verranno mantenuti i punti di\n"
-"mount precedenti e, in genere, ц╗ buona norma non modificarli.\n"
-"\n"
-" * \"Usa lo spazio libero nella partizione Windows\": se Microsoft Windows\n"
-"ц╗ installato sul vostro disco rigido e occupa tutto lo spazio disponibile,\n"
-"dovrete creare spazio libero per i dati relativi a Linux. Per farlo potete\n"
-"cancellare la vostra partizione Microsoft Windows e i dati che contiene\n"
-"(usando le soluzioni \"Cancella l'intero disco\" o \"Modo Esperto\"),\n"
-"oppure ridimensionarla. Il ridimensionamento puц╡ essere effettuato evitando\n"
-"la perdita di dati a patto che prima di procedere la partizione Windows sia\n"
-"stata deframmentata. Vi raccomandiamo anche di fare un backup dei vostri\n"
-"dati. Questa ц╗ la soluzione consigliata se desiderate usare sia Mandrake\n"
-"Linux sia Microsoft Windows sullo stesso computer.\n"
+"Dato che gli effetti del partizionamento sono di solito irreversibili e\n"
+"possono causare la perdita di dati se sul disco rigido ц╗ giц═ installato un\n"
+"sistema operativo, questa operazione puц╡ intimidire e rivelarsi stressante\n"
+"per un utente inesperto. Per fortuna DrakX mette a vostra disposizione un\n"
+"assistente che semplifica questo passo. Prima di cominciare leggete\n"
+"attentamente questa sezione e, soprattutto, fate le cose con calma.\n"
+"\n"
+"In base alla configurazione del vostro disco rigido, saranno disponibili\n"
+"diverse opzioni:\n"
+"\n"
+" * \"%s\": questa opzione causerц═ un partizionamento automatico del vostro\n"
+"disco rigido (o dischi, se ne avete piц╧ di uno). Non vi verrц═ posta\n"
+"nessun'altra domanda.\n"
+"\n"
+" * \"%s\": l'assistente ha trovato una o piц╧ partizioni Linux sul vostro\n"
+"disco rigido. Se desiderate usarle scegliete questa opzione. Vi verrц═\n"
+"chiesto di scegliere il punto di mount associato a ciascuna partizione.\n"
+"Come opzione predefinita verranno mantenuti i punti di mount precedenti e,\n"
+"in genere, ц╗ buona norma non modificarli.\n"
+"\n"
+" * \"%s\": se Microsoft Windows ц╗ installato sul vostro disco rigido e\n"
+"occupa tutto lo spazio disponibile, dovrete creare spazio libero per i dati\n"
+"relativi a Linux. Per farlo potete cancellare la vostra partizione\n"
+"Microsoft Windows e i dati che contiene (ricorrendo all'opzione ''Cancella\n"
+"l'intero disco''), oppure ridimensionarla se ц╗ di tipo FAT. Il\n"
+"ridimensionamento puц╡ essere effettuato evitando la perdita di dati a patto\n"
+"che prima di procedere la partizione Windows sia stata deframmentata. Vi\n"
+"raccomandiamo anche di fare un backup dei vostri dati. Questa ц╗ la\n"
+"soluzione consigliata se desiderate usare sia Mandrake Linux sia Microsoft\n"
+"Windows sullo stesso computer.\n"
 "\n"
 "   Prima di scegliere questa opzione, tenete presente che la dimensione\n"
 "della partizione su cui risiede Microsoft Windows sarц═ ridotta rispetto a\n"
 "quella attuale. Ciц╡ significa che avrete meno spazio libero per archiviare\n"
 "i vostri dati o installare nuovo software su Windows.\n"
 "\n"
-" * \"Cancella l'intero disco\": se desiderate cancellare tutti i dati e\n"
-"tutte le partizioni presenti sul vostro disco rigido e rimpiazzarli con il\n"
-"vostro nuovo sistema Mandrake Linux, potete selezionare questa opzione.\n"
-"Fate attenzione nello scegliere questa soluzione, dopo la conferma non\n"
-"potrete piц╧ tornare indietro.\n"
+" * \"%s\": se desiderate cancellare tutti i dati e tutte le partizioni\n"
+"presenti sul vostro disco rigido e rimpiazzarli con il vostro nuovo sistema\n"
+"Mandrake Linux, potete selezionare questa opzione. Fate attenzione nello\n"
+"scegliere questa soluzione, dopo la conferma non potrete piц╧ tornare\n"
+"indietro.\n"
 "\n"
 "   !! Se scegliete questa opzione, tutti i dati sul vostro disco andranno\n"
 "persi. !!\n"
 "\n"
-" * \"Cancella Windows\": l'effetto di questa opzione sarц═ di cancellare\n"
-"tutto quello che si trova sul disco e di ricominciare da capo, creando le\n"
-"partizioni su un disco vuoto. Tutti i dati presenti sul vostro disco\n"
-"andranno persi.\n"
+" * \"%s\": l'effetto di questa opzione sarц═ di cancellare tutto quello che\n"
+"si trova sul disco e di ricominciare da capo, creando le partizioni su un\n"
+"disco vuoto. Tutti i dati presenti sul vostro disco andranno persi.\n"
 "\n"
 "   !! Se scegliete questa opzione, tutti i dati sul vostro disco andranno\n"
 "persi. !!\n"
 "\n"
-" * \"Modo Esperto\": se volete partizionare manualmente il vostro disco\n"
-"rigido potete scegliere questa opzione. Fate attenzione prima di optare per\n"
-"questa soluzione: ц╗ potente, ma molto pericolosa. Potreste facilmente\n"
-"causare la perdita di tutti i vostri dati. Quindi, non sceglietela se non\n"
-"sapete cosa state facendo. Per ulteriori informazioni riguardo il\n"
-"funzionamento di DiskDrake, consultate la sezione ''Gestione delle\n"
-"partizioni'' della ''''Guida introduttiva''''."
+" * \"%s\": se volete partizionare manualmente il vostro disco rigido potete\n"
+"scegliere questa opzione. Fate attenzione prima di optare per questa\n"
+"soluzione: ц╗ potente, ma molto pericolosa, potreste facilmente causare la\n"
+"perdita di tutti i vostri dati. Pertanto la suggeriamo soltanto nel caso\n"
+"che abbiate giц═ fatto qualcosa di simile in precedenza e abbiate una certa\n"
+"esperienza. Per ulteriori informazioni riguardo il funzionamento di\n"
+"DiskDrake, consultate la sezione ''Gestione delle partizioni'' della\n"
+"''Guida introduttiva''."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Resolution\n"
+"\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
+"configuration is shown in the monitor."
 msgstr ""
-"Scegliete il disco rigido che volete cancellare per poter installare la\n"
-"nuova partizione per Mandrake Linux. Attenzione! tutti i dati presenti\n"
-"andranno perduti e non saranno piц╧ recuperabili!"
+"Risoluzione\n"
+"\n"
+"   Qui potete scegliere risoluzione e profonditц═ di colore tra quelle\n"
+"disponibili per il vostro hardware. Scegliete le impostazioni che meglio si\n"
+"adattano ai vostri bisogni (potrete cambiare la configurazione anche dopo\n"
+"l'installazione, comunque). All'interno del monitor ц╗ visibile un'anteprima\n"
+"della configurazione selezionata."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
 "system administrator, the users you add at this point will not be\n"
 "authorized to change anything except their own files and their own\n"
-"configuration, protecting the system from unintentional or malicious\n"
-"changes that impact the system as a whole. You will have to create at least\n"
-"one regular user for yourself -- this is the account which you should use\n"
-"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
-"to do anything and everything, it may also be very dangerous! A mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, the worst that will happen is that you will lose\n"
-"some information, but not affect the entire system.\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in and copy it to the \"User name\" field, which is the name this\n"
-"user will enter to log onto the system. If you like, you may override the\n"
-"default and change the username. The next step is to enter a password. From\n"
-"a security point of view, a non-privileged (regular) user password is not\n"
-"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
-"making it blank or too simple: after all, your files could be the ones at\n"
-"risk.\n"
-"\n"
-"Once you click on \"Accept user\", you can add other users. Add a user for\n"
-"each one of your friends: your father or your sister, for example. Click\n"
-"\"Next ->\" when you have finished adding users.\n"
-"\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
-"\n"
-"When you are finished adding all users, you will be asked to choose a user\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the username. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user\n"
 "that can automatically log into the system when the computer boots up. If\n"
 "you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Next\n"
-"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
-"to use this feature?\" box."
+"security), choose the desired user and window manager, then click \"%s\".\n"
+"If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux ц╗ un sistema operativo multiutente, ciц╡ significa che ciascun\n"
 "utente puц╡ disporre di una configurazione personalizzata, di uno spazio per\n"
@@ -288,18 +207,18 @@ msgstr ""
 "Prima di tutto, inserite il vostro nome reale. Naturalmente questo non ц╗\n"
 "obbligatorio: potete digitare quello che volete. Fatto questo, DrakX\n"
 "prenderц═ la prima parola che avete inserito nel campo di testo e la copierц═\n"
-"alla voce \"Nome utente\". Questo ц╗ il nome che l'utente dovrц═ usare per\n"
-"accedere al sistema, ma potete cambiarlo. Poi digitate una password per\n"
-"questo utente. La password di un utente non privilegiato dal punto di vista\n"
-"della sicurezza non ц╗ cruciale come quella di \"root\", ovviamente, ma non\n"
-"c'ц╗ motivo di essere frettolosi: dopo tutto, si tratta dei vostri file.\n"
-"\n"
-"Se cliccate su \"Accetta utente\", potrete poi aggiungerne un altro, e\n"
-"altri ancora, a vostra discrezione. Aggiungete un utente per ciascuno dei\n"
-"vostri amici, oppure per vostro padre e vostro fratello, ad esempio. Dopo\n"
-"aver aggiunto tutti gli utenti che volete, selezionate \"Fatto\".\n"
-"\n"
-"Cliccando sul pulsante \"Avanzato\" potrete cambiare la \"shell\" per\n"
+"alla voce \"%s\". Questo ц╗ il nome che l'utente dovrц═ usare per accedere al\n"
+"sistema, ma potete cambiarlo. Poi digitate una password per questo utente.\n"
+"La password di un utente non privilegiato dal punto di vista della\n"
+"sicurezza non ц╗ cruciale come quella di \"root\", ovviamente, ma non c'ц╗\n"
+"motivo di essere frettolosi: dopo tutto, si tratta dei vostri file.\n"
+"\n"
+"Se cliccate su \"%s\", potrete poi aggiungerne un altro, e altri ancora, a\n"
+"vostra discrezione. Aggiungete un utente per ciascuno dei vostri amici,\n"
+"oppure per vostro padre e vostro fratello, ad esempio. Dopo aver aggiunto\n"
+"tutti gli utenti che volete, selezionate \"%s\".\n"
+"\n"
+"Cliccando sul pulsante \"%s\" potrete cambiare la \"shell\" per\n"
 "quell'utente (quella predefinita ц╗ bash).\n"
 "\n"
 "Quando avrete finito di aggiungere utenti al sistema, vi verrц═ proposto di\n"
@@ -307,23 +226,8 @@ msgstr ""
 "computer ha terminato la fase di boot. Se questa caratteristica vi\n"
 "interessa (e non tenete particolarmente alla sicurezza locale), scegliete\n"
 "l'utente desiderato e l'ambiente grafico che preferite, poi cliccate su\n"
-"\"Sц╛\". Se la cosa non vi interessa, cliccate su \"No\"."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
-msgstr ""
-"Per finire, vi verrц═ chiesto se desiderate avviare automaticamente\n"
-"l'interfaccia grafica subito dopo il boot. Si noti che tale domanda verrц═\n"
-"fatta anche se avete deciso di non provare la vostra configurazione di X.\n"
-"Ovviamente ц╗ opportuno rispondere \"No\" nel caso in cui la vostra macchina\n"
-"svolga le funzioni di server, oppure se non siete riuscite a configurare il\n"
-"server grafico."
+"\"%s\". Se la cosa non vi interessa, rimuovete il segno di spunta dalla\n"
+"casella \"%s\"."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -347,8 +251,8 @@ msgid ""
 "choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
 "\n"
 " * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
 "at the first boot prompt.\n"
@@ -382,7 +286,7 @@ msgstr ""
 "After selecting Linux, you will have this delay in 0.1 second before your\n"
 "default kernel description is selected.\n"
 "\n"
-" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
+" * Enable CD Boot?: checking this option allows you to choose ''C'' for CD\n"
 "at the first boot prompt.\n"
 "\n"
 " * Enable OF Boot?: checking this option allows you to choose \"N\" for\n"
@@ -394,136 +298,18 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use. Refer to the \"msec\"\n"
-"chapter of the ``Command Line Manual'' to get more information about the\n"
-"meaning of these levels.\n"
-"\n"
-"If you do not know what to choose, keep the default option."
-msgstr ""
-"Ora ц╗ il momento di scegliere il livello di sicurezza desiderato per il\n"
-"vostro sistema. Come regola generale, quanto piц╧ esposta ц╗ la macchina e\n"
-"quanto piц╧ sono importanti i dati che contiene, tanto piц╧ alto dovrebbe\n"
-"essere il livello di sicurezza. Tenete presente, tuttavia, che un livello\n"
-"di sicurezza molto alto in genere viene ottenuto a spese della facilitц═\n"
-"d'uso. Per maggiori informazioni riguardo il significato di questi livelli\n"
-"potete consultare il capitolo \"msec\" del ''Manuale di Riferimento''.\n"
-"\n"
-"Se non sapete cosa scegliere, mantenete l'opzione predefinita."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Please select the correct port. For example, the \"COM1\" port under\n"
-"Windows is named \"ttyS0\" under GNU/Linux."
-msgstr ""
-"Scegliete la porta appropriata. La porta \"COM1\" sotto Windows, ad\n"
-"esempio, ц╗ chiamata \"ttyS0\" sotto GNU/Linux."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"As a review, DrakX will present a summary of various information it has\n"
-"about your system. Depending on your installed hardware, you may have some\n"
-"or all of the following entries:\n"
-"\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary.\n"
-"\n"
-" * \"Keyboard\": check the current keyboard map configuration and click on\n"
-"the button to change that if necessary.\n"
-"\n"
-" * \"Country\": check the current country selection. If you are not in this\n"
-"country, click on the button and choose another one.\n"
-"\n"
-" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
-"primary language you have chosen. But here, just as in your choice of a\n"
-"keyboard, you may not be in the country with which the chosen language\n"
-"should correspond. You may need to click on the \"Timezone\" button to\n"
-"configure the clock for the correct timezone.\n"
-"\n"
-" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
-"\n"
-" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
-"click that button. This should be reserved to advanced users.\n"
-"\n"
-" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
-"interface in \"800x600\" resolution. If that does not suits you, click on\n"
-"the button to reconfigure your grapical interface.\n"
-"\n"
-" * \"Network\": If you want to configure your Internet or local network\n"
-"access now, you can by clicking on this button.\n"
-"\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. If you notice the sound card displayed is not the one that\n"
-"is actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
-"\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. If you have a TV card and it is not detected, click on the button to\n"
-"try to configure it manually.\n"
-"\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on the button to change the parameters\n"
-"associated with the card."
-msgstr ""
-"Qui sono riportati vari parametri relativi al vostro sistema. In base\n"
-"all'hardware installato, potrebbero essere visualizzate le seguenti voci:\n"
-"\n"
-" * \"Mouse\": controllate la configurazione attuale del mouse, e cliccate\n"
-"sul pulsante per cambiarla, se necessario.\n"
-"\n"
-" * \"Tastiera\": controllate l'attuale impostazione della tastiera, e\n"
-"cliccate sul pulsante per cambiarla, se necessario.\n"
-"\n"
-" * DrakX, inizialmente \"Fuso orario\": il fuso orario ц╗ dedotto dalla\n"
-"lingua che avete scelto. Ma anche in questo caso, come per la tastiera,\n"
-"potreste non trovarvi nella nazione cui corrisponde la lingua che avete\n"
-"scelto; in tal caso sarц═ necessario cliccare su questo pulsante per\n"
-"configurare il fuso orario in base a quello dell'area geografica in cui\n"
-"vivete.\n"
-"\n"
-" * \"Stampante\": cliccando sul pulsante \"Nessuna stampante\" verrц═\n"
-"lanciato l'assistente di configurazione della stampante. Consultate il\n"
-"relativo capitolo della ''Guida introduttiva'' per avere maggiori\n"
-"informazioni su come configurare una nuova stampante. L'interfaccia\n"
-"descritta in tale sede ц╗ simile a quella utilizzata nel corso\n"
-"dell'installazione.\n"
-"\n"
-" * \"Scheda audio\": se sul vostro sistema ц╗ stata individuata una scheda\n"
-"audio, verrц═ mostrata qui. Al momento dell'installazione non ц╗ possibile\n"
-"apportare alcuna modifica.\n"
-"\n"
-" * \"Scheda TV\": se sul vostro sistema ц╗ stata individuata una scheda TV,\n"
-"verrц═ mostrata qui. Se disponete di una scheda TV che non ц╗ stata\n"
-"individuata, cliccate sul pulsante per cercare di configurarla a mano.\n"
-"\n"
-" * se sul vostro sistema ц╗ stata \"Scheda ISDN\": individuata una scheda\n"
-"ISDN, verrц═ mostrata qui. Potete cliccare sul pulsante relativo per\n"
-"cambiarne i parametri."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"This step is activated only if an ols GNU/Linux partition has been found on\n"
+"This step is activated only if an old GNU/Linux partition has been found on\n"
 "your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
 "of an existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": For the most part, this completely wipes out the old\n"
-"system. If you wish to change how your hard drives are partitioned, or\n"
-"change the file system, you should use this option. However, depending on\n"
-"your partitioning scheme, you can prevent some of your existing data from\n"
-"being over- written.\n"
+" * \"%s\": For the most part, this completely wipes out the old system. If\n"
+"you wish to change how your hard drives are partitioned, or change the file\n"
+"system, you should use this option. However, depending on your partitioning\n"
+"scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
-" * \"Upgrade\": this installation class allows you to update the packages\n"
+" * \"%s\": this installation class allows you to update the packages\n"
 "currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
@@ -532,48 +318,28 @@ msgid ""
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
 "to Mandrake Linux version \"8.1\" is not recommended."
 msgstr ""
+"Questo passo viene attivato soltanto se sulla vostra macchina ц╗ presente\n"
+"una vecchia partizione GNU/Linux.\n"
+"\n"
 "A questo punto DrakX deve sapere se intendete effettuare un'installazione\n"
-"in modalitц═ standard (\"Raccomandata\") o se preferite avere un maggior\n"
-"controllo su di essa (\"Esperto\"). Inoltre potete scegliere se effettuare\n"
-"una nuova installazione o un aggiornamento di un sistema Mandrake Linux\n"
-"esistente:\n"
-"\n"
-" * \"Installazione\" Cancella completamente il vecchio sistema. A seconda\n"
-"di come ц╗ strutturato il sistema preesistente, tuttavia, ц╗ possibile\n"
-"mantenere inalterate alcune delle vecchie partizioni (Linux e altre).\n"
-"\n"
-" * \"Aggiornamento\" Questo tipo di installazione vi permette di effettuare\n"
-"un semplice aggiornamento dei pacchetti installati sul vostro sistema\n"
-"Mandrake Linux. Conserva tutte le partizioni attuali del disco rigido, come\n"
-"pure le configurazioni individuali degli utenti. Tutti gli altri passi\n"
-"relativi alla configurazione restano disponibili, come per una\n"
+"in modalitц═ standard (\"%s\") o se preferite avere un maggior controllo su\n"
+"di essa (\"%s\"). Inoltre potete scegliere se effettuare una nuova\n"
+"installazione o un aggiornamento di un sistema Mandrake Linux esistente:\n"
+"\n"
+" * \"%s\" Cancella completamente il vecchio sistema. A seconda di come ц╗\n"
+"strutturato il sistema preesistente, tuttavia, ц╗ possibile mantenere\n"
+"inalterate alcune delle vecchie partizioni (Linux e altre).\n"
+"\n"
+" * \"%s\" Questo tipo di installazione vi permette di effettuare un\n"
+"semplice aggiornamento dei pacchetti installati sul vostro sistema Mandrake\n"
+"Linux. Conserva tutte le partizioni attuali del disco rigido, come pure le\n"
+"configurazioni e i dati individuali degli utenti. La maggior parte degli\n"
+"altri passi relativi alla configurazione restano disponibili, come per una\n"
 "installazione da zero.\n"
 "\n"
-" * \"Solo aggiornamento pacchetti\" Questa nuova opzione vi permette di\n"
-"aggiornare un sistema Mandrake Linux esistente lasciando intatta la\n"
-"configurazione globale del sistema. ц┬ anche possibile aggiungere nuovi\n"
-"pacchetti all'installazione corrente.\n"
-"\n"
-"Gli aggiornamenti dovrebbero svolgersi senza difficoltц═ per sistemi\n"
-"Mandrake Linux a partire dalla versione \"8.1\".\n"
-"\n"
-"Scegliete una delle seguenti modalitц═ di installazione, in base alla vostra\n"
-"conoscenza di GNU/Linux:\n"
-"\n"
-" * Raccomandata: se non avete mai installato il sistema operativo\n"
-"GNU/Linux, scegliete questa modalitц═. L'installazione sarц═ molto semplice e\n"
-"vi verranno poste solo poche domande;\n"
-"\n"
-" * Esperto: se avete abbastanza familiaritц═ con GNU/Linux potete scegliere\n"
-"questa modalitц═, che vi permetterц═ di effettuare un'installazione altamente\n"
-"personalizzata. Rispondere ad alcune delle domande che vi verranno poste\n"
-"potrebbe presentare difficoltц═ se non avete una buona conoscenza di\n"
-"GNU/Linux, pertanto vi sconsigliamo di scegliere questa modalitц═ se non\n"
-"disponete dell'esperienza necessaria.\n"
-"\n"
-"Questo manuale descrive in maniera esauriente la modalitц═ d'installazione\n"
-"\"Esperto\". Se scegliete la modalitц═ \"Raccomandata\", potete\n"
-"semplicemente ignorare i passi relativi alla sola modalitц═ \"Esperto\"."
+"L'opzione \"%s\" non dovrebbe comportare difficoltц═ per sistemi Mandrake\n"
+"Linux a partire dalla versione \"8.1\". L'aggiornamento di sistemi Mandrake\n"
+"Linux in versioni precedenti la \"8.1\" non ц╗ consigliato."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -581,109 +347,91 @@ msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Bugs may have been\n"
 "fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Choose\n"
-"\"Yes\" if you have a working Internet connection, or \"No\" if you prefer\n"
-"to install updated packages later.\n"
-"\n"
-"Choosing \"Yes\" displays a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. A package-selection tree will\n"
-"appear: review the selection, and press \"Install\" to retrieve and install\n"
-"the selected package( s), or \"Cancel\" to abort."
+"updates, you are now able to download them from the Internet. Check \"%s\"\n"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
+"install updated packages later.\n"
+"\n"
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one nearer to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "ц┬ molto probabile che, al momento in cui installate Mandrake Linux, alcuni\n"
 "pacchetti siano stati aggiornati rispetto alla versione iniziale. Potrebbe\n"
 "trattarsi di un ''bug fix'', o della soluzione di problemi relativi alla\n"
 "sicurezza. Per permettervi di beneficiare di questi aggiornamenti vi verrц═\n"
 "proposto di scaricare la nuova versione dei pacchetti usando Internet.\n"
-"Scegliete \"Sц╛\" se potete contare su una connessione a Internet\n"
-"funzionante, oppure \"No\" se preferite installare i pacchetti aggiornati\n"
-"in un secondo momento.\n"
+"Scegliete \"%s\" se disponete di una connessione a Internet funzionante,\n"
+"oppure \"%s\" se preferite installare i pacchetti aggiornati in un secondo\n"
+"momento.\n"
 "\n"
-"Se scegliete \"Sц╛\" comparirц═ una lista di siti da cui ц╗ possibile\n"
+"Se scegliete \"%s\" comparirц═ una lista di siti da cui ц╗ possibile\n"
 "scaricare i pacchetti aggiornati. Selezionate quello piц╧ vicino a voi. A\n"
 "questo punto comparirц═ una finestra di selezione pacchetti: controllate la\n"
-"lista e cliccate su \"Installa\" per scaricare e installare i pacchetti, o\n"
-"su \"Annulla\" per annullare l'operazione."
+"lista e cliccate su \"%s\" per scaricare e installare i pacchetti, o su\n"
+"\"%s\" per annullare l'operazione."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"This dialog allows to finely tune your bootloader:\n"
+"This dialog allows you to fine tune your bootloader:\n"
 "\n"
-" * \"Bootloader to use\": there are three choices for your bootloader:\n"
+" * \"%s\": there are three choices for your bootloader:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"%s\": if you prefer grub (text menu).\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
 "\n"
-" * \"Delay before booting the default image\": after a boot or a reboot of\n"
-"the computer, this is the delay given to the user at the console to select\n"
-"a boot entry other than the default.\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
-"system! Be sure you know what you do before changing any of the options. !!\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
-"that are reserved for the expert user."
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
 msgstr ""
-"LILO e grub sono due ''bootloader'' di GNU/Linux. Un bootloader ц╗ un\n"
-"programma per l'avvio di uno o piц╧ sistemi operativi. Questa fase, in\n"
-"genere, ц╗ del tutto automatica; DrakX, infatti, analizza il settore di boot\n"
-"del disco, e si comporta in base a quello che vi trova:\n"
-"\n"
-" * se trova un settore di boot di Windows, lo rimpiazza con un settore di\n"
-"boot di grub o LILO, in modo da permettervi di lanciare GNU/Linux o un\n"
-"altro OS;\n"
-"\n"
-" * se trova un settore di boot di grub o LILO, lo sostituisce con uno\n"
-"nuovo.\n"
-"\n"
-"In caso di dubbio, DrakX mostrerц═ una finestra di dialogo con varie\n"
-"opzioni:\n"
+"Grazie a questa finestra di dialogo potrete impostare con precisione i\n"
+"parametri del bootloader:\n"
 "\n"
-" * \"Bootloader da usare\": avete tre scelte a disposizione:\n"
+" * \"%s\": avete tre scelte a disposizione:\n"
 "\n"
-"    * \"GRUB\": se preferite grub (menu in modo testo);\n"
+"    * \"%s\": se preferite grub (menu in modo testo);\n"
 "\n"
-"    * \"LILO con menu grafico\": se preferite LILO con la sua interfaccia\n"
-"grafica;\n"
+"    * \"%s\": se preferite LILO nella sua versione con menu in modo testo.\n"
 "\n"
-"    * \"LILO con menu in modo testo\": se preferite LILO nella sua versione\n"
-"con menu in modo testo.\n"
+"    * \"%s\": se preferite LILO con la sua interfaccia grafica;\n"
 "\n"
-" * \"Dispositivo di boot\": nella maggior parte dei casi non sarц═\n"
-"necessario cambiare le impostazioni predefinite (\"/dev/hda\"), ma, se lo\n"
-"preferite, il bootloader puц╡ essere installato sul secondo disco rigido\n"
-"(\"/dev/hdb\"), o persino su un floppy (\"/dev/fd0\");\n"
+" * \"%s\": nella maggior parte dei casi non sarц═ necessario cambiare le\n"
+"impostazioni predefinite (\"%s\"), ma, se lo preferite, il bootloader puц╡\n"
+"essere installato sul secondo disco rigido (\"%s\"), o persino su un floppy\n"
+"(\"%s\").\n"
 "\n"
-" * \"Ritardo prima di avviare con l'immagine predefinita\": ц╗ il tempo\n"
-"lasciato all'utente per scegliere una voce diversa da quella predefinita\n"
-"nel menu del bootloader.\n"
+" * \"%s\": ц╗ il tempo lasciato all'utente per scegliere una voce diversa da\n"
+"quella predefinita nel menu del bootloader.\n"
 "\n"
 "!! Prestate particolare attenzione al fatto che, se scegliete di non\n"
-"installare un bootloader (scegliendo \"Annulla\" nella finestra di cui\n"
-"sopra), dovete essere sicuri di poter avviare il vostro sistema Mandrake\n"
-"Linux in altro modo! Accertatevi anche di sapere quello che fate se\n"
-"modificate qualcuna delle opzioni. !!\n"
-"\n"
-"Cliccando sul pulsante \"Avanzato\" di questa finestra avrete la\n"
-"possibilitц═ di scegliere tra molte opzioni avanzate, riservate agli utenti\n"
-"esperti."
+"installare un bootloader (scegliendo \"%s\"), dovete essere sicuri di poter\n"
+"avviare il vostro sistema Mandrake Linux in qualche modo! Accertatevi di\n"
+"sapere quello che fate prima di modificare qualcuna delle opzioni. !!\n"
+"\n"
+"Cliccando sul pulsante \"%s\" di questa finestra avrete la possibilitц═ di\n"
+"scegliere tra molte opzioni avanzate, riservate agli utenti esperti."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
+"Please choose which one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -746,24 +494,135 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"\n"
+"You will be presented with a list of different parameters to change to get\n"
+"an optimal graphical display: Graphic Card\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose from this list the card you actually have installed.\n"
+"\n"
+"   In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs.\n"
+"\n"
+"\n"
+"\n"
+"Monitor\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
+"\n"
+"\n"
+"\n"
+"Resolution\n"
+"\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
+"configuration is shown in the monitor.\n"
+"\n"
+"\n"
+"\n"
+"Test\n"
+"\n"
+"   the system will try to open a graphical screen at the desired\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"means that some part of the autodetected configuration was incorrect and\n"
+"the test will automatically end after 12 seconds, bringing you back to the\n"
+"menu. Change settings until you get a correct graphical display.\n"
+"\n"
+"\n"
+"\n"
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
+msgstr ""
+"X (abbreviazione per ''X Window System'') ц╗ il cuore dell'interfaccia\n"
+"grafica di GNU/Linux, sulla quale sono basati tutti gli ambienti grafici\n"
+"inclusi in Mandrake Linux (KDE, GNOME, AfterStep, WindowMaker, etc.).\n"
+"\n"
+"Vi verrц═ mostrata una lista dei parametri da configurare in modo da avere\n"
+"un display grafico ottimale: Scheda Grafica\n"
+"\n"
+"   Il programma di installazione normalmente ц╗ perfettamente in grado di\n"
+"identificare e configurare automaticamente la scheda grafica installata sul\n"
+"vostro computer. In caso contrario, potete scegliere in questa lista la\n"
+"scheda di cui disponete.\n"
+"\n"
+"   Se per la vostra scheda ц╗ disponibile piц╧ di un server grafico, con o\n"
+"senza accelerazione 3D, vi verrц═ chiesto di scegliere il server che meglio\n"
+"si adatta ai vostri bisogni.\n"
+"\n"
+"\n"
+"\n"
+"Monitor\n"
+"\n"
+"   Il programma di installazione provvede anche a identificare e\n"
+"configurare automaticamente il monitor connesso al vostro computer. Se cosц╛\n"
+"non fosse, anche in questo caso potete scegliere da una lista il tipo di\n"
+"monitor in vostro possesso.\n"
+"\n"
+"\n"
+"\n"
+"Risoluzione\n"
+"\n"
+"   Qui potete scegliere risoluzione e profonditц═ di colore tra quelle\n"
+"disponibili per il vostro hardware. Scegliete le impostazioni che meglio si\n"
+"adattano ai vostri bisogni (potrete cambiare la configurazione anche dopo\n"
+"l'installazione, comunque). All'interno del monitor ц╗ visibile un'anteprima\n"
+"della configurazione selezionata.\n"
+"\n"
+"\n"
+"\n"
+"Test\n"
+"\n"
+"   Il sistema tenterц═ di aprire uno schermo grafico alla risoluzione\n"
+"specificata. Se potete vedere il messaggio durante il test e rispondete\n"
+"\"%s\", allora DrakX passerц═ alla fase successiva. Se non potete vedere il\n"
+"messaggio, significa che la configurazione ottenuta con l'identificazione\n"
+"automatica non ц╗ corretta in qualche punto: il test terminerц═\n"
+"automaticamente dopo 12 secondi, e vi riporterц═ al menu. Cambiate le\n"
+"impostazioni finchц╘ non otterrete un display grafico corretto.\n"
+"\n"
+"\n"
+"\n"
+"Options\n"
+"\n"
+"   Qui potete scegliere di avviare automaticamente l'interfaccia grafica\n"
+"subito dopo il boot. Ovviamente ц╗ opportuno rispondere \"%s\" nel caso in\n"
+"cui la vostra macchina svolga le funzioni di server, oppure se non siete\n"
+"riuscite a configurare il server grafico."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
-"is best for a particular type of configuration.\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"is best suited to particular types of configuration.\n"
 "\n"
-" * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"pdq\n"
-"\" will handle only very simple network cases and is somewhat slow when\n"
-"used with networks.) It's recommended that you use \"pdq \" if this is your\n"
-"first experience with GNU/Linux.\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
 "printing to your local printer or to one halfway around the planet. It is\n"
 "simple to configure and can act as a server or a client for the ancient\n"
 "\"lpd \" printing system, so it compatible with older operating systems\n"
-"that may still need print services. While quite powerful, the basic setup\n"
+"which may still need print services. While quite powerful, the basic setup\n"
 "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
 "front-ends for printing or choosing printer options and for managing the\n"
 "printer.\n"
 "\n"
@@ -775,7 +634,7 @@ msgstr ""
 "Anche altri sistemi operativi possono offrirvene uno, ma Mandrake Linux ve\n"
 "ne offre ben tre.\n"
 "\n"
-" * \"pdq\" - che sta per ''print, don't queue'' (''stampa, non mettere in\n"
+" * \"%s\" - che sta per ''print, don't queue'' (''stampa, non mettere in\n"
 "coda''), ц╗ una buona scelta se avete una connessione diretta con la\n"
 "stampante e volete essere in grado di risolvere rapidamente eventuali\n"
 "problemi di inceppamento della carta, e inoltre non disponete di altre\n"
@@ -786,171 +645,20 @@ msgstr ""
 "lanciando PrinterDrake dal Centro di controllo Mandrake e cliccando sul\n"
 "pulsante Esperto.\n"
 "\n"
-" * \"CUPS\" - ''Common Unix Printing System'' (''Sistema di stampa\n"
-"unificato per Unix''), offre risultati eccellenti sia che dobbiate stampare\n"
-"sulla vostra stampante locale, sia nel caso che la stampa debba essere\n"
-"effettuata sull'altra faccia del pianeta. ц┬ semplice da usare e puц╡ agire\n"
-"come server o client per il vecchio sistema di stampa \"lpd\". E' infatti\n"
-"compatibile con i sistemi precedenti. Questo sistema ha molte frecce al suo\n"
-"arco, ma nonostante ciц╡ la configurazione di base ц╗ quasi altrettanto\n"
-"semplice di quella per \"pdq\". Se avete bisogno di emulare un server\n"
-"\"lpd\" dovete attivare il demone \"cups-lpd\". Dispone poi di interfaccia\n"
-"grafica per la stampa e per la configurazione delle opzioni della\n"
-"stampante.\n"
-"\n"
-" * \"lprNG\" - ''line printer daemon New Generation'' (''demone di stampa\n"
-"di nuova generazione''. Questo sistema ц╗ approssimativamente equivalente\n"
-"agli altri, ma ц╗ anche in grado di stampare su dispositivi collegati per\n"
-"mezzo di una rete Novell, dato che supporta il protocollo IPX, e puц╡\n"
-"stampare direttamente per messo di comandi shell. Se avete bisogno di una\n"
-"connessione di tipo Novell, o di stampare senza fare uso di pipe,\n"
-"utilizzate lprNG. In caso contrario, ц╗ preferibile usare CUPS dato che ц╗\n"
-"piц╧ semplice e migliore nel gestire stampanti di rete."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Usually, DrakX has no problems detecting the number of buttons on your\n"
-"mouse. If it does, it assumes you have a two-button mouse and will\n"
-"configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
-"right mouse buttons. DrakX will automatically know whether your mouse uses\n"
-"a PS/2, serial or USB interface.\n"
-"\n"
-"If for some reason you wish to specify a different type of mouse, select it\n"
-"from the provided list.\n"
-"\n"
-"If you choose a mouse other than the default, a test screen will be\n"
-"displayed. Use the buttons and wheel to verify that the settings are\n"
-"correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
-"\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
-"select your mouse from a list. Be sure to select the one corresponding to\n"
-"the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
-"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
-"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
-"the buttons and check that the mouse pointer moves on-screen as you move\n"
-"your mouse."
-msgstr ""
-"In genere DrakX individua automaticamente il numero di pulsanti presenti\n"
-"sul vostro mouse, in caso contrario conclude che il vostro ц╗ un mouse a due\n"
-"tasti e lo imposta in modo da emulare il terzo tasto. DrakX, inoltre,\n"
-"riconosce automaticamente se si tratta di un mouse PS/2, seriale o USB.\n"
-"\n"
-"Se volete specificare un diverso tipo di mouse, scegliete il vostro modello\n"
-"dall'elenco che vi viene proposto.\n"
-"\n"
-"Se scegliete un mouse diverso dal tipo suggerito vi verrц═ mostrata una\n"
-"finestra dove potrete provarlo. Provate sia i pulsanti che l'eventuale\n"
-"rotellina per controllare che la configurazione sia corretta. Se il mouse\n"
-"non funziona correttamente, premete la barra spaziatrice o il tasto [Invio]\n"
-"per attivare il pulsante \"Annulla\" ed effettuare una nuova scelta.\n"
-"\n"
-"Talvolta i mouse con rotellina centrale potrebbero non essere individuati\n"
-"automaticamente. In tal caso, dovrete selezionarli personalmente usando la\n"
-"lista. Assicuratevi di indicare correttamente la porta alla quale il mouse\n"
-"ц╗ collegato. Premete il pulsante \"OK\", e comparirц═ l'immagine di un\n"
-"mouse. Fate scorrere la rotellina per attivarla correttamente, quindi\n"
-"provate i pulsanti e spostate il mouse in modo da accertarvi che tutto sia\n"
-"a posto."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"Next\n"
-"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
-"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
-"also choose not to configure the network, or to do it later, in which case\n"
-"clicking the \"Cancel\" button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
-"simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-"Se desiderate connettere il vostro computer a Internet o a una rete locale,\n"
-"assicuratevi di scegliere l'opzione corretta. Accendete la periferica che\n"
-"dovrete usare per connettervi prima di scegliere l'opzione adeguata, per\n"
-"permettere a DrakX di individuarla automaticamente.\n"
-"\n"
-"Mandrake Linux vi permette di configurare la vostra connessione a Internet\n"
-"durante il processo di installazione. Le connessioni disponibili sono:\n"
-"modem tradizionale, modem ISDN, connessione ADSL, cable modem, e infine una\n"
-"semplice connessione a una LAN (Ethernet).\n"
-"\n"
-"Non possiamo descrivere in dettaglio le caratteristiche di ogni\n"
-"configurazione. In ogni caso, accertatevi di avere a portata di mano tutti\n"
-"i parametri indicati dal vostro fornitore di servizi internet o dal vostro\n"
-"amministratore di sistema.\n"
-"\n"
-"Per maggiori dettagli riguardo la configurazione della connessione a\n"
-"Internet potete consultare il relativo capitolo della ''Guida\n"
-"introduttiva''; in alternativa, potete attendere di aver portato a termine\n"
-"l'installazione e usare poi il programma descritto in tale capitolo per\n"
-"configurare la connessione."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
-"computer."
-msgstr ""
-"Prima di proseguire dovreste leggere con attenzione le condizioni d'uso;\n"
-"queste riguardano l'intera distribuzione Mandrake Linux, e se non siete\n"
-"d'accordo con qualche punto della licenza cliccate sul pulsante\n"
-"\"Rifiuta\": la procedura di installazione sarц═ immediatamente interrotta.\n"
-"Per proseguire con l'installazione, invece, cliccate sul pulsante\n"
-"\"Accetta\"."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"This step is used to choose which services you wish to start at boot time.\n"
-"\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not always needed at\n"
-"boot time.\n"
-"\n"
-"A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
-"it is safer to leave the default behavior.\n"
-"\n"
-"!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
-msgstr ""
-"A questo punto potete scegliere i servizi da lanciare automaticamente\n"
-"all'avvio del sistema.\n"
-"\n"
-"Qui sono elencati tutti i servizi disponibili con l'installazione attuale.\n"
-"Esaminateli attentamente e disabilitate quelli che non sono sempre\n"
-"necessari all'avvio.\n"
-"\n"
-"Selezionando un servizio comparirц═ un breve testo di aiuto che ne spiega le\n"
-"caratteristiche. Se non siete realmente sicuri dell'utilitц═ o meno di un\n"
-"servizio, ц╗ piц╧ prudente non modificare le impostazioni predefinite.\n"
-"\n"
-"!! In questa fase dell'installazione dovete fare le vostre scelte con\n"
-"particolare attenzione nel caso intendiate usare il vostro computer come\n"
-"server: probabilmente non volete che siano abilitati servizi di cui non\n"
-"avete bisogno. Ricordate che numerosi servizi sono potenzialmente\n"
-"pericolosi se attivi su un server. Come regola generale, selezionate\n"
-"soltanto quelli di cui avete effettivamente bisogno. !!"
+" * \"%s\" - ''Common Unix Printing System'' (''Sistema di stampa unificato\n"
+"per Unix''), offre risultati eccellenti sia che dobbiate stampare sulla\n"
+"vostra stampante locale, sia nel caso che la stampa debba essere effettuata\n"
+"sull'altra faccia del pianeta. ц┬ semplice da usare e puц╡ agire come server\n"
+"o client per il vecchio sistema di stampa \"lpd\". E' infatti compatibile\n"
+"con i sistemi precedenti. Questo sistema ha molte frecce al suo arco, ma\n"
+"nonostante ciц╡ la configurazione di base ц╗ quasi altrettanto semplice di\n"
+"quella per \"pdq\". Se avete bisogno di emulare un server \"lpd\" dovete\n"
+"attivare il demone \"cups-lpd\". Dispone poi di interfaccia grafica per la\n"
+"stampa e per la configurazione delle opzioni della stampante.\n"
+"\n"
+"Se fate una scelta adesso e successivamente cambiate idea, potrete sempre\n"
+"scegliere un diverso sistema di stampa scegliendo PrinterDrake nel Mandrake\n"
+"Control Center e cliccando sul pulsante per il modo esperto."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -963,75 +671,66 @@ msgid ""
 "Packages are sorted into groups corresponding to a particular use of your\n"
 "machine. Mandrake Linux has four predefined installations available. You\n"
 "can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various containers, so a\n"
+"You can mix and match applications from the various groups, so a\n"
 "``Workstation'' installation can still have applications from the\n"
-"``Development'' container installed.\n"
+"``Development'' group installed.\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the applications that are in the workstation\n"
-"container.\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the applications that are in the workstation group.\n"
 "\n"
-" * \"Development\": if plan on using your machine for programming, choose\n"
-"the appropriate packages from the container.\n"
+" * \"%s\": if plan on using your machine for programming, choose the\n"
+"appropriate packages from that group.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, select which of\n"
-"the more common services you wish to install on your machine.\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical interface available.\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
 "text about that group. If you unselect all groups when performing a regular\n"
 "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the minimum number of packages possible to have a\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server.\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
 "\n"
-" * \"Truly minimal install\": will install the absolute minimum number of\n"
-"packages necessary to get a working Linux system. With this installation\n"
-"you will only have a command line interface. The total size of this\n"
-"installation is 65 megabytes.\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
 "Adesso ц╗ il momento di indicare i programmi che volete siano installati sul\n"
 "vostro sistema. Ci sono migliaia di programmi disponibili per Mandrake\n"
 "Linux, e nessuno si aspetta che li conosciate tutti a memoria.\n"
 "\n"
-"Se state effettuando un'installazione standard da CD-ROM, per prima cosa vi\n"
-"verrц═ chiesto di specificare quali sono i CD in vostro possesso (solo se\n"
-"siete in modalitц═ Esperto): controllate le etichette dei CD e cliccate\n"
-"sulle caselle corrispondenti a quelli di cui disponete. Cliccate su \"Ok\"\n"
-"quando siete pronti per continuare.\n"
-"\n"
 "I pacchetti sono organizzati in gruppi corrispondenti a usi particolari\n"
 "della vostra macchina. I gruppi sono a loro volta divisi in quattro\n"
 "sezioni:\n"
 "\n"
-" * \"Workstation\": scegliete uno o piц╧ dei gruppi di questa sezione se la\n"
-"vostra macchina verrц═ utilizzata prevalentemente come workstation.\n"
+" * \"%s\": scegliete uno o piц╧ dei gruppi di questa sezione se la vostra\n"
+"macchina verrц═ utilizzata prevalentemente come workstation.\n"
 "\n"
-" * \"Sviluppo\": se la macchina verrц═ usata per lo sviluppo di software\n"
-"scegliete i gruppi appropriati.\n"
+" * \"%s\": se la macchina verrц═ usata per lo sviluppo di software scegliete\n"
+"i gruppi appropriati.\n"
 "\n"
-" * \"Server\": se il computer sarц═ usato come server, qui potrete scegliere\n"
-"i servizi piц╧ comuni da installare.\n"
+" * \"%s\": se il computer sarц═ usato come server, qui potrete scegliere i\n"
+"servizi piц╧ comuni da installare.\n"
 "\n"
-" * \"Ambiente grafico\": scegliete qui il vostro ambiente grafico\n"
-"preferito. Indicatene almeno uno se desiderate avere una workstation\n"
-"grafica!\n"
+" * \"%s\": scegliete qui il vostro ambiente grafico preferito. Indicatene\n"
+"almeno uno se desiderate avere una workstation grafica!\n"
 "\n"
 "Spostando il puntatore del mouse sul nome di un gruppo verrц═ mostrato un\n"
 "breve testo di informazioni a riguardo. Se state effettuando\n"
@@ -1039,23 +738,22 @@ msgstr ""
 "gruppi, comparirц═ una finestra di dialogo che vi proporrц═ alcune opzioni\n"
 "relative a un'installazione ''minima'':\n"
 "\n"
-" * \"With X\": installa i pacchetti strettamente necessari per avere un\n"
+" * \"%s\": installa i pacchetti strettamente necessari per avere un\n"
 "ambiente grafico funzionante;\n"
 "\n"
-" * \"With basic documentation\": installa il sistema base piц╧ le utilitц═ di\n"
-"base e la relativa documentazione; questo tipo di installazione ц╗ utile se\n"
-"si vuole configurare un server;\n"
+" * \"%s\": installa il sistema base piц╧ le utilitц═ di base e la relativa\n"
+"documentazione; questo tipo di installazione ц╗ utile se si vuole\n"
+"configurare un server;\n"
 "\n"
-" * \"Truly minimal install\": provvederц═ all'installazione dello stretto\n"
-"necessario per avere un sistema Linux funzionante, avente come unica\n"
-"interfaccia la linea di comando.\n"
+" * \"%s\": provvederц═ all'installazione dello stretto necessario per avere\n"
+"un sistema Linux funzionante, avente come unica interfaccia la riga di\n"
+"comando.\n"
 "\n"
-"Se lo desiderate, potete abilitare l'opzione \"Selezione individuale dei\n"
-"pacchetti\". Questa ц╗ utilissima se conoscete bene i pacchetti presenti\n"
-"nella distribuzione o se desiderate avere il totale controllo di ciц╡ che\n"
-"verrц═ installato.\n"
+"Se lo desiderate, potete abilitare l'opzione \"%s\". Questa ц╗ utilissima se\n"
+"conoscete bene i pacchetti presenti nella distribuzione o se desiderate\n"
+"avere il totale controllo di ciц╡ che verrц═ installato.\n"
 "\n"
-"Se avete cominciato l'installazione in modalitц═ \"Aggiornamento\", potete\n"
+"Se avete cominciato l'installazione in modalitц═ \"%s\", potete\n"
 "deselezionare tutti i gruppi per evitare di installare nuovi pacchetti, in\n"
 "questo modo effettuerete soltanto il ripristino o l'aggiornamento del\n"
 "sistema esistente."
@@ -1063,38 +761,6 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
-"local time according to the time zone you selected. If the clock on your\n"
-"motherboard is set to local time, you may deactivate this by unselecting\n"
-"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
-"system clock and the hardware clock are in the same timezone. This is\n"
-"useful when the machine also hosts another operating system like Windows.\n"
-"\n"
-"The \"Automatic time synchronization \" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. For this\n"
-"feature to work, you must have a working Internet connection. It is best to\n"
-"choose a time server located near you. This option actually installs a time\n"
-"server that can used by other machines on your local network."
-msgstr ""
-"GNU/Linux gestisce il tempo in base al GMT (''Greenwich Mean Time'') e lo\n"
-"traduce nell'ora locale secondo il fuso orario selezionato. Tuttavia ц╗\n"
-"possibile disabilitare questa opzione togliendo il segno di spunta alla\n"
-"casella \"Hardware clock set to GMT\", in modo che l'orologio hardware\n"
-"coincida con quello di sistema. Questa scelta puц╡ tornare utile nel caso\n"
-"sulla macchina sia installato un altro sistema operativo, ad esempio\n"
-"Windows.\n"
-"\n"
-"L'opzione \"Automatic time synchronization\" provvederц═ a gestire l'ora\n"
-"grazie alla connessione via Internet con un server di orario remoto.\n"
-"Scegliete un server vicino a voi nella lista che vi verrц═ mostrata. Perchц╘\n"
-"questa opzione funzioni, naturalmente, dovete disporre di una connessione a\n"
-"Internet funzionante. Sulla vostra macchina verrц═ installato un server del\n"
-"tempo che potrц═ essere usato anche per altre macchine che si trovano sulla\n"
-"vostra rete locale."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
 "The Mandrake Linux installation is distributed on several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM so it will eject\n"
 "the current CD and ask you to insert the correct CD as required."
@@ -1109,19 +775,20 @@ msgstr ""
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
+"administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
 "guess - DrakX will tell you if the password that you chose too easy. As you\n"
 "can see, you are not forced to enter a password, but we strongly advise you\n"
-"against. GNU/Linux is as prone to operator error as any other operating\n"
-"system. Since \"root\" can overcome all limitations and unintentionally\n"
-"erase all data on partitions by carelessly accessing the partitions\n"
-"themselves, it is important that it be difficult to become \"root\".\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
 "\n"
 "One caveat -- do not make the password too long or complicated because you\n"
 "must be able to remember it!\n"
@@ -1129,18 +796,19 @@ msgid ""
 "The password will not be displayed on screen as you type it in. To reduce\n"
 "the chance of a blind typing error you will need to enter the password\n"
 "twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
 "\n"
 "If you wish access to this computer to be controlled by an authentication\n"
-"server, clisk the \"Advanced\" button.\n"
+"server, click the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you do not\n"
-"know which to use, ask your network administrator.\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with reminding passwords, you can choose to\n"
-"have \"No password\", if your computer won't be connected to the Internet,\n"
-"and if you trust anybody having access to it."
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the internet or that you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Questo ц╗ il punto piц╧ critico per la sicurezza del vostro sistema\n"
 "GNU/Linux: state per decidere la password di \"root\". \"root\" ц╗\n"
@@ -1171,156 +839,36 @@ msgstr ""
 "\"scorretta\" sarц═ quella che verrц═ richiesta la prima volta che vi\n"
 "connetterete al sistema.\n"
 "\n"
-"In modalitц═ Esperto vi verrц═ chiesto se il vostro computer ц╗ connesso a un\n"
-"server di autenticazione, secondo il protocollo NIS, LDAP o PDC.\n"
+"Se volete che l'accesso al vostro computer sia controllato da un server di\n"
+"autenticazione, cliccate sul pulsante \"%s\".\n"
 "\n"
 "Se la vostra rete si basa sul protocollo LDAP, NIS o PDC per\n"
 "l'autenticazione, selezionate il pulsante appropriato per effettuare\n"
 "l'autenticazione. Se non siete sicuri, chiedete al vostro amministratore di\n"
 "rete.\n"
 "\n"
-"Se il vostro computer non ц╗ connesso a una rete soggetta ad autenticazione,\n"
-"scegliete \"File locali\"."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Here are Listed the existing Linux partitions detected on your hard drive.\n"
-"You can keep the choices made by the wizard, since they are good for most\n"
-"common installations. If you make any changes, you must at least define a\n"
-"root partition (\"/\"). Do not choose too small a partition or you will not\n"
-"be able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a \"/home\" partition\n"
-"(only possible if you have more than one Linux partition available).\n"
-"\n"
-"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
-"\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
-"\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
-"\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
-"\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
-"\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
-"\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-"\"second lowest SCSI ID\", etc."
-msgstr ""
-"In alto potete vedere l'elenco delle partizioni Linux individuate sul\n"
-"vostro disco rigido. Potete attenervi alle scelte fatte dall'assistente,\n"
-"vanno bene per la maggior parte delle installazioni. Se fate dei\n"
-"cambiamenti, ricordate che dovete definire per lo meno una partizione root\n"
-"(''radice'') (\"/\"). Non sceglietela troppo piccola, altrimenti non sarete\n"
-"in grado di installare parte del software. Se poi volete archiviare i\n"
-"vostri dati su una partizione separata, dovrete assegnare una partizione\n"
-"anche a \"/home\" (ciц╡ ц╗ possibile soltanto se avete a disposizione piц╧\n"
-"partizioni Linux).\n"
-"\n"
-"Ogni partizione ц╗ elencata in base a queste caratteristiche: \"Nome\",\n"
-"\"Capacitц═\".\n"
-"\n"
-"Il \"Nome\" ц╗ strutturato in: \"tipo di disco rigido\", \"numero del\n"
-"disco\", \"numero della partizione\" (ad esempio, \"hda1\").\n"
-"\n"
-"Il \"tipo di disco rigido\" ц╗ \"hd\" se il vostro disco ц╗ di tipo IDE, e\n"
-"\"sd\" se, invece, ц╗ un disco SCSI.\n"
-"\n"
-"Il \"numero del disco\" ц╗ sempre una lettera che segue \"hd\" o \"sd\". Per\n"
-"i dischi IDE:\n"
-"\n"
-" * \"a\" significa \"disco rigido master sul controller IDE primario\";\n"
-"\n"
-" * \"b\" significa \"disco rigido slave sul controller IDE primario\";\n"
-"\n"
-" * \"c\" significa \"disco rigido master sul controller IDE secondario\";\n"
-"\n"
-" * \"d\" significa \"disco rigido slave sul controller IDE secondario\".\n"
-"\n"
-"Per i dischi rigidi di tipo SCSI, invece, una \"a\" significa \"ID SCSI piц╧\n"
-"basso\", una \"b\" significa \"ID SCSI immediatamente successivo ad a\",\n"
-"etc."
+"Se l'obbligo di ricordarvi una password vi infastidisce, potete ricorrere\n"
+"all'opzione \"%s\": sceglietela se il vostro computer non sarц═ collegato a\n"
+"Internet e se avete piena fiducia nelle persone che lo useranno."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"Click on \"Next ->\" if you want to delete all data and partitions present\n"
-"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
-"be able to recover any data and partitions present on this hard drive,\n"
-"including any Windows data.\n"
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"Click on \"%s\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Cliccate sul pulsante \"OK\" se volete cancellare tutte le partizioni e i\n"
+"Cliccate sul pulsante \"%s\" se volete cancellare tutte le partizioni e i\n"
 "dati presenti su questo disco rigido. Prestate attenzione, dopo aver\n"
-"cliccato su \"OK\" non potrete piц╧ recuperare le partizioni e i dati\n"
+"cliccato su \"%s\" non potrete piц╧ recuperare le partizioni e i dati\n"
 "presenti sul disco, compresi eventuali dati di Windows.\n"
 "\n"
-"Cliccate su \"Annulla\" per annullare questa operazione senza che venga\n"
-"perso nulla dei dati o partizioni presenti su questo disco rigido."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
-"handy.\n"
-"\n"
-"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
-"booting the CD-ROM, pressing the >> F1<< key at boot and typing >>rescue<<\n"
-"at the prompt. If your computer cannot boot from the CD-ROM, there are at\n"
-"least two situations where having a boot floppy is critical:\n"
-"\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows on\n"
-"your system). If at some point you need to reinstall Windows, the Microsoft\n"
-"install process will rewrite the boot sector and remove your ability to\n"
-"start GNU/Linux!\n"
-"\n"
-" * if a problem arises and you cannot start GNU/Linux from the hard disk,\n"
-"this floppy will be the only means of starting up GNU/Linux. It contains a\n"
-"fair number of system tools for restoring a system that has crashed due to\n"
-"a power failure, an unfortunate typing error, a forgotten root password, or\n"
-"any other reason.\n"
-"\n"
-"If you say \"Yes\", you will be asked to insert a disk in the drive. The\n"
-"floppy disk must be blank or have non-critical data on it - DrakX will\n"
-"format the floppy and will rewrite the whole disk."
-msgstr ""
-"Il CD-ROM di Mandrake Linux ha una modalitц═ ''salvataggio'' preconfigurata.\n"
-"Potete accedervi effettuando il boot dal CD-ROM, premendo il tasto >>F1<<\n"
-"all'avvio e digitando >>rescue<< dal prompt. Ma se il vostro computer non\n"
-"puц╡ essere avviato dal CD-ROM, dovete effettuare questa operazione (la\n"
-"creazione di un disco di avvio) per almeno due ragioni:\n"
-"\n"
-" * quando il bootloader verrц═ installato, DrakX riscriverц═ il settore di\n"
-"boot (MBR) del vostro disco principale (a meno che voi non usiate un altro\n"
-"gestore del boot), in modo che possiate avviare sia Windows che GNU/Linux,\n"
-"se sul vostro sistema ц╗ installato anche Windows. Tuttavia, se in futuro si\n"
-"renderц═ necessario re-installare Windows, il programma di installazione\n"
-"Microsoft riscriverц═ il settore di boot, e di conseguenza non sarete piц╧ in\n"
-"grado di avviare GNU/Linux!\n"
-"\n"
-" * se si verifica un problema per cui non potete piц╧ lanciare GNU/Linux dal\n"
-"disco rigido, questo dischetto sarц═ l'unico mezzo per avviare GNU/Linux:\n"
-"contiene un buon numero di programmi di amministrazione del sistema per\n"
-"rimettere in sesto un'installazione che ha subito un crash per\n"
-"un'interruzione di corrente, uno sfortunato errore di battitura, una\n"
-"password dimenticata o qualsiasi altra ragione.\n"
-"\n"
-"Quando cliccherete su \"Sц╛\", vi verrц═ chiesto di inserire un disco in un\n"
-"lettore di floppy. Naturalmente il dischetto che utilizzerete deve essere\n"
-"vuoto o contenere soltanto dati di cui non avete piц╧ bisogno. Non sarц═\n"
-"necessario formattarlo: DrakX riscriverц═ l'intero disco."
+"Cliccate su \"%s\" per annullare questa operazione senza che venga perso\n"
+"nulla dei dati o partizioni presenti su questo disco rigido."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -1339,17 +887,17 @@ msgid ""
 "installed. By default Mandrake Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes are discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
 "default during boot. !!\n"
 "\n"
-"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
-"which appears whenever the installer automatically selects a package to\n"
-"resolve a dependency issue. Some packages have relationships between each\n"
-"other such that installation of a package requires that some other program\n"
-"is already installed. The installer can determine which packages are\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each other such\n"
+"that installation of a package requires that some other program is also\n"
+"rerquired to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -1366,7 +914,7 @@ msgstr ""
 "\n"
 "Quando selezionate un pacchetto all'interno dell'albero, ne compare una\n"
 "descrizione sulla destra. Una volta terminata la scelta, cliccate sul\n"
-"pulsante \"Installa\" che provvederц═ a far partire l'installazione vera e\n"
+"pulsante \"%s\" che provvederц═ a far partire l'installazione vera e\n"
 "propria. Il tempo necessario varia in base al numero di pacchetti che\n"
 "devono essere installati e alla velocitц═ del vostro hardware, l'attesa\n"
 "potrebbe anche essere lunga. Una stima del tempo richiesto per finire\n"
@@ -1381,16 +929,15 @@ msgstr ""
 "al momento in cui ц╗ stata rilasciata questa versione della distribuzione,\n"
 "potrebbe accadere che successivamente vengano scoperte delle falle di\n"
 "sicurezza. Se poi non avete proprio idea di quale sia la funzione di uno di\n"
-"questi pacchetti, cliccate sul pulsante \"No\". Cliccando su \"Sц╛\" i\n"
+"questi pacchetti, cliccate sul pulsante \"%s\". Cliccando su \"%s\" i\n"
 "servizi elencati verranno installati e saranno attivati in maniera\n"
 "automatica. !!\n"
 "\n"
-"L'opzione \"Mostra i pacchetti selezionati automaticamente\" vi permette di\n"
-"disabilitare la finestra di dialogo che compare tutte le volte che il\n"
-"programma di installazione seleziona automaticamente uno o piц╧ pacchetti.\n"
-"Il programma determina infatti in modo automatico quali altri pacchetti\n"
-"sono indispensabili a un dato pacchetto (''dipendenze'') perchц╘\n"
-"quest'ultimo possa essere installato con successo.\n"
+"L'opzione \"%s\" vi permette di disabilitare la finestra di dialogo che\n"
+"compare tutte le volte che il programma di installazione seleziona\n"
+"automaticamente uno o piц╧ pacchetti. Il programma determina infatti in modo\n"
+"automatico quali altri pacchetti sono indispensabili a un dato pacchetto\n"
+"(''dipendenze'') perchц╘ quest'ultimo possa essere installato con successo.\n"
 "\n"
 "Il piccolo dischetto floppy in fondo alla lista vi permette di caricare una\n"
 "lista di pacchetti scelti durante una precedente installazione. Cliccando\n"
@@ -1402,95 +949,6 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
-"partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
-"\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
-"\n"
-"Click on \"Next ->\" when you are ready to format partitions.\n"
-"\n"
-"Click on \"<- Previous\" if you want to choose another partition for your\n"
-"new Mandrake Linux operating system installation.\n"
-"\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
-msgstr ""
-"Qualsiasi partizione appena definita deve essere formattata prima di poter\n"
-"essere usata (formattare significa creare un filesystem).\n"
-"\n"
-"Potreste anche voler riformattare alcune partizioni preesistenti, per\n"
-"cancellare i dati che contengono. Se desiderate farlo, scegliete qui le\n"
-"partizioni che intendete formattare.\n"
-"\n"
-"Tenete presente che non ц╗ necessario riformattare tutte le partizioni\n"
-"preesistenti. La formattazione ц╗ necessaria per le partizioni che\n"
-"contengono il sistema operativo (come \"/\", \"/usr\" o \"/var\"), ma\n"
-"potete evitare di riformattare quelle che contengono dati che desiderate\n"
-"conservare (tipicamente \"/home\").\n"
-"\n"
-"Fate molta attenzione nella scelta delle partizioni, dopo la formattazione\n"
-"tutti i dati saranno cancellati e non potrete recuperarli.\n"
-"\n"
-"Cliccate su \"Ok\" quando siete pronti a formattare le partizioni.\n"
-"\n"
-"Cliccate su \"Annulla\" se desiderate scegliere altre partizioni sulle\n"
-"quali installare il vostro nuovo sistema operativo Mandrake Linux.\n"
-"\n"
-"Cliccate su \"Avanzato\" se desiderate che le partizioni selezionate\n"
-"vengano controllate per accertare la presenza di eventuali blocchi\n"
-"danneggiati."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"Depending on the default language you chose in Section , DrakX will\n"
-"automatically select a particular type of keyboard configuration. However,\n"
-"you might not have a keyboard that corresponds exactly to your language:\n"
-"for example, if you are an English speaking Swiss person, you may have a\n"
-"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
-"find yourself in the same situation where your native language and keyboard\n"
-"do not match. In either case, this installation step will allow you to\n"
-"select an appropriate keyboard from a list.\n"
-"\n"
-"Click on the \"More \" button to be presented with the complete list of\n"
-"supported keyboards.\n"
-"\n"
-"If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
-"keyboard between the Latin and non-Latin layouts."
-msgstr ""
-"Normalmente DrakX provvede a individuare automaticamente la tastiera\n"
-"corretta (in base alla lingua che avete scelto). Tuttavia, potreste avere\n"
-"una tastiera che non corrisponde esattamente alla vostra lingua: se siete\n"
-"un francese che parla italiano, ad esempio, potreste comunque preferire una\n"
-"tastiera francese. Oppure, se parlate italiano ma vivete nel Quц╘bec,\n"
-"potreste trovarvi nella stessa situazione. In entrambi i casi, dovrete\n"
-"tornare a questa fase dell'installazione e selezionare una tastiera\n"
-"appropriata dalla lista.\n"
-"\n"
-"Cliccate sul pulsante \"Avanzato\" per vedere una lista completa delle\n"
-"tastiere supportate.\n"
-"\n"
-"Se scegliete una mappa di tastiera basata su di un alfabeto non latino,\n"
-"nella finestra di dialogo successiva vi verrц═ chiesto di scegliere una\n"
-"scorciatoia da tastiera che vi permetterц═ in seguito di passare dalla mappa\n"
-"latina a quella non latina e viceversa."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
 "LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. DrakX will analyze the disk boot sector and act according to\n"
 "what it finds there:\n"
@@ -1503,115 +961,21 @@ msgid ""
 "one.\n"
 "\n"
 "If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader.\n"
-"\n"
-"\"Boot device\": in most cases, you will not change the default (\"First\n"
-"sector of drive (MBR)\"), but if you prefer, the bootloader can be\n"
-"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
-"(\"On Floppy\").\n"
-"\n"
-"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
-"handy.\n"
-"\n"
-"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
-"booting the CD-ROM, pressing the >> F1<< key at boot and typing >>rescue<<\n"
-"at the prompt. If your computer cannot boot from the CD-ROM, there are at\n"
-"least two situations where having a boot floppy is critical:\n"
-"\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows on\n"
-"your system). If at some point you need to reinstall Windows, the Microsoft\n"
-"install process will rewrite the boot sector and remove your ability to\n"
-"start GNU/Linux!\n"
-"\n"
-" * if a problem arises and you cannot start GNU/Linux from the hard disk,\n"
-"this floppy will be the only means of starting up GNU/Linux. It contains a\n"
-"fair number of system tools for restoring a system that has crashed due to\n"
-"a power failure, an unfortunate typing error, a forgotten root password, or\n"
-"any other reason.\n"
-"\n"
-"If you say \"Yes\", you will be asked to insert a disk in the drive. The\n"
-"floppy disk must be blank or have non-critical data on it - DrakX will\n"
-"format the floppy and will rewrite the whole disk."
-msgstr ""
-"Dovete adesso indicare dove volete che vengano collocate le informazioni\n"
-"necessarie per effettuare il boot con GNU/Linux.\n"
-"\n"
-"A meno che non sappiate esattamente quello che state facendo, scegliete\n"
-"\"Primo settore del disco rigido (MBR)\"."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
-msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"Next ->\" to reboot the system. The first thing\n"
-"you should see after your computer has finished doing its hardware tests is\n"
-"the bootloader menu, giving you the choice of which operating system to\n"
-"start.\n"
-"\n"
-"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
-"\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"that will automatically perform a whole installation without the help of an\n"
-"operator, similar to the installation you just configured.\n"
-"\n"
-"   Note that two different options are available after clicking the button:\n"
-"\n"
-"    * \"Replay\". This is a partially automated installation. The\n"
-"partitioning step is the only interactive procedure.\n"
-"\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
-"\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
-"\n"
-" * \"Save packages selection\"(*): saves a list of the package selected in\n"
-"this installation. To use this selection with another installation, insert\n"
-"the floppy and start the installation. At the prompt, press the [F1] key\n"
-"and type >>linux defcfg=\"floppy\" <<.\n"
-"\n"
-"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
-"\"mformat a:\")"
+"bootloader."
 msgstr ""
-"Ecco fatto: l'installazione ц╗ terminata, e il vostro sistema GNU/Linux ц╗\n"
-"pronto per essere usato. Dovete soltanto cliccare sul pulsante \"OK\" per\n"
-"riavviare il sistema. Potete lanciare GNU/Linux o Windows (se presente),\n"
-"qualunque preferiate dei due, non appena il computer avrц═ terminato di\n"
-"effettuare il boot.\n"
-"\n"
-"Cliccando sul pulsante \"Avanzato\" (solo in modalitц═ Esperto) avrete altri\n"
-"due pulsanti a vostra disposizione:\n"
-"\n"
-" * \"Crea il floppy di installazione automatica\": per creare un floppy di\n"
-"installazione che permette di eseguire automaticamente un' installazione\n"
-"completa, del tutto simile a quella che avete appena finito di configurare,\n"
-"senza che sia necessario l'intervento di un operatore.\n"
-"\n"
-"   Notate che, dopo aver cliccato sul pulsante, saranno disponibili due\n"
-"opzioni diverse:\n"
-"\n"
-"    * \"Ripeti\": questa ц╗ un'installazione automatizzata solo in parte, in\n"
-"quanto la fase di partizionamento del disco (e solo quella) resta\n"
-"interattiva.\n"
-"\n"
-"    * \"Automatizzata\": l'installazione ц╗ completamente automatizzata: il\n"
-"disco rigido viene riscritto per intero, tutti tutti i dati che contiene\n"
-"andranno persi.\n"
+"LILO e grub sono due ''bootloader'' per GNU/Linux. Un bootloader ц╗ un\n"
+"programma per l'avvio di uno o piц╧ sistemi operativi. Questa fase, in\n"
+"genere, ц╗ del tutto automatica. DrakX, infatti, analizza il settore di boot\n"
+"del disco, e si comporta in base a quello che vi trova:\n"
 "\n"
-"   Questa caratteristica ц╗ molto utile quando si deve installare il sistema\n"
-"su un gran numero di macchine dalle caratteristiche simili. Si veda la\n"
-"sezione Installazione automatica sul nostro sito web.\n"
+" * se trova un settore di boot di Windows, lo rimpiazza con uno di grub o\n"
+"LILO, in modo da permettervi di avviare GNU/Linux o un altro OS;\n"
 "\n"
-" * \"Salva scelta pacchetti\" (*): salva la selezione dei pacchetti\n"
-"effettuata in precedenza. Al momento di effettuare un'altra installazione,\n"
-"potrete inserire il dischetto nel lettore e installare il sistema\n"
-"richiamando la schermata di aiuto (premendo [F1]) e digitando >>linux\n"
-"defcfg=\"floppy\"<<.\n"
+" * se trova un settore di boot di grub o LILO, lo sostituisce con uno\n"
+"nuovo.\n"
 "\n"
-"(*) Sarц═ necessario un dischetto formattato con il filesystem FAT: per\n"
-"crearne uno sotto GNU/Linux digitate \"mformat a:\""
+"Se DrakX incontra problemi nel decidere dove scrivere il settore di boot,\n"
+"vi chiederц═ di fare una scelta."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
@@ -1620,13 +984,8 @@ msgid ""
 "also scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
-"Because hardware detection is not foolproof, DrakX will ask you if you have\n"
-"a PCI SCSI installed. Clicking \" Yes\" will display a list of SCSI cards\n"
-"to choose from. Click \"No\" if you know that you have no SCSI hardware in\n"
-"your machine. If you're not sure, you can check the list of hardware\n"
-"detected in your machine by selecting \"See hardware info \" and clicking\n"
-"the \"Next ->\". Examine the list of hardware and then click on the \"Next\n"
-"->\" button to return to the SCSI interface question.\n"
+"Because hardware detection is not foolproof, DrakX may fail in detecting\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1644,17 +1003,9 @@ msgstr ""
 "verrц═ individuato un dispositivo di questo tipo, DrakX installerц═\n"
 "automaticamente il driver appropriato.\n"
 "\n"
-"Dato che il riconoscimento automatico in alcuni casi potrebbe non riuscire\n"
-"a individuare una particolare periferica, vi verrц═ comunque chiesto se\n"
-"avete una scheda SCSI PCI diversa da quelle eventualmente identificate.\n"
-"Scegliete \"Sц╛\" se siete sicuri che nel vostro computer ц╗ presente\n"
-"un'altra scheda SCSI, quindi indicate nella lista il modello installato.\n"
-"Scegliete invece \"No\" se non disponete di nessun tipo di hardware SCSI, o\n"
-"se siete soddisfatti del riconoscimento automatico. Se non siete sicuri\n"
-"potete anche controllare la lista dell'hardware rilevato nella vostra\n"
-"macchina selezionando \"Vedi informazioni hardware\" e cliccando su \"Ok\".\n"
-"Controllate l'elenco dell'hardware individuato, quindi cliccate sul\n"
-"pulsante \"Ok\" per ritornare alla domanda relativa alla scheda SCSI.\n"
+"Dato che il riconoscimento automatico non ц╗ un'operazione a prova d'errore,\n"
+"DrakX potrebbe non riuscire a individuare i vostri dischi rigidi. In tal\n"
+"caso dovrete inserire manualmente i dati relativi al vostro hardware.\n"
 "\n"
 "Nel caso siate costretti a specificare manualmente il tipo di scheda in\n"
 "vostro possesso, DrakX vi chiederц═ se intendete indicare il valore di\n"
@@ -1680,8 +1031,8 @@ msgid ""
 " * Label: this is the name you will have to type at the yaboot prompt to\n"
 "select this boot option.\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
 "\n"
 " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
@@ -1715,57 +1066,828 @@ msgid ""
 "selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
 "highlighted with a ``*'' if you press [Tab] to see the boot selections."
 msgstr ""
-"You can add additional entries for yaboot, either for other operating\n"
-"systems, alternate kernels, or for an emergency boot image.\n"
+"You can add additional entries in yaboot for other operating systems,\n"
+"alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OS's, the entry consists only of a label and the root partition.\n"
+"For other OSs, the entry consists only of a label and the \"root\"\n"
+"partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
 "\n"
-" * Label: this is simply the name you will have to type at the yaboot\n"
-"prompt to select this boot option.\n"
+" * Label: this is the name you will have to type at the yaboot prompt to\n"
+"select this boot option.\n"
 "\n"
 " * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
 "or a variation of vmlinux with an extension.\n"
 "\n"
-" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
+" * Root: the \"root\" device or ''/'' for your Linux installation.\n"
 "\n"
-" * Append: on Apple hardware, the kernel append option is used quite often\n"
-"to assist in initializing video hardware, or to enable keyboard mouse\n"
-"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
-"Apple mouse. The following are some examples:\n"
+" * Append: on Apple hardware, the kernel append option is often used to\n"
+"assist in initializing video hardware, or to enable keyboard mouse button\n"
+"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
+"The following are some examples:\n"
 "\n"
 "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
 "hda=autotune\n"
 "\n"
 "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-" * Initrd: this option can be used either to load initial modules, before\n"
+" * Initrd: this option can be used either to load initial modules before\n"
 "the boot device is available, or to load a ramdisk image for an emergency\n"
 "boot situation.\n"
 "\n"
-" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
-"need to allocate a large ramdisk, this option can be used.\n"
+" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
+"need to allocate a large ramdisk, this option can be used to specify a\n"
+"ramdisk larger than the default.\n"
 "\n"
-" * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes \"live\".\n"
-"Here, you can override this option.\n"
+" * Read-write: normally the \"root\" partition is initially mounted as\n"
+"read-only, to allow a file system check before the system becomes ''live''.\n"
+"You can override the default with this option.\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in \"novideo\" mode, with\n"
+"problematic, you can select this option to boot in ''novideo'' mode, with\n"
 "native frame buffer support.\n"
 "\n"
 " * Default: selects this entry as being the default Linux selection,\n"
-"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
-"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
-"selections."
+"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
+"highlighted with a ''*'' if you press [Tab] to see the boot selections."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Your choice of preferred language will affect the language of the\n"
+"documentation, the installer and the system in general. Select first the\n"
+"region you are located in, and then the language you speak.\n"
+"\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
+"\n"
+"Note that you're not limited to choosing a single additional language. You\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will be installed. Additionally, the\n"
+"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
+"however that this is an experimental feature. If you select different\n"
+"languages requiring different encoding the unicode support will be\n"
+"installed anyway.\n"
+"\n"
+"To switch between the various languages installed on the system, you can\n"
+"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
+"language used by the entire system. Running the command as a regular user\n"
+"will only change the language settings for that particular user."
+msgstr ""
+"Il primo passo ц╗ scegliere la lingua che preferite.\n"
+"\n"
+"La lingua che sceglierete a questo punto verrц═ utilizzata per il resto\n"
+"dell'installazione e sarц═ la lingua del sistema e della documentazione. Per\n"
+"prima cosa selezionate l'area geografica in cui vivete, poi la lingua che\n"
+"parlate.\n"
+"\n"
+"Cliccando sul pulsante \"%s\" potrete scegliere altre lingue da installare\n"
+"sul vostro computer. La selezione di altre lingue comporta l'installazione\n"
+"dei file relativi alla documentazione e alle applicazioni per ciascuna di\n"
+"esse. Ad esempio, se il vostro computer dovrц═ essere usato anche da persone\n"
+"di madre lingua spagnola, potete scegliere l'italiano come lingua\n"
+"principale nella struttura ad albero e, nella sezione \"%s\", selezionare\n"
+"anche \"%s\".\n"
+"\n"
+"ц┬ interessante notare che non dovete necessariamente limitarvi a un'unica\n"
+"lingua supplementare: potete installare i file per piц╧ lingue, e persino\n"
+"installarle tutte grazie all'opzione \"%s\". L'opzione \"%s\", inoltre,\n"
+"obbliga il sistema a utilizzare il sistema Unicode (UTF-8). Si noti,\n"
+"tuttavia, che questa ц╗ ancora una caratteristica sperimentale. In ogni\n"
+"caso, se selezionate lingue che richiedono tipi differenti di codifica, il\n"
+"supporto per Unicode verrц═ comunque installato.\n"
+"\n"
+"Per passare da una lingua all'altra potete utilizzare il comando\n"
+"\"/usr/sbin/localedrake\": come \"root\" per cambiare la lingua utilizzata\n"
+"in tutto il sistema, o come utente normale per cambiare solamente la lingua\n"
+"usata da quell'utente."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
+msgstr ""
+"\"%s\": se sul vostro sistema ц╗ stata individuata una scheda audio, verrц═\n"
+"mostrata qui. Se notate che la scheda audio mostrata qui non ц╗ quella\n"
+"effettivamente presente sul vostro sistema, potete cliccare sul pulsante e\n"
+"scegliere il driver appropriato."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"After you have configured the general bootloader parameters, the list of\n"
+"boot options that will be available at boot time will be displayed.\n"
+"\n"
+"If there are other operating systems installed on your machine they will\n"
+"automatically be added to the boot menu. You can fine-tune the existing\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
+"\n"
+"You may also not want to give access to these other operating systems to\n"
+"anyone who goes to the console and reboots the machine. You can delete the\n"
+"corresponding entries for the operating systems to remove them from the\n"
+"bootloader menu, but you will need a boot disk in order to boot those other\n"
+"operating systems!"
+msgstr ""
+"Dopo aver configurato i parametri generali del bootloader, verrц═ mostrata\n"
+"la lista delle opzioni che saranno disponibili al momento dell'avvio del\n"
+"sistema.\n"
+"\n"
+"Se sulla vostra macchina ц╗ installato un altro sistema operativo, verrц═\n"
+"automaticamente aggiunto al menu di avvio. Qui potete scegliere una\n"
+"configurazione piц╧ precisa delle opzioni disponibili: cliccate su una delle\n"
+"voci e poi su \"%s\" per modificarla o rimuoverla; \"%s\" crea una nuova\n"
+"voce; cliccando su \"%s\" passerete alla fase successiva.\n"
+"\n"
+"Potreste anche non voler dare l'accesso a questi sistemi operativi a\n"
+"chiunque potrebbe riavviare la macchina. Se questo ц╗ il caso, potete\n"
+"cancellare le voci corrispondenti ai sistemi operativi che desiderate\n"
+"rimuovere dal menu del bootloader, ma cosц╛ facendo, per caricarli, avrete\n"
+"bisogno di un boot disk!"
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Choose the hard drive you want to erase in order to install your new\n"
+"Mandrake Linux partition. Be careful, all data present on this partition\n"
+"will be lost and will not be recoverable!"
+msgstr ""
+"Scegliete il disco rigido che volete cancellare per poter installare la\n"
+"nuova partizione per Mandrake Linux. Attenzione! tutti i dati presenti\n"
+"andranno perduti e non saranno piц╧ recuperabili!"
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
+msgstr ""
+"\"%s\": cliccando sul pulsante \"%s\" verrц═ lanciato l'assistente di\n"
+"configurazione della stampante. Consultate il relativo capitolo della\n"
+"''Guida introduttiva'' per avere maggiori informazioni su come configurare\n"
+"una nuova stampante. L'interfaccia descritta in tale sede ц╗ simile a quella\n"
+"utilizzata nel corso dell'installazione."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
+msgstr ""
+"Options\n"
+"\n"
+"   Qui potete scegliere di avviare automaticamente l'interfaccia grafica\n"
+"subito dopo il boot. Ovviamente ц╗ opportuno rispondere \"%s\" nel caso in\n"
+"cui la vostra macchina svolga le funzioni di server, oppure se non siete\n"
+"riuscite a configurare il server grafico."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Please select the correct port. For example, the \"COM1\" port under\n"
+"Windows is named \"ttyS0\" under GNU/Linux."
+msgstr ""
+"Scegliete la porta appropriata. La porta \"COM1\" sotto Windows, ad\n"
+"esempio, ц╗ chiamata \"ttyS0\" sotto GNU/Linux."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"At this point, DrakX will allow you to choose the security level desired\n"
+"for the machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine will contain crucial data, or if it will be a machine\n"
+"directly exposed to the Internet. The trade-off of a higher security level\n"
+"is generally obtained at the expense of ease of use.\n"
+"\n"
+"If you do not know what to choose, stay with the default option."
+msgstr ""
+"Ora ц╗ il momento di scegliere il livello di sicurezza desiderato per il\n"
+"vostro sistema. Come regola generale, quanto piц╧ la macchina ц╗ esposta a\n"
+"Internet e quanto piц╧ sono importanti i dati che contiene, tanto piц╧ alto\n"
+"dovrebbe essere il livello di sicurezza. Tenete presente, tuttavia, che un\n"
+"livello di sicurezza molto alto in genere viene ottenuto a spese della\n"
+"facilitц═ d'uso.\n"
+"\n"
+"Se non sapete cosa scegliere, mantenete l'opzione predefinita."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
+"\n"
+" * \"%s\": check the current keyboard map configuration and change that if\n"
+"necessary.\n"
+"\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
+"\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
+"\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
+"\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
+"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
+"Guide'' for more information on how to setup a new printer. The interface\n"
+"presented there is similar to the one used during installation.\n"
+"\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
+"another driver.\n"
+"\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
+"\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
+"\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
+"\n"
+" * \"%s\": If you want to configure your Internet or local network access\n"
+"now.\n"
+"\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
+"\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
+"\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
+"\n"
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
+msgstr ""
+"A questo punto DrakX vi mostrerц═ un riassunto di varie informazioni che ha\n"
+"raccolto riguardo il vostro sistema. In base all'hardware installato,\n"
+"potrebbero essere visualizzate solo alcune o tutte le voci che descriveremo\n"
+"tra poco. Ogni entrata consiste dell'elemento che puц╡ essere configurato,\n"
+"con accanto una breve sintesi della configurazione attuale. Cliccate sul\n"
+"pulsante \"%s\" corrispondente per cambiarla.\n"
+"\n"
+" * \"%s\": controllate l'attuale impostazione della tastiera, e cambiatela\n"
+"se necessario.\n"
+"\n"
+" * \"%s\": controllate la selezione attuale della nazione. Se non\n"
+"corrisponde a quella in cui vivete, cliccate sul pulsante \"%s\" e indicate\n"
+"quella corretta. Se la vostra nazione non ц╗ nella prima lista che verrц═\n"
+"mostrata, cliccate su \"%s\" per avere la lista completa.\n"
+"\n"
+" * \"%s\": il fuso orario ц╗ dedotto dalla lingua che avete scelto. Ma anche\n"
+"in questo caso, come per la tastiera, potreste non trovarvi nella nazione\n"
+"cui corrisponde la lingua che avete scelto; in tal caso sarц═ potete\n"
+"cliccare su \"%s\" per configurare il fuso orario in base a quello\n"
+"dell'area geografica in cui vivete.\n"
+"\n"
+" * \"%s\": controllate la configurazione attuale del mouse, e cliccate sul\n"
+"pulsante per cambiarla, se necessario.\n"
+"\n"
+" * \"%s\": cliccando sul pulsante \"%s\" verrц═ lanciato l'assistente di\n"
+"configurazione della stampante. Consultate il relativo capitolo della\n"
+"''Guida introduttiva'' per avere maggiori informazioni su come configurare\n"
+"una nuova stampante. L'interfaccia descritta in tale sede ц╗ simile a quella\n"
+"utilizzata nel corso dell'installazione.\n"
+"\n"
+" * \"%s\": se sul vostro sistema ц╗ stata individuata una scheda audio,\n"
+"verrц═ mostrata qui. Se notate che la scheda audio mostrata qui non ц╗ quella\n"
+"effettivamente presente sul vostro sistema, potete cliccare sul pulsante e\n"
+"scegliere il driver appropriato.\n"
+"\n"
+" * \"%s\": come opzione predefinita, DrakX configura la vostra interfaccia\n"
+"grafica impostando una risoluzione di \"800x600\" o \"1024x768\". Se questa\n"
+"scelta non vi soddisfa, cliccate su \"%s\" per riconfigurare la vostra\n"
+"interfaccia grafica.\n"
+"\n"
+" * \"%s\": se sul vostro sistema ц╗ stata individuata una scheda TV, verrц═\n"
+"mostrata qui. Se disponete di una scheda TV che non ц╗ stata individuata,\n"
+"cliccate sul pulsante per cercare di configurarla a mano.\n"
+"\n"
+" * \"%s\": se sul vostro sistema ц╗ stata individuata una scheda ISDN, verrц═\n"
+"mostrata qui. Potete cliccare sul pulsante \"%s\" per cambiarne i\n"
+"parametri.\n"
+"\n"
+" * \"%s\": nel caso desideriate configurare adesso l'accesso a Internet o a\n"
+"una rete locale.\n"
+"\n"
+" * \"%s\": questa voce vi permette di ridefinire il livello di sicurezza\n"
+"configurato nel passo precedente ().\n"
+"\n"
+" * \"%s\": se avete in mente di connettere il vostro computer a Internet, ц╗\n"
+"una buona idea proteggerlo contro eventuali intrusioni configurando un\n"
+"firewall. Consultate la relativa sezione della ''Guida introduttiva'' per\n"
+"saperne di piц╧ riguardo la configurazione di un firewall.\n"
+"\n"
+" * \"%s\": cliccate sul pulsante relativo per cambiare la configurazione\n"
+"del bootloader. Questa opzione dovrebbe essere utilizzata dagli utenti piц╧\n"
+"esperti.\n"
+"\n"
+" * \"%s\": qui potrete stabilire in dettaglio quali servizi verranno\n"
+"eseguiti sul vostro sistema. Se pensate di utilizzare questa macchina come\n"
+"server ц╗ senz'altro una buona idea controllare le impostazioni dei servizi."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
+msgstr ""
+"Se per la vostra scheda ц╗ disponibile piц╧ di un server grafico, con o senza\n"
+"accelerazione 3D, vi verrц═ chiesto di scegliere il server che meglio si\n"
+"adatta ai vostri bisogni."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Usually, DrakX has no problems detecting the number of buttons on your\n"
+"mouse. If it does, it assumes you have a two-button mouse and will\n"
+"configure it for third-button emulation. The third-button mouse button of a\n"
+"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"right mouse buttons. DrakX will automatically know whether your mouse uses\n"
+"a PS/2, serial or USB interface.\n"
+"\n"
+"If for some reason you wish to specify a different type of mouse, select it\n"
+"from the list provided.\n"
+"\n"
+"If you choose a mouse other than the default, a test screen will be\n"
+"displayed. Use the buttons and wheel to verify that the settings are\n"
+"correct and that the mouse is working correctly. If the mouse is not\n"
+"working well, press the space bar or [Return] key to cancel the test and to\n"
+"go back to the list of choices.\n"
+"\n"
+"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"select your mouse from a list. Be sure to select the one corresponding to\n"
+"the port that your mouse is attached to. After selecting a mouse and\n"
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
+msgstr ""
+"In genere DrakX individua automaticamente il numero di pulsanti presenti\n"
+"sul vostro mouse, in caso contrario conclude che il vostro ц╗ un mouse a due\n"
+"tasti e lo imposta in modo da emulare il terzo tasto. DrakX, inoltre,\n"
+"riconosce automaticamente se si tratta di un mouse PS/2, seriale o USB.\n"
+"\n"
+"Se volete specificare un diverso tipo di mouse, scegliete il vostro modello\n"
+"dall'elenco che vi viene proposto.\n"
+"\n"
+"Se scegliete un mouse diverso dal tipo suggerito vi verrц═ mostrata una\n"
+"finestra dove potrete provarlo. Provate sia i pulsanti che l'eventuale\n"
+"rotellina per controllare che la configurazione sia corretta. Se il mouse\n"
+"non funziona correttamente, premete la barra spaziatrice o il tasto [Invio]\n"
+"per uscire dal test e tornare alla lista dei mouse.\n"
+"\n"
+"Talvolta i mouse con rotellina centrale potrebbero non essere individuati\n"
+"automaticamente. In tal caso, dovrete selezionarli personalmente usando la\n"
+"lista. Assicuratevi di indicare correttamente la porta alla quale il mouse\n"
+"ц╗ collegato. Premete il pulsante \"%s\", e comparirц═ l'immagine di un\n"
+"mouse. Fate scorrere la rotellina per attivarla correttamente, quindi\n"
+"provate i pulsanti e spostate il mouse in modo da accertarvi che tutto sia\n"
+"a posto."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"You will now set up your Internet/network connection. If you wish to\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\n"
+"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
+"configure the network, or to do it later, in which case clicking the \"%s\"\n"
+"button will take you to the next step.\n"
+"\n"
+"When configuring your network, the available connections options are:\n"
+"traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
+"simple LAN connection (Ethernet).\n"
+"\n"
+"We will not detail each configuration option - just make sure that you have\n"
+"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
+"from your Internet Service Provider or system administrator.\n"
+"\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
+"installed and use the program described there to configure your connection."
+msgstr ""
+"A questo punto potete configurare la vostra connessione di rete. Se\n"
+"desiderate connettere il vostro computer a Internet o a una rete locale,\n"
+"cliccate su \"%s\". Mandrake Linux cercherц═ di individuare automaticamente\n"
+"dispositivi di rete e modem (accendete eventuali periferiche esterne prima\n"
+"di continuare). Se questa ricerca fallisce, levate il segno di spunta dalla\n"
+"casella \"%s\". Potete anche decidere di non configurare la rete, o di\n"
+"farlo in seguito, nel qual caso cliccando sul pulsante \"%s\" passerete\n"
+"alla fase successiva.\n"
+"\n"
+"Le connessioni disponibili sono: modem tradizionale, modem ISDN,\n"
+"connessione ADSL, cable modem, e infine una semplice connessione a una LAN\n"
+"(Ethernet).\n"
+"\n"
+"Non possiamo descrivere in dettaglio le caratteristiche di ogni\n"
+"configurazione. In ogni caso, accertatevi di avere a portata di mano tutti\n"
+"i parametri indicati dal vostro fornitore di servizi Internet o dal vostro\n"
+"amministratore di sistema.\n"
+"\n"
+"Per maggiori dettagli riguardo la configurazione della connessione a\n"
+"Internet potete consultare il relativo capitolo della ''Guida\n"
+"introduttiva''; in alternativa, potete attendere di aver portato a termine\n"
+"l'installazione e usare poi il programma descritto in tale capitolo per\n"
+"configurare la connessione."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Before continuing, you should carefully read the terms of the license. It\n"
+"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"terms in it, check the \"%s\" box. If not, simply turn off your computer."
+msgstr ""
+"Prima di proseguire dovreste leggere con attenzione le condizioni d'uso che\n"
+"riguardano l'intera distribuzione Mandrake Linux. Se siete d'accordo con\n"
+"tutti i termini della licenza cliccate sul pulsante \"%s\". In caso\n"
+"contrario, semplicemente spegnere il computer per interrompere\n"
+"l'installazione."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Graphic Card\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose from this list the card you actually have installed.\n"
+"\n"
+"   In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
+msgstr ""
+"Scheda Grafica\n"
+"\n"
+"   Il programma di installazione normalmente ц╗ perfettamente in grado di\n"
+"identificare e configurare automaticamente la scheda grafica installata sul\n"
+"vostro computer. In caso contrario, potete scegliere in questa lista la\n"
+"scheda di cui disponete.\n"
+"\n"
+"   Se per la vostra scheda ц╗ disponibile piц╧ di un server grafico, con o\n"
+"senza accelerazione 3D, vi verrц═ chiesto di scegliere il server che meglio\n"
+"si adatta ai vostri bisogni."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"This dialog is used to choose which services you wish to start at boot\n"
+"time.\n"
+"\n"
+"DrakX will list all the services available on the current installation.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
+"\n"
+"A short explanatory text will be displayed about a service when it is\n"
+"selected. However, if you are not sure whether a service is useful or not,\n"
+"it is safer to leave the default behavior.\n"
+"\n"
+"!! At this stage, be very careful if you intend to use your machine as a\n"
+"server: you will probably not want to start any services that you do not\n"
+"need. Please remember that several services can be dangerous if they are\n"
+"enabled on a server. In general, select only the services you really need.\n"
+"!!"
+msgstr ""
+"A questo punto potete scegliere i servizi da lanciare automaticamente\n"
+"all'avvio del sistema.\n"
+"\n"
+"DrakX elencherц═ tutti i servizi disponibili con l'installazione attuale.\n"
+"Esaminateli attentamente e disabilitate quelli che non sono sempre\n"
+"necessari all'avvio.\n"
+"\n"
+"Selezionando un servizio comparirц═ un breve testo di aiuto che ne spiega le\n"
+"caratteristiche. Se non siete realmente sicuri dell'utilitц═ o meno di un\n"
+"servizio, ц╗ piц╧ prudente non modificare le impostazioni predefinite.\n"
+"\n"
+"!! In questa fase dell'installazione dovete fare le vostre scelte con\n"
+"particolare attenzione nel caso intendiate usare il vostro computer come\n"
+"server: probabilmente non volete che siano abilitati servizi di cui non\n"
+"avete bisogno. Ricordate che numerosi servizi sono potenzialmente\n"
+"pericolosi se attivi su un server. Come regola generale, selezionate\n"
+"soltanto quelli di cui avete effettivamente bisogno. !!"
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Monitor\n"
+"\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
+msgstr ""
+"Monitor\n"
+"\n"
+"   Il programma di installazione provvede anche a identificare e\n"
+"configurare automaticamente il monitor connesso al vostro computer. Se cosц╛\n"
+"non fosse, anche in questo caso potete scegliere da una lista il tipo di\n"
+"monitor in vostro possesso."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
+"local time according to the time zone you selected. If the clock on your\n"
+"motherboard is set to local time, you may deactivate this by unselecting\n"
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same timezone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can used by\n"
+"other machines on your local network as well."
+msgstr ""
+"GNU/Linux gestisce il tempo in base al GMT (''Greenwich Mean Time'') e lo\n"
+"traduce nell'ora locale secondo il fuso orario selezionato. Tuttavia ц╗\n"
+"possibile disabilitare questa opzione togliendo il segno di spunta alla\n"
+"casella \"%s\", in modo che l'orologio hardware coincida con quello di\n"
+"sistema. Questa scelta puц╡ tornare utile nel caso sulla macchina sia\n"
+"installato un altro sistema operativo, ad esempio Windows.\n"
+"\n"
+"L'opzione \"%s\" provvederц═ a gestire l'ora grazie alla connessione via\n"
+"Internet con un server di orario remoto. Scegliete un server vicino a voi\n"
+"nella lista che vi verrц═ mostrata. Perchц╘ questa opzione funzioni,\n"
+"naturalmente, dovete disporre di una connessione a Internet funzionante.\n"
+"Sulla vostra macchina verrц═ installato un server del tempo che potrц═ essere\n"
+"usato anche per altre macchine che si trovano sulla vostra rete locale."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, since they are good for most\n"
+"common installations. If you make any changes, you must at least define a\n"
+"root partition (\"/\"). Do not choose too small a partition or you will not\n"
+"be able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
+"(only possible if you have more than one Linux partition available).\n"
+"\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
+"\n"
+"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
+"\n"
+"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\n"
+"\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard drives:\n"
+"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+"\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
+msgstr ""
+"In alto potete vedere l'elenco delle partizioni Linux individuate sul\n"
+"vostro disco rigido. Potete attenervi alle scelte fatte dall'assistente,\n"
+"vanno bene per la maggior parte delle installazioni. Se fate dei\n"
+"cambiamenti, ricordate che dovete definire per lo meno una partizione root\n"
+"(''radice'') (\"/\"). Non sceglietela troppo piccola, altrimenti non sarete\n"
+"in grado di installare parte del software. Se poi volete archiviare i\n"
+"vostri dati su una partizione separata, dovrete assegnare una partizione\n"
+"anche a \"/home\" (ciц╡ ц╗ possibile soltanto se avete a disposizione piц╧\n"
+"partizioni Linux).\n"
+"\n"
+"Ogni partizione ц╗ elencata in base a queste caratteristiche: \"Nome\",\n"
+"\"Capacitц═\".\n"
+"\n"
+"Il \"Nome\" ц╗ strutturato in: \"tipo di disco rigido\", \"numero del\n"
+"disco\", \"numero della partizione\" (ad esempio, \"hda1\").\n"
+"\n"
+"Il \"tipo di disco rigido\" ц╗ \"hd\" se il vostro disco ц╗ di tipo IDE, e\n"
+"\"sd\" se, invece, ц╗ un disco SCSI.\n"
+"\n"
+"Il \"numero del disco\" ц╗ sempre una lettera che segue \"hd\" o \"sd\". Per\n"
+"i dischi IDE:\n"
+"\n"
+" * \"a\" significa \"disco rigido master sul controller IDE primario\";\n"
+"\n"
+" * \"b\" significa \"disco rigido slave sul controller IDE primario\";\n"
+"\n"
+" * \"c\" significa \"disco rigido master sul controller IDE secondario\";\n"
+"\n"
+" * \"d\" significa \"disco rigido slave sul controller IDE secondario\".\n"
+"\n"
+"Per i dischi rigidi di tipo SCSI, invece, una \"a\" significa \"ID SCSI piц╧\n"
+"basso\", una \"b\" significa \"ID SCSI immediatamente successivo ad a\",\n"
+"etc."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
+msgstr ""
+"\"%s\": controllate la selezione attuale della nazione. Se non corrisponde\n"
+"a quella in cui vivete, cliccate sul pulsante \"%s\" e indicate quella\n"
+"corretta. Se la vostra nazione non ц╗ nella prima lista che verrц═ mostrata,\n"
+"cliccate su \"%s\" per avere la lista completa."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
+"\n"
+"At this time, you may wish to reformat some already existing partitions to\n"
+"erase any data they contain. If you wish to do that, please select those\n"
+"partitions as well.\n"
+"\n"
+"Please note that it is not necessary to reformat all pre-existing\n"
+"partitions. You must reformat the partitions containing the operating\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+"reformat partitions containing data that you wish to keep (typically\n"
+"\"/home\").\n"
+"\n"
+"Please be careful when selecting partitions. After formatting, all data on\n"
+"the selected partitions will be deleted and you will not be able to recover\n"
+"it.\n"
+"\n"
+"Click on \"%s\" when you are ready to format partitions.\n"
+"\n"
+"Click on \"%s\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
+"\n"
+"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"bad blocks on the disk."
+msgstr ""
+"Qualsiasi partizione appena definita deve essere formattata prima di poter\n"
+"essere usata (formattare significa creare un filesystem).\n"
+"\n"
+"Potreste anche voler riformattare alcune partizioni preesistenti, per\n"
+"cancellare i dati che contengono. Se desiderate farlo, scegliete qui le\n"
+"partizioni che intendete formattare.\n"
+"\n"
+"Tenete presente che non ц╗ necessario riformattare tutte le partizioni\n"
+"preesistenti. La formattazione ц╗ necessaria per le partizioni che\n"
+"contengono il sistema operativo (come \"/\", \"/usr\" o \"/var\"), ma\n"
+"potete evitare di riformattare quelle che contengono dati che desiderate\n"
+"conservare (tipicamente \"/home\").\n"
+"\n"
+"Fate molta attenzione nella scelta delle partizioni, dopo la formattazione\n"
+"tutti i dati saranno cancellati e non potrete recuperarli.\n"
+"\n"
+"Cliccate su \"%s\" quando siete pronti a formattare le partizioni.\n"
+"\n"
+"Cliccate su \"%s\" se desiderate scegliere altre partizioni sulle quali\n"
+"installare il vostro nuovo sistema operativo Mandrake Linux.\n"
+"\n"
+"Cliccate su \"%s\" se desiderate che le partizioni selezionate vengano\n"
+"controllate per accertare la presenza di eventuali blocchi danneggiati."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"Depending on the default language you chose in Section , DrakX will\n"
+"automatically select a particular type of keyboard configuration. However,\n"
+"you may not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may have a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation where your native language and keyboard do\n"
+"not match. In either case, this installation step will allow you to select\n"
+"an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
+"supported keyboards.\n"
+"\n"
+"If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
+"dialog will allow you to choose the key binding that will switch the\n"
+"keyboard between the Latin and non-Latin layouts."
+msgstr ""
+"Normalmente DrakX provvederц═ a individuare automaticamente la tastiera\n"
+"corretta in base alla lingua che avete scelto. Tuttavia, potreste avere una\n"
+"tastiera che non corrisponde esattamente alla vostra lingua: se siete un\n"
+"francese che parla italiano, ad esempio, potreste comunque preferire una\n"
+"tastiera francese. Oppure, se parlate italiano ma vivete nel Quц╘bec,\n"
+"potreste trovarvi nella stessa situazione. In entrambi i casi, questo passo\n"
+"dell'installazione vi permette di selezionare una tastiera appropriata\n"
+"dalla lista.\n"
+"\n"
+"Cliccate sul pulsante \"%s\" per vedere una lista completa delle tastiere\n"
+"supportate.\n"
+"\n"
+"Se scegliete una mappa di tastiera basata su di un alfabeto non latino,\n"
+"nella finestra di dialogo successiva vi verrц═ chiesto di scegliere una\n"
+"scorciatoia da tastiera che vi permetterц═ in seguito di passare dalla mappa\n"
+"latina a quella non latina e viceversa."
+
+# DO NOT BOTHER TO MODIFY HERE, SEE:
+# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
+msgid ""
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
+"\n"
+"The \"%s\" button shows two more buttons to:\n"
+"\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
+"\n"
+"   Note that two different options are available after clicking the button:\n"
+"\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
+"\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a number of similar machines.\n"
+"See the Auto install section on our web site for more information.\n"
+"\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<.\n"
+"\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+"Ecco fatto: l'installazione ц╗ terminata, e il vostro sistema GNU/Linux ц╗\n"
+"pronto per essere usato. Dovete soltanto cliccare sul pulsante \"%s\" per\n"
+"riavviare il sistema. La prima cosa che vedrete, non appena il computer\n"
+"avrц═ terminato di effettuare i test prima del boot, ц╗ il menu del\n"
+"bootloader, che vi permetterц═ di scegliere il sistema operativo da avviare.\n"
+"\n"
+"Cliccando sul pulsante \"%s\" (solo in modalitц═ Esperto) avrete altri due\n"
+"pulsanti a vostra disposizione:\n"
+"\n"
+" * \"%s\": per creare un floppy di installazione che permette di eseguire\n"
+"automaticamente un' installazione completa, del tutto simile a quella che\n"
+"avete appena finito di configurare, senza che sia necessario l'intervento\n"
+"di un operatore.\n"
+"\n"
+"   Si noti che, dopo aver cliccato sul pulsante, saranno disponibili due\n"
+"opzioni diverse:\n"
+"\n"
+"    * \"%s\": questa ц╗ un'installazione automatizzata solo in parte, in\n"
+"quanto la fase di partizionamento del disco (e solo quella) resta\n"
+"interattiva.\n"
+"\n"
+"    * \"%s\": l'installazione ц╗ completamente automatizzata: il disco\n"
+"rigido viene riscritto per intero, tutti tutti i dati che contiene andranno\n"
+"persi.\n"
+"\n"
+"   Questa caratteristica ц╗ molto utile quando si deve installare il sistema\n"
+"su un gran numero di macchine dalle caratteristiche simili. Si veda la\n"
+"sezione Installazione automatica sul nostro sito web.\n"
+"\n"
+" * \"%s\" (*): salva la selezione dei pacchetti effettuata in precedenza.\n"
+"Al momento di effettuare un'altra installazione, potrete inserire il\n"
+"dischetto nel lettore e installare il sistema richiamando la schermata di\n"
+"aiuto (premendo [F1]) e digitando >>linux defcfg=\"floppy\"<<.\n"
+"\n"
+"(*) Sarц═ necessario un dischetto formattato con il filesystem FAT: per\n"
+"crearne uno sotto GNU/Linux digitate \"mformat a:\""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/it/drakx-chapter.xml
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
-"defined, either from a previous installation of GNU/Linux or from another\n"
+"defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
@@ -1775,43 +1897,40 @@ msgid ""
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
-" * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
 "\n"
-" * \"Auto allocate\": this option enables you to automatically create ext3\n"
-"and swap partitions in free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
 "\n"
-"\"More\": gives access to additional features:\n"
+"\"%s\": gives access to additional features:\n"
 "\n"
-" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery, if necessary. It is strongly\n"
-"recommended that you perform this step.\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows you to restore a previously saved\n"
-"partition table from a floppy disk.\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"doesn't always work.\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and reloads the\n"
-"partition table that was originally on the hard drive.\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
 "\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
-"users to manually mount and unmount removable medias such as floppies and\n"
-"CD-ROMs.\n"
+" * \"%s\": unchecking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good\n"
-"understanding of partitioning.\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+" * \"%s\": use this option to cancel your changes.\n"
 "\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information about the\n"
-"hard drive.\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1851,48 +1970,48 @@ msgstr ""
 "\n"
 "Per partizionare il disco selezionato potete scegliere fra queste opzioni:\n"
 "\n"
-" * \"Cancella tutto\": questa opzione cancella tutte le partizioni presenti\n"
-"sul disco selezionato.\n"
+" * \"%s\": questa opzione cancella tutte le partizioni presenti sul disco\n"
+"selezionato.\n"
 "\n"
-" * \"Alloca automaticamente\": questa opzione vi permette di creare\n"
-"automaticamente partizioni ext3 e di swap nello spazio libero presente sul\n"
-"vostro disco rigido.\n"
+" * \"%s\": questa opzione vi permette di creare automaticamente partizioni\n"
+"ext3 e di swap nello spazio libero presente sul vostro disco rigido.\n"
 "\n"
-"\"Ancora\": permette di accedere ad ulteriori funzionalitц═:\n"
+"\"%s\": permette di accedere ad ulteriori funzionalitц═:\n"
 "\n"
-" * \"Salva tabella delle partizioni\": salva la tabella delle partizioni su\n"
-"un floppy. Utile per recuperarla in un secondo momento, se necessario. Vi\n"
-"raccomandiamo caldamente di effettuare questa operazione.\n"
+" * \"%s\": salva la tabella delle partizioni su un floppy. Utile per\n"
+"recuperarla in un secondo momento, se necessario. Vi raccomandiamo\n"
+"caldamente di effettuare questa operazione.\n"
 "\n"
-" * \"Ripristina tabella delle partizioni\": permette di ripristinare una\n"
-"tabella delle partizioni precedentemente salvata su floppy disk.\n"
+" * \"%s\": permette di ripristinare una tabella delle partizioni\n"
+"precedentemente salvata su floppy disk.\n"
 "\n"
-" * \"Recupera tabella delle partizioni\": se la vostra tabella delle\n"
-"partizioni ц╗ danneggiata potete provare a recuperarla grazie a questa\n"
-"opzione. Procedete con attenzione, e ricordate che potrebbe non avere\n"
-"successo.\n"
+" * \"%s\": se la vostra tabella delle partizioni ц╗ danneggiata potete\n"
+"provare a recuperarla grazie a questa opzione. Procedete con attenzione, e\n"
+"ricordate che potrebbe non avere successo.\n"
 "\n"
-" * \"Ricarica tabella delle partizioni\": annulla tutte le modifiche e\n"
-"ricarica la tabella delle partizioni originaria.\n"
+" * \"%s\": annulla tutte le modifiche e ricarica la tabella delle\n"
+"partizioni originaria.\n"
 "\n"
-" * \"Automounting di media rimovibili\": se disabilitate questa opzione gli\n"
-"utenti saranno costretti a montare e smontare manualmente i filesystem dei\n"
-"dispositivi rimovibili, come lettori floppy e CD-ROM.\n"
+" * \"%s\": se disabilitate questa opzione gli utenti saranno costretti a\n"
+"montare e smontare manualmente i filesystem dei dispositivi rimovibili,\n"
+"come lettori floppy e CD-ROM.\n"
 "\n"
-" * \"Assistente\": usate questa opzione per effettuare il partizionamento\n"
-"del disco con l'aiuto di un assistente. Altamente raccomandata se non avete\n"
-"una buona conoscenza del partizionamento.\n"
+" * \"%s\": usate questa opzione per effettuare il partizionamento del disco\n"
+"con l'aiuto di un assistente. Altamente raccomandata se non avete una buona\n"
+"conoscenza del partizionamento.\n"
 "\n"
-" * \"Un passo indietro\": con questa opzione le modifiche apportate\n"
-"verranno annullate.\n"
+" * \"%s\": con questa opzione le modifiche apportate verranno annullate.\n"
 "\n"
-" * \"Passa a modo Esperto\": permette di effettuare ulteriori azioni sulle\n"
-"partizioni (scelta del tipo, opzioni, formattazione) e offre piц╧\n"
-"informazioni.\n"
+" * \"%s\": permette di effettuare ulteriori azioni sulle partizioni (scelta\n"
+"del tipo, opzioni, formattazione) e offre piц╧ informazioni.\n"
 "\n"
-" * \"Fatto\": quando avrete finito il partizionamento del disco cliccate su\n"
+" * \"%s\": quando avrete finito il partizionamento del disco cliccate su\n"
 "questa opzione, le vostre modifiche verranno salvate sul disco.\n"
 "\n"
+"Quando state specificando le dimensioni di una partizione, potete\n"
+"utilizzare i tasti freccia della tastiera per impostare con precisione i\n"
+"valori desiderati.\n"
+"\n"
 "Si noti che ц╗ possibile raggiungere ogni opzione usando la tastiera. Per\n"
 "spostarvi fra le partizioni usate i tasti [Tab] e le frecce [Sц╧/Giц╧].\n"
 "\n"
diff --git a/perl-install/share/po/help-ru.pot b/perl-install/share/po/help-ru.pot
index a5c0e51b5..060387c99 100644
--- a/perl-install/share/po/help-ru.pot
+++ b/perl-install/share/po/help-ru.pot
@@ -1,3 +1,6 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=KOI8-R\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -18,114 +21,110 @@ msgid ""
 "\n"
 "Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Use free space\": this option will perform an automatic partitioning\n"
-"of your blank drive(s). If you use this option there will be no further\n"
-"prompts.\n"
-"\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated with\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and for the most part it's a good idea to keep them.\n"
-"\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see ``Erase entire disk'' solution)\n"
-"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
-"without the loss of any data, provided you previously defragment the\n"
-"Windows partition and that it uses the FAT format. Backing up your data is\n"
-"strongly recommended.. Using this option is recommended if you want to use\n"
-"both Mandrake Linux and Microsoft Windows on the same computer.\n"
+" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+"drive(s). If you use this option there will be no further prompts.\n"
+"\n"
+" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+"your hard drive. If you want to use them, choose this option. You will then\n"
+"be asked to choose the mount points associated with each of the partitions.\n"
+"The legacy mount points are selected by default, and for the most part it's\n"
+"a good idea to keep them.\n"
+"\n"
+" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+"all the space available on it, you will have to create free space for\n"
+"Linux. To do so, you can delete your Microsoft Windows partition and data\n"
+"(see ``Erase entire disk'' solution) or resize your Microsoft Windows FAT\n"
+"partition. Resizing can be performed without the loss of any data, provided\n"
+"you have previously defragmented the Windows partition and that it uses the\n"
+"FAT format. Backing up your data is strongly recommended.. Using this\n"
+"option is recommended if you want to use both Mandrake Linux and Microsoft\n"
+"Windows on the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
 "then when you started. You will have less free space under Microsoft\n"
 "Windows to store your data or to install new software.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful, because you will not be able to\n"
-"undo your choice after you confirm.\n"
+" * \"%s\": if you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrake Linux system,\n"
+"choose this option. Be careful, because you will not be able to undo your\n"
+"choice after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost.\n"
+" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
+"partitioning everything from scratch. All data on your disk will be lost.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"Custom disk partitioning\": choose this option if you want to manually\n"
-"partition your hard drive. Be careful -- it is a powerful but dangerous\n"
-"choice and you can very easily lose all your data. That's why this option\n"
-"is really only recommended if you have done something like this before and\n"
-"have some experience. For more instructions on how to use the DiskDrake\n"
-"utility, refer to the ``Managing Your Partitions '' section in the\n"
-"``Starter Guide''."
+" * \"%s\": choose this option if you want to manually partition your hard\n"
+"drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
+"easily lose all your data. That's why this option is really only\n"
+"recommended if you have done something like this before and have some\n"
+"experience. For more instructions on how to use the DiskDrake utility,\n"
+"refer to the ``Managing Your Partitions '' section in the ``Starter\n"
+"Guide''."
 msgstr ""
-"На этом шаге вам прийдется решить куда вы хотите установить операционную\n"
+"На этом шаге вам прийдется решить, куда вы хотите установить операционную\n"
 "систему Mandrake Linux на вашем жестком диске. Если ваш жесткий диск пуст\n"
 "или существующая операционная система на нем занимает все дисковое\n"
 "пространство, вам прийдется диск переразбить (partition). Разделение диска\n"
 "в основном состоит в том, чтобы логически выделить на нем свободное\n"
 "пространство для установки вашей новой системы Mandrake Linux.\n"
 "\n"
-"Поскольку разделение диска обычно необратимый процесс, и может привести к\n"
-"потере данных, если на диске уже есть установленная операционная система,\n"
+"Поскольку разделение диска это обычно необратимый процесс и может привести\n"
+"к потере данных, если на диске уже есть установленная операционная система,\n"
 "то для начинающего пользователя это несколько напряженный и пугающий\n"
 "момент. К счастью, в DrakX существует мастер, упрощающий этот процесс.\n"
-"Пожалуйста проконсультируйтесь с руководством перед началом и не\n"
+"Пожалуйста, проконсультируйтесь с руководством перед началом и не\n"
 "торопитесь.\n"
 "\n"
 "В зависимости от конфигурации вашего жесткого диска, доступно несколько\n"
 "параметров:\n"
 "\n"
-" * \"Использовать свободное место\": эта опция означает автоматическое\n"
-"разделение пустого диска(ов). Если вы выбираете эту опцию, то далее\n"
-"вопросов задаваться не будет;\n"
-"\n"
-" * \"Использовать существующие разделы\": мастер определил наличие\n"
-"существующих разделов Linux на вашем жестком диске. Если вы собираетесь их\n"
-"использовать, выберите эту опцию. Вас попросят указать точки монтирования\n"
-"для каждого раздела. По умолчанию выбираются правильные точки монтирования\n"
-"и вы можете вообще их не менять.\n"
-"\n"
-" * \" Использовать свободное место на разделе Windows\": если на вашем\n"
-"жестком диске установлена и занимает все доступное место Microsoft Windows,\n"
-"вам нужно будет создать свободное место для данных Linux. Чтобы это\n"
-"сделать, вы можете удалить ваш Microsoft Windows раздел и данные (см.\n"
-"решение `` Очистить весь диск'') или изменить размер раздела FAT Microsoft\n"
-"Windows. Изменение размера может проводиться без потери данных, особенно\n"
-"если вы предварительно провели дефрагментацию раздел Windows и там\n"
-"используется формат FAT. Резервное копирование ваших данных настойчиво\n"
-"рекомендуется. . Рекомендуем выбрать эту опцию, если вы собираетесь\n"
-"использовать Mandrake Linux и Microsoft Windows на одном компьютере.\n"
+" * \"%s\": эта опция означает автоматическое разделение пустого диска(ов).\n"
+"Если вы выбираете эту опцию, то далее вопросов задаваться не будет;\n"
+"\n"
+" * \"%s\": мастер определил наличие существующих разделов Linux на вашем\n"
+"жестком диске. Если вы собираетесь их использовать, выберите эту опцию. Вас\n"
+"попросят указать точки монтирования для каждого раздела. По умолчанию\n"
+"выбираются правильные точки монтирования и вы можете вообще их не менять.\n"
+"\n"
+" * \"%s\": если на вашем жестком диске установлена и занимает все доступное\n"
+"место Microsoft Windows, вам нужно будет создать свободное место для данных\n"
+"Linux. Чтобы это сделать, вы можете удалить ваш Microsoft Windows раздел и\n"
+"данные (см. решение `` Очистить весь диск'') или изменить размер раздела\n"
+"FAT Microsoft Windows. Изменение размера может проводиться без потери\n"
+"данных, особенно если вы предварительно провели дефрагментацию раздела\n"
+"Windows и там используется формат FAT. Резервное копирование ваших данных\n"
+"настойчиво рекомендуется. . Рекомендуем выбрать эту опцию, если вы\n"
+"собираетесь использовать Mandrake Linux и Microsoft Windows на одном\n"
+"компьютере.\n"
 "\n"
 "   Перед тем, как выбрать эту опцию, вы должны осознать, что размер вашего\n"
-"раздела Microsoft Windows станет меньше, чем теперь. У вас будет меньше\n"
+"раздела Microsoft Windows станет меньше, чем был. У вас будет меньше\n"
 "свободного места под Microsoft Windows для хранения данных и инсталляции\n"
 "новых программ;\n"
 "\n"
-" * \"Очистить весь диск\" выберите эту опцию, если вы хотите удалить все\n"
-"данные на всех разделах вашего жесткого диска и заменить их новой системой\n"
-"Mandrake Linux. Будьте осторожны в этом решении, потому что после\n"
-"подтверждения, вы не сможете вернуть все как было назад;\n"
+" * \"%s\" выберите эту опцию, если вы хотите удалить все данные на всех\n"
+"разделах вашего жесткого диска и заменить их новой системой Mandrake Linux.\n"
+"Будьте осторожны в этом решении, потому что после подтверждения вы не\n"
+"сможете вернуть обратно все как было;\n"
 "\n"
 "   !! Если вы выбираете эту опцию, все данные на вашем жестком диске будут\n"
 "утеряны. !!\n"
 "\n"
-" * \"Удалить Windows\": эта опция позволит просто удалить всю информацию на\n"
-"диске и начать создание разделов диска на пустом месте. Вся информация на\n"
-"вашем диске будет утеряна.\n"
+" * \"%s\": эта опция позволит просто удалить всю информацию на диске и\n"
+"начать создание разделов диска на пустом месте. Вся информация на вашем\n"
+"диске будет утеряна.\n"
 "\n"
 "   !! Если вы выберете эту опцию, все данные на вашем диске будут потеряны.\n"
 "!!\n"
 "\n"
-" * \"Ручная разметка диска\": выберите эту опцию, если вы желаете разбить\n"
-"ваш диск вручную. Будьте осторожны, это мощная и одновременно опасная\n"
-"возможность. Вы запросто можете потерять все данные. Поэтому выбор этой\n"
-"опции рекомендуется только если вы уже делали что либо подобное и имеете\n"
+" * \"%s\": выберите эту опцию, если вы желаете разбить ваш диск вручную.\n"
+"Будьте осторожны, это мощная и одновременно опасная возможность. Вы\n"
+"запросто можете потерять все данные. Поэтому выбор этой опции рекомендуется\n"
+"только в случае, если вы уже делали что либо подобное раньше и имеете\n"
 "некоторый опыт. Чтобы узнать, как использовать утилиту DiskDrake,\n"
 "обратитесь к разделу ``Управление разделами диска '' книги ``Стартовое\n"
 "руководство пользователя''."
@@ -135,9 +134,9 @@ msgstr ""
 msgid ""
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor."
 msgstr ""
 "Разрешение\n"
@@ -150,43 +149,42 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"GNU/Linux is a multi-user system, meaning each user may have their own\n"
 "preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"to learn more about multi-user systems. But unlike \"root\", who is the\n"
 "system administrator, the users you add at this point will not be\n"
 "authorized to change anything except their own files and their own\n"
-"configuration, protecting the system from unintentional or malicious\n"
-"changes that impact the system as a whole. You will have to create at least\n"
-"one regular user for yourself -- this is the account which you should use\n"
-"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
-"to do anything and everything, it may also be very dangerous! A mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, the worst that will happen is that you will lose\n"
-"some information, but not affect the entire system.\n"
+"configurations, protecting the system from unintentional or malicious\n"
+"changes that impact on the system as a whole. You will have to create at\n"
+"least one regular user for yourself -- this is the account which you should\n"
+"use for routine, day-to-day use. Although it is very easy to log in as\n"
+"\"root\" to do anything and everything, it may also be very dangerous! A\n"
+"very simple mistake could mean that your system will not work any more. If\n"
+"you make a serious mistake as a regular user, the worst that will happen is\n"
+"that you will lose some information, but not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in and copy it to the \"User name\" field, which is the name this\n"
-"user will enter to log onto the system. If you like, you may override the\n"
-"default and change the username. The next step is to enter a password. From\n"
-"a security point of view, a non-privileged (regular) user password is not\n"
-"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
-"making it blank or too simple: after all, your files could be the ones at\n"
-"risk.\n"
-"\n"
-"Once you click on \"Accept user\", you can add other users. Add a user for\n"
-"each one of your friends: your father or your sister, for example. Click\n"
-"\"Next ->\" when you have finished adding users.\n"
-"\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
-"\n"
-"When you are finished adding all users, you will be asked to choose a user\n"
+"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"this user will enter to log onto the system. If you like, you may override\n"
+"the default and change the username. The next step is to enter a password.\n"
+"From a security point of view, a non-privileged (regular) user password is\n"
+"not as crucial as the \"root\" password, but that is no reason to neglect\n"
+"it by making it blank or too simple: after all, your files could be the\n"
+"ones at risk.\n"
+"\n"
+"Once you click on \"%s\", you can add other users. Add a user for each one\n"
+"of your friends: your father or your sister, for example. Click \"%s\" when\n"
+"you have finished adding users.\n"
+"\n"
+"Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
+"that user (bash by default).\n"
+"\n"
+"When you have finished adding users, you will be asked to choose a user\n"
 "that can automatically log into the system when the computer boots up. If\n"
 "you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Next\n"
-"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
-"to use this feature?\" box."
+"security), choose the desired user and window manager, then click \"%s\".\n"
+"If you are not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 "GNU/Linux это многопользовательская система, и это значит, что каждый\n"
 "пользователь может иметь свои собственные предпочтения, файлы и так далее.\n"
@@ -203,27 +201,27 @@ msgstr ""
 "\n"
 "В первом поле вы должны ввести ваше реальное имя. Это, конечно, не\n"
 "обязательно -, так как вы реально можете ввести все что угодно. DrakX\n"
-"использует первое слово, которое вы ввели в поле и подставит его как \"Имя\n"
-"пользователя\". Это имя обычный пользователь использует для входа в\n"
-"систему. Вы можете изменить его. Затем вам нужно ввести пароль. С точки\n"
-"зрения безопасности пароль не-привилегированного (обычного) пользователя не\n"
-"так критичен, как пароль \"root\", но нет причин пренебрегать им: в конце\n"
+"использует первое слово, которое вы ввели в поле и подставит его как\n"
+"\"%s\". Это имя обычный пользователь использует для входа в систему. Вы\n"
+"можете изменить его. Затем вам нужно ввести пароль. С точки зрения\n"
+"безопасности пароль не-привилегированного (обычного) пользователя не так\n"
+"критичен, как пароль \"root\", но нет причин пренебрегать им: в конце\n"
 "концов, вы рискуете своими файлами.\n"
 "\n"
-"Когда вы нажмете \"Принять пользователя\", вы сможете добавить еще сколько\n"
-"захотите. Создайте пользователя для каждого из своих друзей, для отца или\n"
-"сестры, например. Когда вы закончите добавление пользователей, нажмите\n"
-"\"Далее ->\"\n"
+"Когда вы нажмете \"%s\", вы сможете добавить еще сколько угодно\n"
+"пользователей. Создайте пользователя для каждого из своих друзей, для отца\n"
+"или сестры, например. Когда вы закончите добавление пользователей, нажмите\n"
+"\"%s\".\n"
 "\n"
-"Нажатие кнопки \"Дополнительно\" позволит изменить \"shell\" по умолчанию\n"
-"для этого пользователя (по умолчанию это bash).\n"
+"Нажатие кнопки \"%s\" позволит изменить \"shell\" по умолчанию для этого\n"
+"пользователя (по умолчанию это bash).\n"
 "\n"
 "После того, как все пользователи будут добавлены, вам предложат выбрать\n"
 "пользователя, под которым можно будет автоматически входить в систему после\n"
 "загрузки. Если вас интересует эта возможность (и вас не заботит локальная\n"
-"безопасность), выберите выберите необходимого пользователя и оконный\n"
-"менеджер, затем нажмите \"Далее ->\". Если вам не нужна эта возможность,\n"
-"снимите галочку с пункта \"Хотите использовать эту возможность?\""
+"безопасность), выберите необходимого пользователя и оконный менеджер, затем\n"
+"нажмите \"%s\". Если вам не нужна эта возможность, снимите выбор с пункта\n"
+"\"%s\""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -247,8 +245,8 @@ msgid ""
 "choose between CD, OF boot, MacOS or Linux;\n"
 "\n"
 " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second before your\n"
-"default kernel description is selected;\n"
+"After selecting Linux, you will have this delay in 0.1 second increments\n"
+"before your default kernel description is selected;\n"
 "\n"
 " * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
 "at the first boot prompt.\n"
@@ -265,26 +263,19 @@ msgstr ""
 "загрузчика. Если это не так, вы можете вручную добавить пункт на этом\n"
 "экране. Будьте внимательны при выборе корректных параметров.\n"
 "\n"
-"Yaboot является начальным загрузчиком для оборудования NewWorld\n"
-"MacIntosh.\n\" \"Он в состоянии загрузить GNU/Linux, MacOS или MacOSX, если\n"
-"таковые имеются\n\" \"на вашем компьютере. Обычно эти операционные системы\n"
-"правильно определяются\n\" \"и устанавливаются. Если это не так, вы можете\n"
-"вручную добавить пункт на\n\" \"этом экране. Будьте внимательны при выборе\n"
-"правильных параметров.\n"
-"\n"
 "Основные опции Yaboot:\n"
 "\n"
 " * Init Message: простой текст, отображаемый перед приглашением загрузки.\n"
 "\n"
-" * Boot Device: показывает, куда вы хотите поместить информацию,\n"
-"требующуюся для загрузки GNU/Linux. Обычно сначала вы устанавливаете раздел\n"
-"bootstrap, содержащий эту информацию.\n"
+" * Boot Device: показывает, куда вы хотите поместить информацию, требуемую\n"
+"для загрузки GNU/Linux. Обычно сначала вы устанавливаете раздел bootstrap,\n"
+"содержащий эту информацию.\n"
 "\n"
-" * Open Firmware Delay: в отличие от LILO у yaboot имеются две паузы.\n"
+" * Open Firmware Delay: в отличие от LILO, у yaboot имеются две паузы.\n"
 "Первая пауза измеряется в секундах, и на этом этапе вы можете CD, OF boot,\n"
-"MacOS or Linux;\n"
+"MacOS или Linux;\n"
 "\n"
-" * Kernel Boot Timeout: этот таймаут похож на паузу загрузки LILO \"После\n"
+" * Kernel Boot Timeout: этот таймаут похож на паузу загрузки LILO. После\n"
 "выбора Linux у вас будет пауза в 0.1 секунды перед тем, как будет выбрано\n"
 "ваше описание ядра по умолчанию.\n"
 "\n"
@@ -306,13 +297,12 @@ msgid ""
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
 "of an existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": For the most part, this completely wipes out the old\n"
-"system. If you wish to change how your hard drives are partitioned, or\n"
-"change the file system, you should use this option. However, depending on\n"
-"your partitioning scheme, you can prevent some of your existing data from\n"
-"being over- written.\n"
+" * \"%s\": For the most part, this completely wipes out the old system. If\n"
+"you wish to change how your hard drives are partitioned, or change the file\n"
+"system, you should use this option. However, depending on your partitioning\n"
+"scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
-" * \"Upgrade\": this installation class allows you to update the packages\n"
+" * \"%s\": this installation class allows you to update the packages\n"
 "currently installed on your Mandrake Linux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
@@ -324,18 +314,18 @@ msgstr ""
 "Этот шаг появляется только если на вашей машине найден старый раздел\n"
 "GNU/Linux.\n"
 "\n"
-"DrakX теперь должен узнать хотите ли вы провести новую установку или\n"
+"DrakX теперь должен узнать, хотите ли вы провести новую установку или\n"
 "обновление существующей системы Mandrake Linux:\n"
 "\n"
-" * \"Установка\": В большинстве случаев этот вариант приведет к уничтожению\n"
-"старой системы. Если вы желаете изменить разделы вашего жесткого диска, или\n"
+" * \"%s\": В большинстве случаев этот вариант приведет к уничтожению старой\n"
+"системы. Если вы желаете изменить разделы вашего жесткого диска или\n"
 "изменить файловую систему, вы должны выбрать этот пункт. Однако, в\n"
 "зависимости от того, как разбит ваш диск, вы возможно сможете сохранить от\n"
 "перезаписи некоторые свои данные.\n"
 "\n"
-" * \"Обновление\": этот класс установки позволит вам обновить пакеты,\n"
-"установленные в вашей системе Mandrake Linux. Текущая схема разделов диска\n"
-"и пользовательские данные останутся нетронутыми. Большинство других шагов\n"
+" * \"%s\": этот класс установки позволит вам обновить пакеты, установленные\n"
+"в вашей системе Mandrake Linux. Текущая схема разделов диска и\n"
+"пользовательские данные останутся нетронутыми. Большинство других шагов\n"
 "будут доступны, как и при стандартной установке.\n"
 "\n"
 "Выбор варианта ``Обновление'' будет неплохо работать на системах Mandrake\n"
@@ -348,92 +338,86 @@ msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Bugs may have been\n"
 "fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"Yes\"\n"
-"if you have a working Internet connection, or \"No\" if you prefer to\n"
+"updates, you are now able to download them from the Internet. Check \"%s\"\n"
+"if you have a working Internet connection, or \"%s\" if you prefer to\n"
 "install updated packages later.\n"
 "\n"
-"Choosing \"Yes\" will display a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. A package-selection tree will\n"
-"appear: review the selection, and press \"Install\" to retrieve and install\n"
-"the selected package(s), or \"Cancel\" to abort."
+"Choosing \"%s\" will display a list of places from which updates can be\n"
+"retrieved. You should choose one nearer to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 "В данный момент установки Mandrake Linux было бы неплохо обновить некоторые\n"
 "пакеты из исходного релиза. Некоторые баги могут быть исправлены и решены\n"
 "проблемы безопасности. Чтобы извлечь пользу из этих обновлений, сейчас вы\n"
-"можете загрузить их из Интернет. Нажмите \"Да\", если у вас есть работающее\n"
-"соединение с Интернет, или \"Нет\", если вы хотели бы обновить пакеты\n"
-"позже.\n"
+"можете загрузить их из Интернет. Нажмите \"%s\", если у вас есть работающее\n"
+"соединение с Интернет, или \"%s\", если вы хотели бы обновить пакеты позже.\n"
 "\n"
-"При выборе \"Да\" появится список мест, из которых можно получить\n"
+"При выборе \"%s\" появится список мест, из которых можно получить\n"
 "обновления. Выберите ближайший к вам сервер. Затем появится дерево выбора\n"
-"пакетов: просмотрите список и нажмите \"Установить\" для получения и\n"
-"установки выбранных пакетов, или \"Отмена\" для отмены."
+"пакетов: просмотрите список и нажмите \"%s\" для получения и установки\n"
+"выбранных пакетов, или \"%s\" для отмены."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"This dialog allows to finely tune your bootloader:\n"
+"This dialog allows you to fine tune your bootloader:\n"
 "\n"
-" * \"Bootloader to use\": there are three choices for your bootloader:\n"
+" * \"%s\": there are three choices for your bootloader:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"%s\": if you prefer grub (text menu).\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its text menu interface.\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"    * \"%s\": if you prefer LILO with its graphical interface.\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
+"you prefer, the bootloader can be installed on the second hard drive\n"
+"(\"%s\"), or even on a floppy disk (\"%s\");\n"
 "\n"
-" * \"Delay before booting the default image\": after a boot or a reboot of\n"
-"the computer, this is the delay given to the user at the console to select\n"
-"a boot entry other than the default.\n"
+" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
+"given to the user at the console to select a boot entry other than the\n"
+"default.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
-"system! Be sure you know what you do before changing any of the options. !!\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you are doing before changing any of the\n"
+"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
-"that are reserved for the expert user."
+"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
+"are normally reserved for the expert user."
 msgstr ""
-"Этот диалог позволяет прекрасно настроить ваш начальный загрузчик:\n"
+"Этот диалог позволяет тонко настроить ваш начальный загрузчик:\n"
 "\n"
-" * \"Используемый начальный загрузчик\": существуют три варианта начального\n"
-"загрузчика:\n"
+" * \"%s\": существуют три варианта начального загрузчика:\n"
 "\n"
-"    * \"GRUB\": если вы предпочитаете grub (текстовое меню).\n"
+"    * \"%s\": если вы предпочитаете grub (текстовое меню).\n"
 "\n"
-"    * \"LILO с текстовым меню\": если вы предпочитаете LILO с текстовым\n"
-"интерфейсом меню\n"
+"    * \"%s\": если вы предпочитаете LILO с текстовым интерфейсом меню.\n"
 "\n"
-"    * \"LILO с графическим меню\": если вы предпочитаете LILO с графическим\n"
-"интерфейсом\n"
+"    * \"%s\": если вы предпочитаете LILO с графическим интерфейсом.\n"
 "\n"
-" * \"Загрузочное устройство\": в большинстве случаев вам не прийдется\n"
-"менять значение по умолчанию (\"/dev/hda\"), но если вы желаете, начальный\n"
-"загрузчик может быть установлен на второй жесткий диск (\"/dev/hdb\"), или\n"
-"даже на дискету (\"/dev/fd0\");\n"
+" * \"%s\": в большинстве случаев вам не прийдется менять значение по\n"
+"умолчанию (\"%s\"), но если вы желаете, начальный загрузчик может быть\n"
+"установлен на второй жесткий диск (\"%s\"), или даже на дискету (\"%s\");\n"
 "\n"
-" * \"Пауза перед загрузкой образа по умолчанию\": во время загрузки или\n"
-"перезагрузки компьютера пользователю предоставляется возможность выбрать в\n"
-"меню загрузчика отличный от умолчания вариант загрузки.\n"
+" * \"%s\": во время загрузки или перезагрузки компьютера пользователю\n"
+"предоставляется возможность выбрать в меню загрузчика отличный от умолчания\n"
+"вариант загрузки.\n"
 "\n"
 "!! Будьте осторожны при отмене инсталляции начального загрузчика (нажатие\n"
-"здесь \"Пропустить\" ведет к этому), потому что у вас должен остаться хотя\n"
+"здесь кнопки \"%s\" ведет к этому), потому что у вас должен остаться хотя\n"
 "бы один способ загрузить вашу систему Mandrake Linux! Также убедитесь в\n"
 "том, что вы знаете что делаете, когда изменяете какой-либо параметр. !!\n"
 "\n"
-"При нажатии на кнопку \"Дополнительно\" появится диалог со множеством опций\n"
-"для продвинутых пользователей."
+"При нажатии на кнопку \"%s\" появится диалог со множеством опций для\n"
+"продвинутых пользователей."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
+"Please choose which one you want to resize in order to install your new\n"
 "Mandrake Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
@@ -463,28 +447,27 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "На вашем жестом диске может быть обнаружено более одного раздела Microsoft.\n"
-"Выберите необходимый раздел для изменения его размера для установки вашей\n"
-"новой операционной системы Mandrake Linux.\n"
+"Выберите необходимый раздел для изменения его размера с целью установки\n"
+"вашей новой операционной системы Mandrake Linux.\n"
 "\n"
-"Каждый раздел перечислен так: \"Linux name\", \"Windows name\"\n"
-"\"Capacity\".\n"
+"Каждый раздел перечислен так: \"Linux имя\", \"Windows имя\" \"Размер\".\n"
 "\n"
-"\"Linux name\" разделено на: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (например, \"hda1\").\n"
+"\"Linux имя\" разделено на: \"тип жесткого диска\", \"номер жесткого\n"
+"диска\", \"номер раздела\" (например, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" это \"hd\" если ваш жесткий диск IDE и \"sd\" если\n"
+"\"Тип жесткого диска\" это \"hd\" если ваш жесткий диск IDE и \"sd\" если\n"
 "SCSI.\n"
 "\n"
-"\"Hard drive number\" всегда буква после \"hd\" или \"sd\". Для жестких\n"
+"\"Номер жесткого диска\" всегда буква после \"hd\" или \"sd\". Для жестких\n"
 "дисков IDE:\n"
 "\n"
-" * \"a\" означает \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" означает \"master жесткий диск на первичном IDE контроллере\";\n"
 "\n"
-" * \"b\" означает \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" означает \"slave жесткий диск на первичном IDE контроллере\";\n"
 "\n"
-" * \"c\" означает \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" означает \"master жесткий диск на вторичном IDE контроллере\";\n"
 "\n"
-" * \"d\" означает \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" означает \"slave жесткий диск на вторичном IDE контроллере\".\n"
 "\n"
 "Для жестких дисков SCSI \"a\" означает \"lowest SCSI ID\", \"b\" означает\n"
 "\"second lowest SCSI ID\", и т.д.\n"
@@ -499,32 +482,32 @@ msgid ""
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
-"You will be presented the list of different parameters to change to get an\n"
-"optimal graphical display: Graphic Card\n"
+"You will be presented with a list of different parameters to change to get\n"
+"an optimal graphical display: Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs.\n"
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own.\n"
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
-"   You can choose here resolutions and color depth between those available\n"
-"for your hardware. Choose the one that best suit your needs (you will be\n"
-"able to change that after installation though). A sample of the chosen\n"
+"   Here you can choose the resolutions and color depths available for your\n"
+"hardware. Choose the one that best suits your needs (you will be able to\n"
+"change that after installation though). A sample of the chosen\n"
 "configuration is shown in the monitor.\n"
 "\n"
 "\n"
@@ -532,7 +515,7 @@ msgid ""
 "Test\n"
 "\n"
 "   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"Yes\",\n"
+"resolution. If you can see the message during the test and answer \"%s\",\n"
 "then DrakX will proceed to the next step. If you cannot see the message, it\n"
 "means that some part of the autodetected configuration was incorrect and\n"
 "the test will automatically end after 12 seconds, bringing you back to the\n"
@@ -542,13 +525,13 @@ msgid ""
 "\n"
 "Options\n"
 "\n"
-"   You can here choose whether you want to have your machine automatically\n"
+"   Here you can choose whether you want to have your machine automatically\n"
 "switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"No\" if your machine is to act as a server, or if you were not successful\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
 "in getting the display configured."
 msgstr ""
-"X (для системы X Window) это основа графического интерфейса GNU/Linux, на\n"
-"котором базируются все графические среды (KDE, GNOME, AfterStep,\n"
+"X (для системы X Window) это сердце графического интерфейса GNU/Linux, на\n"
+"базе которого работают все графические среды (KDE, GNOME, AfterStep,\n"
 "WindowMaker, и т.д..), входящие в Mandrake Linux.\n"
 "\n"
 "Вам будет представлен список различных параметров для получения\n"
@@ -559,7 +542,7 @@ msgstr ""
 "списке карту, которая у вас действительно установлена.\n"
 "\n"
 "   В случае, когда для вашей карты доступны различные сервера, с 3D\n"
-"ускорением и без, вам предложат выбрать какой сервер больше соответствует\n"
+"ускорением и без, вам предложат выбрать, какой сервер больше соответствует\n"
 "вашим потребностям.\n"
 "\n"
 "\n"
@@ -583,8 +566,8 @@ msgstr ""
 "\n"
 "Проверить\n"
 "\n"
-"   система попытается открыть графический экран в выбранном разрешении.\n"
-"Если вы сможете увидеть сообщение во время проверки и ответить \"Да\",\n"
+"   Система попытается открыть графический экран в выбранном разрешении.\n"
+"Если вы сможете увидеть сообщение во время проверки и ответить \"%s\",\n"
 "тогда DrakX перейдет к следующему шагу. Если вы не увидите сообщения, это\n"
 "значит, что часть определенной автоматически конфигурации была неверна и\n"
 "проверка автоматически завершится через 12 секунд, вернув вас в меню.\n"
@@ -596,31 +579,31 @@ msgstr ""
 "Параметры\n"
 "\n"
 "   Здесь вы можете настроить вашу машину на автоматическую загрузку в\n"
-"графическом интерфейсе. Очевидно, что вам следует выбрать \"Нет\", если\n"
-"ваша машина будет работать в качестве сервера или вам не удалось настроить\n"
+"графическом интерфейсе. Очевидно, что вам следует выбрать \"%s\", если ваша\n"
+"машина будет работать в качестве сервера или вам не удалось настроить\n"
 "графический режим."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
-"is best for a particular type of configuration.\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing system\n"
+"is best suited to particular types of configuration.\n"
 "\n"
-" * \"pdq\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"pdq\n"
-"\" will handle only very simple network cases and is somewhat slow when\n"
-"used with networks.) It's recommended that you use \"pdq\" if this is your\n"
-"first experience with GNU/Linux.\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"will handle only very simple network cases and is somewhat slow when used\n"
+"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
+"experience with GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
 "printing to your local printer or to one halfway around the planet. It is\n"
 "simple to configure and can act as a server or a client for the ancient\n"
 "\"lpd \" printing system, so it compatible with older operating systems\n"
-"that may still need print services. While quite powerful, the basic setup\n"
+"which may still need print services. While quite powerful, the basic setup\n"
 "is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
 "front-ends for printing or choosing printer options and for managing the\n"
 "printer.\n"
 "\n"
@@ -632,21 +615,21 @@ msgstr ""
 "могут предложить вам одну, а Mandrake Linux предлагает две. Каждая из\n"
 "систем является лучшей для определенной конфигурации.\n"
 "\n"
-" * \"pdq\" -- что означает ``печатать, не ставить в очередь'' - это\n"
+" * \"%s\" -- что означает ``печатать, не ставить в очередь'' - это удобный\n"
 "вариант, если вы напрямую подключены к своему принтеру, вы хотите избежать\n"
-"проблем с зажевыванием бумаги, и у вас нет сетевых принтеров. (\"pdq \"\n"
+"проблем с зажевыванием бумаги, и у вас нет сетевых принтеров. (\"%s\"\n"
 "сможет cправиться только с очень простыми реализациями сетей и является для\n"
 "них довольно медленным.) Рекомендуется использовать \"pdq \" в случае, если\n"
 "вы только начинаете свой путь в GNU/Linux.\n"
 "\n"
-" * \"CUPS\" - `` Common Unix Printing System'' (Общая система печати Unix),\n"
+" * \"%s\" - `` Common Unix Printing System'' (Общая система печати Unix),\n"
 "это превосходная печать на вашем локальном принтере, а также на половине\n"
 "всей планеты. Она проста в настройке и может выступать в качестве сервера\n"
 "или клиента для древних систем печати \"lpd \", поэтому она совместима с\n"
-"ранее выпущенными системами которым возможно еще требуются сервисы печати.\n"
+"ранее выпущенными системами, которым возможно еще требуются сервисы печати.\n"
 "Несмотря на всю свою мощь, базовые настройки у нее проще чем у \"pdq\".\n"
 "Если вам нужно эмулировать \"lpd\", вы должны включить демон \"cups-lpd \".\n"
-"\"CUPS\" имеет графический интерфейс для печати или выбора параметров\n"
+"\"%s\" имеет графический интерфейс для печати или выбора параметров\n"
 "принтера и для управления принтером.\n"
 "\n"
 "Если вы сделаете свой выбор сейчас, а позже обнаружите, что система печати\n"
@@ -664,47 +647,45 @@ msgid ""
 "Packages are sorted into groups corresponding to a particular use of your\n"
 "machine. Mandrake Linux has four predefined installations available. You\n"
 "can think of these installation classes as containers for various packages.\n"
-"You can mix and match applications from the various containers, so a\n"
+"You can mix and match applications from the various groups, so a\n"
 "``Workstation'' installation can still have applications from the\n"
-"``Development'' container installed.\n"
+"``Development'' group installed.\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the applications that are in the workstation\n"
-"container.\n"
+" * \"%s\": if you plan to use your machine as a workstation, select one or\n"
+"more of the applications that are in the workstation group.\n"
 "\n"
-" * \"Development\": if plan on using your machine for programming, choose\n"
-"the appropriate packages from the container.\n"
+" * \"%s\": if plan on using your machine for programming, choose the\n"
+"appropriate packages from that group.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, select which of\n"
-"the more common services you wish to install on your machine.\n"
+" * \"%s\": if your machine is intended to be a server, select which of the\n"
+"more common services you wish to install on your machine.\n"
 "\n"
-" * \"Graphical Environment\": this is where you will choose your preferred\n"
-"graphical environment. At least one must be selected if you want to have a\n"
-"graphical interface available.\n"
+" * \"%s\": this is where you will choose your preferred graphical\n"
+"environment. At least one must be selected if you want to have a graphical\n"
+"interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
 "text about that group. If you unselect all groups when performing a regular\n"
 "installation (as opposed to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the minimum number of packages possible to have a\n"
+" * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server.\n"
+" * \"%s\": installs the base system plus basic utilities and their\n"
+"documentation. This installation is suitable for setting up a server.\n"
 "\n"
-" * \"Truly minimal install\": will install the absolute minimum number of\n"
-"packages necessary to get a working Linux system. With this installation\n"
-"you will only have a command line interface. The total size of this\n"
-"installation is 65 megabytes.\n"
+" * \"%s\": will install the absolute minimum number of packages necessary\n"
+"to get a working Linux system. With this installation you will only have a\n"
+"command line interface. The total size of this installation is about 65\n"
+"megabytes.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+"You can check the \"%s\" box, which is useful if you are familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
+"If you started the installation in \"%s\" mode, you can unselect all groups\n"
+"to avoid installing any new package. This is useful for repairing or\n"
 "updating an existing system."
 msgstr ""
 "Теперь настало время определить, какие программы вы хотите установить на\n"
@@ -714,47 +695,45 @@ msgstr ""
 "Пакеты сортированы по группам, которые соответствуют специфике\n"
 "использования вашей машины. В Mandrake Linux имеется четыре\n"
 "предопределенных варианта установки. Вы можете рассматривать эти варианты\n"
-"установки как наборы различных пакетов. Вы можете объединять приложения из\n"
-"различных наборов, например к варианту установки ``Рабочая станция'' могут\n"
-"быть добавлены приложения из набора ``Разработка''.\n"
+"установки как просто наборы различных пакетов. Вы можете объединять\n"
+"приложения из различных наборов, например к варианту установки ``Рабочая\n"
+"станция'' могут быть добавлены приложения из набора ``Разработка''.\n"
 "\n"
-" * \"Рабочая станция\": если вы собираетесь использовать машину как рабочую\n"
-"станцию, выберите одну или несколько соответствующих групп из набора\n"
+" * \"%s\": если вы собираетесь использовать машину в качестве рабочей\n"
+"станции, выберите одну или несколько соответствующих групп из набора\n"
 "рабочей станции.\n"
 "\n"
-" * \"Разработка\": если вы собираетесь заняться программированием, выберите\n"
+" * \"%s\": если вы собираетесь заняться программированием, выберите\n"
 "соответствующие пакеты из набора.\n"
 "\n"
-" * \"Сервер\": если ваша машина будет работать сервером, выберите какие\n"
-"сервисы установить на нее.\n"
+" * \"%s\": если ваша машина будет работать сервером, выберите какие сервисы\n"
+"установить на нее.\n"
 "\n"
-" * \"Графическая среда\": здесь вам нужно выбрать предпочитаемую\n"
-"графическую среду. Хотя бы одна из них должна быть выбрана, если вы хотите\n"
-"работать в графическом интерфейсе.\n"
+" * \"%s\": здесь вам нужно выбрать предпочитаемую графическую среду. Хотя\n"
+"бы одна из них должна быть выбрана, если вы хотите работать в графическом\n"
+"интерфейсе.\n"
 "\n"
 "При наведении курсора мыши на имя группы будет показываться короткое\n"
-"пояснение о данной группе. Если вы не выберете ни одной группы в процессе\n"
+"пояснение к данной группе. Если вы не выберете ни одной группы в процессе\n"
 "выполнения обычной инсталляции (в противоположность upgrade), появится\n"
 "диалог с различными опциями для минимальной инсталляции:\n"
 "\n"
-" * \"Вместе с Х\": инсталлировать минимальный набор пакетов, необходимых\n"
-"для работы графического рабочего стола.\n"
+" * \"%s\": инсталлировать минимальный набор пакетов, необходимых для работы\n"
+"графического рабочего стола.\n"
 "\n"
-" * \"С основной документацией\": установить основную систему плюс базовые\n"
-"утилиты и документацию к ним. Эта инсталляция подходит для установки\n"
-"сервера.\n"
+" * \"%s\": установить основную систему плюс базовые утилиты и документацию\n"
+"к ним. Эта инсталляция подходит для установки сервера.\n"
 "\n"
-" * \"Действительно минимальная установка\": будет установлен самый\n"
-"необходимый минимум пакетов для работы Linux системы. В это варианте вы\n"
-"сможете работать только в режиме командной строки. Общий размер этой\n"
-"установки занимает 65 мегабайт.\n"
+" * \"%s\": будет установлен самый необходимый минимум пакетов для работы\n"
+"Linux системы. В это варианте вы сможете работать только в режиме командной\n"
+"строки. Общий размер этой установки занимает 65 мегабайт.\n"
 "\n"
-"Вы можете отметить пункт \"Выбор отдельных пакетов\", который очень полезен\n"
-"если вы хорошо знаете предлагаемые пакеты или если вы хотите иметь полный\n"
-"контроль над тем, что будет устанавливаться.\n"
+"Вы можете отметить пункт \"%s\", который очень полезен, если вы хорошо\n"
+"знаете предлагаемые пакеты, или если вы хотите иметь полный контроль над\n"
+"тем, что будет устанавливаться.\n"
 "\n"
-"Если вы начали инсталляцию в режиме \"Upgrade\", вы можете убрать выбор\n"
-"всех групп, чтобы предотвратить инсталляцию какого-либо нового пакета. Это\n"
+"Если вы начали инсталляцию в режиме \"%s\", вы можете убрать выбор всех\n"
+"групп, чтобы предотвратить инсталляцию какого-либо нового пакета. Это\n"
 "полезно в случае восстановления или обновления существующей системы."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -773,19 +752,20 @@ msgstr ""
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you have to enter the \"root\" password. \"Root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
+"administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
 "do everything! That is why you must choose a password that is difficult to\n"
 "guess - DrakX will tell you if the password that you chose too easy. As you\n"
 "can see, you are not forced to enter a password, but we strongly advise you\n"
-"against. GNU/Linux is as prone to operator error as any other operating\n"
-"system. Since \"root\" can overcome all limitations and unintentionally\n"
-"erase all data on partitions by carelessly accessing the partitions\n"
-"themselves, it is important that it be difficult to become \"root\".\n"
+"against this. GNU/Linux is just as prone to operator error as any other\n"
+"operating system. Since \"root\" can overcome all limitations and\n"
+"unintentionally erase all data on partitions by carelessly accessing the\n"
+"partitions themselves, it is important that it be difficult to become\n"
+"\"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"characters long. Never write down the \"root\" password -- it makes it far\n"
+"too easy to compromise a system.\n"
 "\n"
 "One caveat -- do not make the password too long or complicated because you\n"
 "must be able to remember it!\n"
@@ -793,24 +773,25 @@ msgid ""
 "The password will not be displayed on screen as you type it in. To reduce\n"
 "the chance of a blind typing error you will need to enter the password\n"
 "twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"``incorrect'' password will be the one you will have use the first time you\n"
+"connect.\n"
 "\n"
 "If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"Advanced\" button.\n"
+"server, click the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you do not\n"
-"know which to use, ask your network administrator.\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
+"one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with reminding passwords, you can choose to\n"
-"have \"No password\", if your computer won't be connected to the Internet,\n"
-"and if you trust anybody having access to it."
+"If you happen to have problems with remembering passwords, if your computer\n"
+"will never be connected to the internet or that you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Это самое важное решение в деле безопасности вашей системы GNU/Linux: вы\n"
 "должны ввести пароль \"root\". \"Root\" является администратором системы и\n"
 "только он имеет право производить обновления, добавлять пользователей,\n"
 "изменять конфигурацию системы и так далее. Короче говоря, \"root\" может\n"
-"все! Вот поэтому вы должны придумать пароль, который трудно подобрать -.\n"
+"все! Вот поэтому вы должны придумать пароль, который трудно подобрать.\n"
 "DrakX сообщит вам, если пароль слишком прост. Как вы видите, можно вообще\n"
 "не вводить пароль, но мы серьезно советуем вам этого не делать по одной\n"
 "простой причине: не думайте, что если вы загрузили GNU/Linux, то ваши\n"
@@ -823,8 +804,8 @@ msgstr ""
 "не менее 8 символов. Никогда не записывайте пароль \"root\" -: это делает\n"
 "очень легкой возможность скомпрометировать систему.\n"
 "\n"
-"Однако, пожалуйста не делайте пароль слишком длинным или слишком сложным,\n"
-"потому что вы должны его без особых усилий запомнить.\n"
+"С другой стороны, пожалуйста, не делайте пароль слишком длинным или слишком\n"
+"сложным, потому что вы должны его без особых усилий запомнить.\n"
 "\n"
 "Пароль не будет отображаться на экране так же, как вы его вводите. Кроме\n"
 "того, вам прийдется повторить ввод пароля, чтобы предупредить возможность\n"
@@ -832,34 +813,34 @@ msgstr ""
 "``неверный'' пароль прийдется использовать при первой загрузке.\n"
 "\n"
 "Если вы желаете, чтобы доступ к этому компьютеру контролировался сервером\n"
-"аутентификации, нажмите на кнопку \"Дополнительно\".\n"
+"аутентификации, нажмите на кнопку \"%s\".\n"
 "\n"
 "Если ваша сеть использует LDAP, NIS, или PDC Windows Domain сервисы\n"
-"аутентификации, выберите соответствующий тип \"аутентификации\". Если не\n"
-"знаете, спросите своего администратора сети.\n"
+"аутентификации, выберите соответствующий тип \"%s\". Если не знаете,\n"
+"спросите своего администратора сети.\n"
 "\n"
 "Если у вас возникли проблемы с запоминанием паролей, вы можете выбрать\n"
-"опцию \"Без пароля\", если ваш компьютер не будет подключаться к Интернет и\n"
-"если вы доверяете всем доступ к машине."
+"опцию \"%s\", если ваш компьютер не будет подключаться к Интернет и если вы\n"
+"доверяете всем доступ к машине."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"Click on \"Next ->\" if you want to delete all data and partitions present\n"
-"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
-"be able to recover any data and partitions present on this hard drive,\n"
-"including any Windows data.\n"
+"Click on \"%s\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"Click on \"%s\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Нажмите \"Далее ->\", если вы хотите удалить все данные и разделы на данном\n"
-"жестком диске. Будьте осторожны, потому что после нажатия \"Далее ->\" вы\n"
-"не сможете восстановить данные и разделы на этом диске, включая данные\n"
+"Нажмите \"%s\", если вы хотите удалить все данные и разделы на данном\n"
+"жестком диске. Будьте осторожны, потому что после нажатия \"%s\" вы не\n"
+"сможете восстановить данные и разделы на этом диске, включая данные\n"
 "Windows.\n"
 "\n"
-"Нажмите \"<- Назад\" для отмены этой операции без потери данных и разделов\n"
-"на данном жестком диске."
+"Нажмите \"%s\" для отмены этой операции без потери данных и разделов на\n"
+"данном жестком диске."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -878,17 +859,17 @@ msgid ""
 "installed. By default Mandrake Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes are discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrake Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
 "default during boot. !!\n"
 "\n"
-"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
-"which appears whenever the installer automatically selects a package to\n"
-"resolve a dependency issue. Some packages have relationships between each\n"
-"other such that installation of a package requires that some other program\n"
-"is already installed. The installer can determine which packages are\n"
+"The \"%s\" option is used to disable the warning dialog which appears\n"
+"whenever the installer automatically selects a package to resolve a\n"
+"dependency issue. Some packages have relationships between each other such\n"
+"that installation of a package requires that some other program is also\n"
+"rerquired to be installed. The installer can determine which packages are\n"
 "required to satisfy a dependency to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
@@ -898,9 +879,9 @@ msgid ""
 "end of another installation. See the second tip of last step on how to\n"
 "create such a floppy."
 msgstr ""
-"Если вы сообщили инсталлятору, что вы хотите выбрать отдельно пакеты, он\n"
+"Если вы сообщили инсталлятору, что вы хотите выбрать пакеты отдельно, он\n"
 "покажет вам дерево, содержащее все пакеты, разделенные по группам и\n"
-"подгруппам. Во время просмотра дерева, вы можете выбирать группы полностью,\n"
+"подгруппам. Во время просмотра дерева вы можете выбирать группы полностью,\n"
 "подгруппы или отдельные пакеты.\n"
 "\n"
 "Когда вы выбираете пакет в дереве, справа появляется его описание, чтобы\n"
@@ -913,15 +894,15 @@ msgstr ""
 "имеют известных проблем на момент выпуска дистрибутива, в них могут быть\n"
 "обнаружены дыры в безопасности после выпуска данной версии Mandrake Linux.\n"
 "Если вы не знаете, зачем нужен данный сервис и что он делает, нажмите\n"
-"\"Нет\". Если вы нажмете \"Да\", тогда все сервисы из списка будут\n"
+"\"%s\". Если вы нажмете \"%s\", тогда все сервисы из списка будут\n"
 "установлены и автоматически запущены при загрузке. !!\n"
 "\n"
-"Опция \"Автоматические зависимости\" запрещает показ диалога\n"
-"предупреждения, который появляется при автоматическом выборе пакетов\n"
-"инсталлятором. Некоторые пакеты имеют взаимосвязь друг с другом, поэтому\n"
-"инсталлятору может потребоваться установить некоторые другие программы.\n"
-"Инсталлятор сам определит какие пакеты нужны для удовлетворения\n"
-"зависимостей, чтобы успешно выполнить установку.\n"
+"Опция \"%s\" запрещает показ диалога предупреждения, который появляется при\n"
+"автоматическом выборе пакетов инсталлятором. Некоторые пакеты имеют\n"
+"взаимосвязь друг с другом, поэтому инсталлятору может потребоваться\n"
+"установить некоторые дополнительные программы. Инсталлятор сам определит,\n"
+"какие пакеты нужны для удовлетворения зависимостей, чтобы успешно выполнить\n"
+"установку.\n"
 "\n"
 "Маленькая иконка дискеты внизу под списком позволяет загрузить выбранный и\n"
 "записанный во время предыдущей инсталляции список пакетов. Если вы нажмете\n"
@@ -946,22 +927,17 @@ msgid ""
 "If it cannot make a determination, DrakX will ask you where to place the\n"
 "bootloader."
 msgstr ""
-"LILO и grub это загрузчики GNU/Linux. Этот шаг обычно полностью\n"
+"LILO и grub это начальные загрузчики GNU/Linux. Этот шаг обычно полностью\n"
 "автоматизирован. DrakX проанализирует загрузочный (boot) сектор диска и\n"
 "будет действовать согласно тому, что он там найдет:\n"
 "\n"
 " * если найден загрузочный сектор Windows, он заменит его на загрузочный\n"
-"сектор grub/LILO. Следовательно, вы сможете загружать и GNU/Linux или\n"
-"другую OS;\n"
+"сектор grub/LILO. Следовательно, вы сможете загружать и GNU/Linux и другую\n"
+"OS;\n"
 "\n"
 " * если найден boot сектор grub или LILO, он заменит его на новый.\n"
 "\n"
-"Если возникают сомнения, DrakX спросит вас куда разместить загрузчик.\n"
-"\n"
-"\"Загрузочное устройство\": в большинстве случаев вам не нужно менять\n"
-"выбранную по умолчанию опцию (\"Первый сектор диска (MBR)\"), не если вы\n"
-"желаете, загрузчик может быть установлен на второй жесткий диск\n"
-"(\"/dev/hdb\"), или даже на дискету (опция \"На дискету\")."
+"Если возникают сомнения, DrakX спросит вас куда разместить загрузчик."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -971,7 +947,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, You'll have to specify your hardware by hand.\n"
+"your hard drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -984,20 +960,20 @@ msgid ""
 "configure the driver."
 msgstr ""
 "Сначала DrakX определит любые IDE устройства, присутствующие в вашей\n"
-"системе. Также он будет проверять на наличие одной или больше PCI SCSI карт\n"
-"в системе. Если будет найдена SCSI карта, DrakX автоматически установит\n"
+"системе. Также он проверит наличие одной или больше PCI SCSI карт в\n"
+"системе. Если будет найдена SCSI карта, DrakX автоматически установит\n"
 "соответствующий драйвер.\n"
 "\n"
 "Так как обнаружение аппаратного обеспечения не всегда ошибкоустойчиво,\n"
 "DrakX может не справиться с определением ваших жестких дисков. Если это\n"
 "так, тогда вам прийдется вручную указать ему оборудование.\n"
 "\n"
-"\"Если вам пришлось вручную указать PCI SCSI адаптер, DrakX спросит вас,\n"
+"Если вам пришлось вручную указать PCI SCSI адаптер, DrakX спросит вас,\n"
 "хотите ли вы настроить его параметры. Вы должны разрешить DrakX проверить\n"
 "специфические для карты опции, которые нужны для инициализации адаптера.\n"
 "Обычно DrakX проходит этот шаг без проблем.\n"
 "\n"
-"Если DrakX не в состоянии автоматически определить какие параметры нужны\n"
+"Если DrakX не в состоянии автоматически определить, какие параметры нужны\n"
 "оборудованию, вам прийдется вручную настроить драйвер."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1014,8 +990,8 @@ msgid ""
 " * Label: this is the name you will have to type at the yaboot prompt to\n"
 "select this boot option.\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension.\n"
+" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
+"variation of vmlinux with an extension.\n"
 "\n"
 " * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
@@ -1059,7 +1035,7 @@ msgstr ""
 " * Метка: это просто название, которое вы должны будете ввести в строке\n"
 "приглашения yaboot, чтобы выбрать этот вариант загрузки;\n"
 "\n"
-" * Образ: это будет имя загружаемого ядра. Обычно vmlinux или вариант\n"
+" * Образ: это название загружаемого ядра. Обычно это vmlinux или вариант\n"
 "vmlinux с расширением.\n"
 "\n"
 " * Root: устройство \"root\" или ``/'' для установки вашего Linux;\n"
@@ -1067,7 +1043,7 @@ msgstr ""
 " * Дополнение: на оборудовании Apple опция дополнения ядра довольно часто\n"
 "используется чтобы помочь при инициализации видеооборудования или чтобы\n"
 "включить на клавиатуре эмуляцию кнопок мыши для часто отсутствующих на\n"
-"стандартных мышах Apple 2й и 3й кнопок. Вот несколько примеров:\n"
+"стандартных мышах Apple 2-й и 3-й кнопок. Вот несколько примеров:\n"
 "\n"
 "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
 "hda=autotune\n"
@@ -1090,8 +1066,8 @@ msgstr ""
 "проблематичным, вы можете выбрать эту опцию для загрузки в режиме\n"
 "``novideo'' с родной поддержкой frame buffer.\n"
 "\n"
-" * По умолчанию: выбирает этот пункт как выбор Linux по умолчанию,\n"
-"выбираемый простым нажатием на ENTER в строке приглашения yaboot. Этот\n"
+" * По умолчанию: указывает этот пункт как выбор Linux по умолчанию, который\n"
+"выбирается простым нажатием на ENTER в строке приглашения yaboot. Этот\n"
 "пункт также будет отмечен ``*'', если вы нажмете [Tab], чтобы увидеть\n"
 "варианты загрузки."
 
@@ -1102,21 +1078,20 @@ msgid ""
 "documentation, the installer and the system in general. Select first the\n"
 "region you are located in, and then the language you speak.\n"
 "\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation, thereby installing the\n"
-"language-specific files for system documentation and applications. For\n"
-"example, if you will host users from Spain on your machine, select English\n"
-"as the default language in the tree view and \"Espanol\" in the Advanced\n"
-"section.\n"
+"Clicking on the \"%s\" button will allow you to select other languages to\n"
+"be installed on your workstation, thereby installing the language-specific\n"
+"files for system documentation and applications. For example, if you will\n"
+"host users from Spain on your machine, select English as the default\n"
+"language in the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"All\n"
-"languages\" box. Selecting support for a language means translations,\n"
-"fonts, spell checkers, etc. for that language will be installed.\n"
-"Additionally, the \"Use Unicode by default\" checkbox allows to force the\n"
-"system to use unicode (UTF-8). Note however that this is an experimental\n"
-"feature. If you select different languages requiring different encoding the\n"
-"unicode support will be installed anyway.\n"
+"may choose several ones, or even install them all by selecting the \"%s\"\n"
+"box. Selecting support for a language means translations, fonts, spell\n"
+"checkers, etc. for that language will be installed. Additionally, the\n"
+"\"%s\" checkbox allows you to force the system to use unicode (UTF-8). Note\n"
+"however that this is an experimental feature. If you select different\n"
+"languages requiring different encoding the unicode support will be\n"
+"installed anyway.\n"
 "\n"
 "To switch between the various languages installed on the system, you can\n"
 "launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
@@ -1127,21 +1102,20 @@ msgstr ""
 "инсталлятор и систему в целом. Выберите сначала регион, в котором вы\n"
 "находитесь, затем язык на котором вы говорите.\n"
 "\n"
-"По нажатию на кнопку \"Дополнительно\" вы сможете выбрать другие языки,\n"
-"которые можно установить на вашей рабочей станции, установив таким образом\n"
+"По нажатию на кнопку \"%s\" вы сможете выбрать другие языки, которые можно\n"
+"установить на вашей рабочей станции. Таким образом будут установлены\n"
 "имеющие отношение к языку файлы системной документации и приложения.\n"
 "Например, если у вас в системе будут работать пользователи из Испании,\n"
-"выберите в дереве English как основной, и \"EspaЯol\" в дополнительном\n"
-"разделе.\n"
+"выберите в дереве English как основной, и \"%s\" в дополнительном разделе.\n"
 "\n"
 "Заметим, что вы не ограничены в выборе дополнительных языков. Вы можете\n"
 "выбрать сколько угодно дополнительных языков, даже установить все языки,\n"
-"отметив пункт \"Все языки\". Выбор поддержки языка означает наличие\n"
-"переводов, шрифтов, проверку орфографии и т.д. для установленных языков.\n"
-"Кроме того, вы можете выбрать пункт \"Использовать по умолчанию Unicode\",\n"
-"который заставит систему использовать Юникод (UTF-8). Однако, имейте в виду\n"
-"что это экспериментальная возможность. Если вы выберете другой язык,\n"
-"требующий другой кодировки, поддержка Юникод будет все равно установлена.\n"
+"отметив пункт \"%s\". Выбор поддержки языка означает наличие переводов,\n"
+"шрифтов, проверку орфографии и т.д. для установленных языков. Кроме того,\n"
+"вы можете выбрать пункт \"%s\", который заставит систему использовать\n"
+"Юникод (UTF-8). Однако имейте в виду, что это экспериментальная\n"
+"возможность. Если вы выберете другой язык, требующий другой кодировки,\n"
+"поддержка Юникод будет все равно установлена.\n"
 "\n"
 "Для переключения между различными установленными языками в вашей системе вы\n"
 "можете запускать команду \"/usr/sbin/localedrake\" с правами \"root\",\n"
@@ -1152,14 +1126,14 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"\"Sound card\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver."
+"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
+"If you notice the sound card displayed is not the one that is actually\n"
+"present on your system, you can click on the button and choose another\n"
+"driver."
 msgstr ""
-"\"Звуковая карта\": если в вашей системе найдена звуковая карты, здесь это\n"
-"будет показано. Если вы увидите, что показанная звуковая карта не\n"
-"соответствует тому, что у вас есть в системе, вы можете нажать на кнопку и\n"
+"\"%s\": если в вашей системе найдена звуковая карта, здесь это будет\n"
+"показано. Если вы увидите, что показанная звуковая карта не соответствует\n"
+"тому, что у вас реально есть в системе, вы можете нажать на кнопку и\n"
 "выбрать другой драйвер."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1170,9 +1144,9 @@ msgid ""
 "\n"
 "If there are other operating systems installed on your machine they will\n"
 "automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
-"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
-"your changes.\n"
+"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
+"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
+"changes.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
 "anyone who goes to the console and reboots the machine. You can delete the\n"
@@ -1180,15 +1154,15 @@ msgid ""
 "bootloader menu, but you will need a boot disk in order to boot those other\n"
 "operating systems!"
 msgstr ""
-"После того, как вы закончили настройку основных параметров загрузчика, на\n"
+"После того, как вы завершите настройку основных параметров загрузчика, на\n"
 "экране появится список параметров загрузки, которые будут доступны во время\n"
 "старта.\n"
 "\n"
 "Если на вашей машине установлены другие операционные системы, они\n"
 "автоматически будут добавлены в меню загрузки. Здесь вы можете сделать\n"
-"дополнительные настройки существующих параметров, выбрав \"Добавить\" для\n"
-"создания нового пункта; выбрать пункт и нажать \"Изменить\" или \"Удалить\"\n"
-"для изменения или удаления. Кнопка \"OK\" подтвердит ваши изменения.\n"
+"дополнительные настройки существующих параметров, выбрав \"%s\" для\n"
+"создания нового пункта; выбрав пункт и нажав \"%s\" или \"%s\" для\n"
+"изменения или удаления. Кнопка \"%s\" подтвердит ваши изменения.\n"
 "\n"
 "Вы можете сделать так, чтобы никто другой не мог получить доступа к\n"
 "остальным операционным системам. В таком случае вы можете удалить\n"
@@ -1199,8 +1173,8 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Mandrake Linux partition. Be careful, all data present on this partition\n"
+"will be lost and will not be recoverable!"
 msgstr ""
 "Выберите жесткий диск, который нужно очистить для инсталляции вашего нового\n"
 "раздела Mandrake Linux. Будьте осторожны, все данные на нем будут потеряны\n"
@@ -1209,30 +1183,31 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"\"Printer\": clicking on the \"Configure\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation."
+"\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
+"wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
+"information on how to setup a new printer. The interface presented there is\n"
+"similar to the one used during installation."
 msgstr ""
-"\"Принтер\": по нажатию на кнопку \"Настройка\" откроется мастер настройки\n"
-"принтера. Прочитайте соответствующую главу в книге ``Стартовое руководство\n"
+"\"%s\": по нажатию на кнопку \"%s\" откроется мастер настройки принтера.\n"
+"Прочитайте соответствующую главу в книге ``Стартовое руководство\n"
 "пользователя'', чтобы узнать как установить новый принтер. Представленный\n"
 "там интерфейс подобен используемому в процессе установки."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
+"Options\n"
+"\n"
+"   Here you can choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"%s\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
 msgstr ""
 "Параметры\n"
 "\n"
 "   Здесь вы можете настроить вашу машину на автоматическую загрузку в\n"
-"графическом интерфейсе. Очевидно, что вам следует выбрать \"Нет\", если\n"
-"ваша машина будет работать в качестве сервера или вам не удалось настроить\n"
+"графическом интерфейсе. Очевидно, что вам следует выбрать \"%s\", если ваша\n"
+"машина будет работать в качестве сервера или вам не удалось настроить\n"
 "графический режим."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1241,7 +1216,7 @@ msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"Пожалуйста, выберите правильный порт Например, порт \"COM1\" под Windows\n"
+"Пожалуйста, выберите правильный порт. Например, порт \"COM1\" под Windows\n"
 "называется \"ttyS0\" под GNU/Linux."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1253,12 +1228,12 @@ msgid ""
 "directly exposed to the Internet. The trade-off of a higher security level\n"
 "is generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, keep the default option."
+"If you do not know what to choose, stay with the default option."
 msgstr ""
 "На этом этапе DrakX позволит вам выбрать для машины желаемый уровень\n"
 "безопасности. Как правило, уровень безопасности должен быть выше, если на\n"
 "машине содержатся критические данные или машина непосредственно подключена\n"
-"к Интернет. Однако, более высокий уровень безопасности в общем случае\n"
+"к Интернет. Однако, более высокий уровень безопасности, в общем случае,\n"
 "достигается в обмен на удобство использования.\n"
 "\n"
 "Если вы не знаете что выбрать, оставьте выбор по умолчанию."
@@ -1266,141 +1241,139 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"As a review, DrakX will present a summary of various information it has\n"
-"about your system. Depending on your installed hardware, you may have some\n"
-"or all of the following entries. Each entry is made up of the configuration\n"
-"item to be configured, followed by a quick summary of the current\n"
-"configuration. Click on the corresponding \"Configure\" button to change\n"
-"that.\n"
+"As a review, DrakX will present a summary of information it has about your\n"
+"system. Depending on your installed hardware, you may have some or all of\n"
+"the following entries. Each entry is made up of the configuration item to\n"
+"be configured, followed by a quick summary of the current configuration.\n"
+"Click on the corresponding \"%s\" button to change that.\n"
 "\n"
-" * \"Keyboard\": check the current keyboard map configuration and change\n"
-"that if necessary.\n"
+" * \"%s\": check the current keyboard map configuration and change that if\n"
+"necessary.\n"
 "\n"
-" * \"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list.\n"
+" * \"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list.\n"
 "\n"
-" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
-"country you have chosen. You can click on the \"Configure\" button here if\n"
-"this is not correct.\n"
+" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+"you have chosen. You can click on the \"%s\" button here if this is not\n"
+"correct.\n"
 "\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary.\n"
+" * \"%s\": check the current mouse configuration and click on the button to\n"
+"change it if necessary.\n"
 "\n"
-" * \"Printer\": clicking on the \"Configure\" button will open the printer\n"
+" * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
 "presented there is similar to the one used during installation.\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
-"displayed here. If you notice the sound card displayed is not the one that\n"
-"is actually present on your system, you can click on the button and choose\n"
+" * \"%s\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
 "another driver.\n"
 "\n"
-" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
-"interface in \"800x600\" or \"1024x768\" resolution. If that does not suits\n"
-"you, click on \"Configure\" to reconfigure your graphical interface.\n"
+" * \"%s\": by default, DrakX configures your graphical interface in\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. If you have a TV card and it is not detected, click on \"Configure\"\n"
-"to try to configure it manually.\n"
+" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
+"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
+"configure it manually.\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on \"Configure\" to change the parameters\n"
-"associated with the card.\n"
+" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
+"here. You can click on \"%s\" to change the parameters associated with the\n"
+"card.\n"
 "\n"
-" * \"Network\": If you want to configure your Internet or local network\n"
-"access now.\n"
+" * \"%s\": If you want to configure your Internet or local network access\n"
+"now.\n"
 "\n"
-" * \"Security Level\": this entry offers you to redefine the security level\n"
-"as set in a previous step ().\n"
+" * \"%s\": this entry allows you to redefine the security level as set in a\n"
+"previous step ().\n"
 "\n"
-" * \"Firewall\": if you plan to connect your machine to the Internet, it's\n"
-"a good idea to protect you from intrusions by setting up a firewall.\n"
-"Consult the corresponding section of the ``Starter Guide'' for details\n"
-"about firewall settings.\n"
+" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
+"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
+"the corresponding section of the ``Starter Guide'' for details about\n"
+"firewall settings.\n"
 "\n"
-" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
-"click that button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click that\n"
+"button. This should be reserved to advanced users.\n"
 "\n"
-" * \"Services\": you'll be able here to control finely which services will\n"
-"be run on your machine. If you plan to use this machine as a server it's a\n"
-"good idea to review this setup."
+" * \"%s\": here you'll be able to fine control which services will be run\n"
+"on your machine. If you plan to use this machine as a server it's a good\n"
+"idea to review this setup."
 msgstr ""
 "В качестве обзора DrakX представит сводку имеющейся у него различной\n"
 "информации о вашей системе. В зависимости от установленного у вас\n"
-"оборудования вы можете увидеть все или некоторые из следующих пунктов.\n"
+"оборудования, вы можете увидеть все или некоторые из следующих пунктов.\n"
 "Каждый пункт состоит из конфигурационных элементов для настройки,\n"
 "сопровождаемых небольшой сводкой о текущей конфигурации. Нажмите на\n"
-"соответствующую кнопку \"Настройка\", чтобы изменить настройки.\n"
+"соответствующую кнопку \"%s\", чтобы изменить настройки.\n"
 "\n"
-" * \"Клавиатура\": проверьте текущую настройку раскладки клавиатуры и\n"
-"сделайте поправку если необходимо.\n"
+" * \"%s\": проверьте текущую настройку раскладки клавиатуры и сделайте\n"
+"поправку если необходимо.\n"
 "\n"
-" * \"Страна\": проверьте текущий выбор страны Если вы находитесь не в этой\n"
-"стране, нажмите на кнопку \"Настройка\" и выберите другую. Если ваша страна\n"
-"не присутствует в первом показанном списке, нажмите кнопку \"Больше\",\n"
-"чтобы увидеть полный список.\n"
+" * \"%s\": проверьте текущий выбор страны Если вы находитесь не в этой\n"
+"стране, нажмите на кнопку \"%s\" и выберите другую. Если ваша страна не\n"
+"присутствует в первом показанном списке, нажмите кнопку \"%s\", чтобы\n"
+"увидеть полный список.\n"
 "\n"
-" * \"Часовой пояс\": По умолчанию, DrakX выбирает часовой пояс, основываясь\n"
-"на выбранной вами стране. Вы можете здесь нажать на кнопку \"Настройка\",\n"
-"если выбранное неверно.\n"
+" * \"%s\": По умолчанию, DrakX выбирает часовой пояс, основываясь на\n"
+"выбранной вами стране. Вы можете здесь нажать на кнопку \"%s\", если\n"
+"выбранное неверно.\n"
 "\n"
-" * \"Мышь\": проверьте текущую конфигурацию мыши и нажмите на кнопку если\n"
+" * \"%s\": проверьте текущую конфигурацию мыши и нажмите на кнопку, если\n"
 "необходимо что-либо изменить.\n"
 "\n"
-" * \"Принтер\": по нажатию на кнопку \"Настройка\" откроется мастер\n"
-"настройки принтера. Прочитайте соответствующую главу в книге ``Стартовое\n"
-"руководство пользователя'', чтобы узнать как установить новый принтер.\n"
-"Представленный там интерфейс подобен используемому в процессе установки.\n"
+" * \"%s\": по нажатию на кнопку \"%s\" откроется мастер настройки принтера.\n"
+"Прочитайте соответствующую главу в книге ``Стартовое руководство\n"
+"пользователя'', чтобы узнать как установить новый принтер. Представленный\n"
+"там интерфейс подобен используемому в процессе установки.\n"
 "\n"
-" * \"Звуковая карта\": если в вашей системе найдена звуковая карты, здесь\n"
-"это будет показано. Если вы увидите, что показанная звуковая карта не\n"
-"соответствует тому, что у вас есть в системе, вы можете нажать на кнопку и\n"
+" * \"%s\": если в вашей системе найдена звуковая карта, здесь это будет\n"
+"показано. Если вы увидите, что показанная звуковая карта не соответствует\n"
+"тому, что у вас реально есть в системе, вы можете нажать на кнопку и\n"
 "выбрать другой драйвер.\n"
 "\n"
-" * \"Графический интерфейс\": по умолчанию, DrakX настраивает ваш\n"
-"графический интерфейс на разрешение \"800x600\" или \"1024x768\". Если вас\n"
-"это не устраивает, нажмите \"Настройка\" для перенастройки вашего\n"
-"графического интерфейса.\n"
+" * \"%s\": по умолчанию DrakX настраивает ваш графический интерфейс на\n"
+"разрешение \"800x600\" или \"1024x768\". Если вас это не устраивает,\n"
+"нажмите \"%s\" для внесения изменений в конфигурацию вашего графического\n"
+"интерфейса.\n"
 "\n"
-" * \"TV карта\": если в вашей системе была обнаружена TV карта, она будет\n"
-"здесь показана. Если у вас есть TV карта, но она не была определена,\n"
-"нажмите на кнопку \"Настройка\" и попробуйте настроить ее вручную.\n"
+" * \"%s\": если в вашей системе была обнаружена TV карта, она будет здесь\n"
+"показана. Если у вас есть TV карта, но она не была определена, нажмите на\n"
+"кнопку \"%s\" и попробуйте настроить ее вручную.\n"
 "\n"
-" * \"ISDN-карта\": если в вашей системе обнаружена ISDN-карта, она будет\n"
-"здесь показана. Вы можете нажать на кнопку \"Настройка\" для изменения\n"
-"связанных с ней параметров.\n"
+" * \"%s\": если в вашей системе обнаружена ISDN-карта, она будет здесь\n"
+"показана. Вы можете нажать на кнопку \"%s\" для изменения связанных с ней\n"
+"параметров.\n"
 "\n"
-" * \"Сеть\": если вы хотите настроить доступ в Интернет или локальную сеть\n"
+" * \"%s\": если вы хотите настроить доступ в Интернет или локальную сеть\n"
 "прямо сейчас, вы можете сделать это, нажав на эту кнопку.\n"
 "\n"
-" * \"Уровень безопасности\": этот пункт предлагает вам переопределить\n"
-"уровень безопасности, как это делалось на предыдущем шаге ().\n"
+" * \"%s\": этот пункт предлагает вам переопределить уровень безопасности,\n"
+"как это делалось на предыдущем шаге ().\n"
 "\n"
-" * \"Файервол\": если вы собираетесь подключать вашу машину к Интернет,\n"
-"неплохой идеей будет защитить себя от вторжений извне, установив файервол.\n"
+" * \"%s\": если вы собираетесь подключать вашу машину к Интернет, неплохой\n"
+"идеей будет защитить себя от вторжений извне, установив файервол.\n"
 "Прочитайте соответствующий раздел книги ``Стартовое руководство\n"
 "пользователя'', где описаны детали настройки файервола.\n"
 "\n"
-" * \"Начальный загрузчик\": если вы желаете изменить конфигурацию\n"
-"начального загрузчика, нажмите эту кнопку. Эта опция предназначена для\n"
-"опытных пользователей.\n"
+" * \"%s\": если вы желаете изменить конфигурацию начального загрузчика,\n"
+"нажмите эту кнопку. Эта опция предназначена для опытных пользователей.\n"
 "\n"
-" * \"Сервисы\": здесь вы сможете проконтролировать какие сервисы будут\n"
-"запущены на вашей машине. Если ваша машина будет сервером, вам стоит\n"
-"проверить эти установки."
+" * \"%s\": здесь вы сможете проконтролировать какие сервисы будут запущены\n"
+"на вашей машине. Если ваша машина будет сервером, вам стоит проверить эти\n"
+"установки."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "В случае, когда для вашей карты доступны различные сервера, с 3D ускорением\n"
-"и без, вам предложат выбрать какой сервер больше соответствует вашим\n"
+"и без, вам предложат выбрать, какой сервер больше соответствует вашим\n"
 "потребностям."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1414,7 +1387,7 @@ msgid ""
 "a PS/2, serial or USB interface.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
-"from the provided list.\n"
+"from the list provided.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
@@ -1425,18 +1398,18 @@ msgid ""
 "Wheel mice are occasionally not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
-"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
-"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
-"the buttons and check that the mouse pointer moves on-screen as you move\n"
-"your mouse."
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
 msgstr ""
 "Обычно у DrakX не возникает проблем с определением количества кнопок вашей\n"
-"мыши. Если все-таки это не получается, тогда он рассматривает вашу мышь как\n"
-"двух-кнопочную и настроит эмуляцию трех кнопок. Третья кнопка двухкнопочной\n"
-"мыши может быть ``нажата'' одновременным нажатием на левую и правую кнопку.\n"
-"DrakX автоматически узнает какой интерфейс использует ваша мышь: PS/2,\n"
-"serial или USB.\n"
+"мыши. Если все-таки это не получается, тогда он будет рассматривать вашу\n"
+"мышь как двух-кнопочную и настроит эмуляцию трех кнопок. Третья кнопка\n"
+"двухкнопочной мыши может быть ``нажата'' одновременным нажатием на левую и\n"
+"правую кнопку. DrakX автоматически узнает, какой интерфейс использует ваша\n"
+"мышь: PS/2, serial или USB.\n"
 "\n"
 "Если по каким-либо причинам вы желаете указать другой тип мыши, выберите\n"
 "нужную из предоставленного списка.\n"
@@ -1447,24 +1420,24 @@ msgstr ""
 "себя неверно, нажмите пробел или клавишу [Return], чтобы отменить\n"
 "тестирование и вернуться к списку мышей.\n"
 "\n"
-"Мышь с колесиками иногда автоматически не определяются. В этом случае вам\n"
+"Мыши с колесиками иногда автоматически не определяются. В этом случае вам\n"
 "прийдется выбрать свою мышь из списка. Проверьте, что вы правильно выбрали\n"
-"порт подключения мыши. Когда быдет выбрана мышь и нажата кнопка \"Далее\n"
-"->\", появится картинка с изображением мыши. Покрутите колесико мыши для\n"
-"проверки того, что все работает правильно. Как только вы увидите, что\n"
-"колесико на экране движется синхронно с движениями настоящего колесика,\n"
-"проверьте работу кнопок и движение курсора, который должен двигаться по\n"
-"экрану соответственно вашим перемещениям мыши."
+"порт подключения мыши. Когда будет выбрана мышь и нажата кнопка \"%s\",\n"
+"появится картинка с изображением мыши. Покрутите колесико мыши для проверки\n"
+"того, что все работает правильно. Как только вы увидите, что колесико на\n"
+"экране движется синхронно с движениями настоящего колесика, проверьте\n"
+"работу кнопок и движение курсора, который должен двигаться по экрану\n"
+"соответственно вашим перемещениям мыши."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"Next\n"
-"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
-"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
-"also choose not to configure the network, or to do it later, in which case\n"
-"clicking the \"Cancel\" button will take you to the next step.\n"
+"connect your computer to the Internet or to a local network, click \"%s\".\n"
+"Mandrake Linux will attempt to autodetect network devices and modems. If\n"
+"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
+"configure the network, or to do it later, in which case clicking the \"%s\"\n"
+"button will take you to the next step.\n"
 "\n"
 "When configuring your network, the available connections options are:\n"
 "traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
@@ -1480,11 +1453,11 @@ msgid ""
 msgstr ""
 "Теперь у вас есть возможность настроить ваше соединение Интернет/сеть. Если\n"
 "вы хотите подключить ваш компьютер к Интернет или локальной сети, нажмите\n"
-"\"Далее ->\". Mandrake Linux попытается автоматически определить сетевые\n"
+"\"%s\". Mandrake Linux попытается автоматически определить сетевые\n"
 "устройства и модемы. Если автоопределение не пройдет, снимите выбор с опции\n"
-"\"Использовать автоопределение\". Кроме того, вы можете не выбирать\n"
-"настройку сети или сделать это потом. В этом случае просто нажмите кнопку\n"
-"\"Отмена\", чтобы перейти к следующему шагу.\n"
+"\"%s\". Кроме того, вы можете не выбирать настройку сети или сделать это\n"
+"потом. В этом случае просто нажмите кнопку \"%s\", чтобы перейти к\n"
+"следующему шагу.\n"
 "\n"
 "Для настройки сети вам доступны следующие опции соединений: традиционный\n"
 "модем, ISDN модем, ADSL соединение, кабельный модем, и ,наконец, просто LAN\n"
@@ -1496,8 +1469,8 @@ msgstr ""
 "услуг Интернет (Internet Service Provider) или системным администратором.\n"
 "\n"
 "Вы можете ознакомиться с деталями настройки в главе о соединениях Интернет\n"
-"в ``Стартовое руководство пользователя'', или просто подождать, пока ваша\n"
-"система будет установлена и использовать описанную в этом руководстве\n"
+"в книге ``Стартовое руководство пользователя'', или просто подождать, пока\n"
+"ваша система будет установлена и использовать описанную в этом руководстве\n"
 "программу для настройки соединения."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1505,26 +1478,25 @@ msgstr ""
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
 "covers the entire Mandrake Linux distribution. If you do agree with all the\n"
-"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
-"computer."
+"terms in it, check the \"%s\" box. If not, simply turn off your computer."
 msgstr ""
 "Прежде чем продолжить, вы должны внимательно прочитать условия лицензии.\n"
 "Лицензия распространяется на весь дистрибутив Mandrake Linux. Если вы\n"
-"согласны со всеми условиями лицензии, отметьте пункт \"Принять\". Если нет\n"
-"- просто выключите свой компьютер."
+"согласны со всеми условиями лицензии, отметьте пункт \"%s\". Если нет -\n"
+"просто выключите свой компьютер."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Graphic Card\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
+"   The installer will normally automatically detect and configure the\n"
 "graphic card installed on your machine. If it is not the case, you can\n"
-"choose in this list the card you actually own.\n"
+"choose from this list the card you actually have installed.\n"
 "\n"
 "   In the case that different servers are available for your card, with or\n"
-"without 3D acceleration, you are then proposed to choose the server that\n"
-"best suits your needs."
+"without 3D acceleration, you are then asked to choose the server that best\n"
+"suits your needs."
 msgstr ""
 "Видеокарта\n"
 "\n"
@@ -1533,7 +1505,7 @@ msgstr ""
 "списке карту, которая у вас действительно установлена.\n"
 "\n"
 "   В случае, когда для вашей карты доступны различные сервера, с 3D\n"
-"ускорением и без, вам предложат выбрать какой сервер больше соответствует\n"
+"ускорением и без, вам предложат выбрать, какой сервер больше соответствует\n"
 "вашим потребностям."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -1543,8 +1515,8 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not always needed at\n"
-"boot time.\n"
+"Review each one carefully and uncheck those which are not needed at boot\n"
+"time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
 "selected. However, if you are not sure whether a service is useful or not,\n"
@@ -1577,9 +1549,9 @@ msgstr ""
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer can normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is not the case, you can choose in\n"
-"this list the monitor you actually own."
+"   The installer will normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is correct, you can choose from\n"
+"this list the monitor you actually have connected to your computer."
 msgstr ""
 "Монитор\n"
 "\n"
@@ -1593,35 +1565,34 @@ msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
 "motherboard is set to local time, you may deactivate this by unselecting\n"
-"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
-"system clock and the hardware clock are in the same timezone. This is\n"
-"useful when the machine also hosts another operating system like Windows.\n"
-"\n"
-"The \"Automatic time synchronization \" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. For this\n"
-"feature to work, you must have a working Internet connection. It is best to\n"
-"choose a time server located near you. This option actually installs a time\n"
-"server that can used by other machines on your local network."
+"\"%s\", which will let GNU/Linux know that the system clock and the\n"
+"hardware clock are in the same timezone. This is useful when the machine\n"
+"also hosts another operating system like Windows.\n"
+"\n"
+"The \"%s\" option will automatically regulate the clock by connecting to a\n"
+"remote time server on the Internet. For this feature to work, you must have\n"
+"a working Internet connection. It is best to choose a time server located\n"
+"near you. This option actually installs a time server that can used by\n"
+"other machines on your local network as well."
 msgstr ""
 "GNU/Linux управляет временем в GMT (Greenwich Mean Time) и транслирует его\n"
 "в локальное согласно выбранного вами часового пояса. Если часы на вашей\n"
 "материнской плате установлены в локальное время, вы можете деактивировать\n"
-"это, убрав выбор \"Аппаратные часы выставлены по GMT\", что позволит\n"
-"GNU/Linux помнить, что системные часы и аппаратные часы принадлежат разным\n"
-"часовым поясам. Это полезно в случае, когда на машине размещена другая\n"
-"операционная система типа Windows.\n"
-"\n"
-"Опция \"Автоматическая синхронизация времени\" будет автоматически\n"
-"подстраивать часы, соединяясь с удаленным сервером в Интернет. Естественно,\n"
-"чтобы это работало, вам необходимо соединение с Интернет. Лучше всего\n"
-"выбрать ближайший к вам сервер времени. Эта опция устанавливает на вашу\n"
-"машину сервер времени, который опционально может использоваться другими\n"
-"машинами в вашей локальной сети."
+"это, убрав выбор \"%s\", что позволит GNU/Linux помнить, что системные часы\n"
+"и аппаратные часы принадлежат разным часовым поясам. Это полезно в случае,\n"
+"когда на машине размещена другая операционная система типа Windows.\n"
+"\n"
+"Опция \"%s\" позволит автоматически подстраивать часы, соединяясь с\n"
+"удаленным сервером в Интернет. Естественно, чтобы это работало, вам\n"
+"необходимо соединение с Интернет. Лучше всего выбрать ближайший к вам\n"
+"сервер времени. Эта опция устанавливает на вашу машину сервер времени,\n"
+"который опционально может использоваться другими машинами в вашей локальной\n"
+"сети."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"Here are Listed the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -1656,29 +1627,28 @@ msgstr ""
 "потому что это хорошо подходит для большинства обычных инсталляций. Если вы\n"
 "делаете какие-либо изменения, вы должны определить как минимум раздел root\n"
 "(\"/\"). Не делайте его слишком маленьким, иначе вы не сможете\n"
-"инсталлировать достаточно программного обеспечения. Если вы хотите хранить\n"
-"данные на другом разделе, вам также прийдется создать раздел \"/home\"\n"
-"(возможно только при наличии более чем одного раздела Linux).\n"
+"инсталлировать достаточное количество программного обеспечения. Если вы\n"
+"хотите хранить данные на другом разделе, вам также прийдется создать раздел\n"
+"\"/home\" (возможно только при наличии более чем одного раздела Linux).\n"
 "\n"
-"Каждый раздел перечислен следующим образом: : \"Name\"(название),\n"
-"\"Capacity\"(размер).\n"
+"Каждый раздел перечислен следующим образом: : \"Название\", \"Размер\".\n"
 "\n"
-"\"Name\" разделяется на: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (например, \"hda1\").\n"
+"\"Название\" разделяется на: \"тип жесткого диска\", \"номер жесткого\n"
+"диска\", \"номер раздела\" (например, \"hda1\").\n"
 "\n"
 "\"Hard drive type\" это \"hd\", если ваш жесткий диск IDE и \"sd\", если он\n"
 "SCSI.\n"
 "\n"
-"\"Hard drive number\" это всегда буква после \"hd\" или \"sd\". Для жестких\n"
-"дисков IDE:\n"
+"\"Номер жесткого диска\" всегда является буквой после \"hd\" или \"sd\".\n"
+"Для жестких дисков IDE:\n"
 "\n"
-" * \"a\" означает \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" означает \"master жесткий диск на первичном IDE контроллере\";\n"
 "\n"
-" * \"b\" означает \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" означает \"slave жесткий диск на первичном IDE контроллере\";\n"
 "\n"
-" * \"c\" означает \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" означает \"master жесткий диск на вторичном IDE контроллере\";\n"
 "\n"
-" * \"d\" означает \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" означает \"slave жесткий диск на вторичном IDE контроллере\".\n"
 "\n"
 "Для жестких дисков SCSI, \"a\" означает \"lowest SCSI ID\", а \"b\"\n"
 "означает \"second lowest SCSI ID\", и т.д."
@@ -1686,15 +1656,15 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
-"\"Country\": check the current country selection. If you are not in this\n"
-"country, click on the \"Configure\" button and choose another one. If your\n"
-"country is not in the first list shown, click the \"More\" button to get\n"
-"the complete country list."
+"\"%s\": check the current country selection. If you are not in this\n"
+"country, click on the \"%s\" button and choose another one. If your country\n"
+"is not in the first list shown, click the \"%s\" button to get the complete\n"
+"country list."
 msgstr ""
-"\"Страна\": проверьте текущий выбор страны Если вы находитесь не в этой\n"
-"стране, нажмите на кнопку \"Настройка\" и выберите другую. Если ваша страна\n"
-"не присутствует в первом показанном списке, нажмите кнопку \"Больше\",\n"
-"чтобы увидеть полный список."
+"\"%s\": проверьте текущий выбор страны Если вы находитесь не в этой стране,\n"
+"нажмите на кнопку \"%s\" и выберите другую. Если ваша страна не\n"
+"присутствует в первом показанном списке, нажмите кнопку \"%s\", чтобы\n"
+"увидеть полный список."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -1716,51 +1686,52 @@ msgid ""
 "the selected partitions will be deleted and you will not be able to recover\n"
 "it.\n"
 "\n"
-"Click on \"Next ->\" when you are ready to format partitions.\n"
+"Click on \"%s\" when you are ready to format partitions.\n"
 "\n"
-"Click on \"<- Previous\" if you want to choose another partition for your\n"
-"new Mandrake Linux operating system installation.\n"
+"Click on \"%s\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
+"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"bad blocks on the disk."
 msgstr ""
 "Все вновь созданные разделы должны быть отформатированы для того, чтобы их\n"
-"использовать (форматирование означает создание файловой системы).\n"
+"можно было использовать (форматирование означает создание файловой\n"
+"системы).\n"
 "\n"
 "На этом этапе у вас есть возможность переформатировать уже существующие\n"
 "разделы, чтобы стереть все данные, которые они содержат. Если вам это\n"
 "нужно, тогда выберите и эти разделы.\n"
 "\n"
-"Пожалуйста имейте в виду, что нет необходимости переформатировать все\n"
+"Пожалуйста, имейте в виду, что нет необходимости переформатировать все\n"
 "существовавшие ранее разделы. Вы должны переформатировать разделы,\n"
 "содержащие операционную систему (такие как \"/\", \"/usr\" или \"/var\"),\n"
-"но вы не переформатировать разделы, на которых содержатся данные, которые\n"
-"вы хотели бы сохранить (обычно это \"/home\").\n"
+"но вам не обязательно форматировать разделы, на которых содержатся данные,\n"
+"которые вы хотели бы сохранить (обычно это \"/home\").\n"
 "\n"
 "Пожалуйста, будьте осторожны при выборе разделов. После форматирования все\n"
 "данные на выбранных разделах будут удалены и вы не сможете их восстановить.\n"
 "\n"
-"Нажмите \"Далее ->\" когда будете готовы начать форматирование.\n"
+"Нажмите \"%s\", когда будете готовы начать форматирование.\n"
 "\n"
-"Нажмите \"<- Назад\", если вы хотите выбрать другой раздел для инсталляции\n"
+"Нажмите \"%s\", если вы хотите выбрать другой раздел для инсталляции\n"
 "Mandrake Linux.\n"
 "\n"
-"Нажмите \"Дополнительно\", если хотите выбрать разделы, которые следует\n"
-"проверить на сбойные блоки (bad blocks)."
+"Нажмите \"%s\", если хотите выбрать разделы, которые следует проверить на\n"
+"сбойные блоки (bad blocks)."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "Depending on the default language you chose in Section , DrakX will\n"
 "automatically select a particular type of keyboard configuration. However,\n"
-"you might not have a keyboard that corresponds exactly to your language:\n"
-"for example, if you are an English speaking Swiss person, you may have a\n"
-"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
-"find yourself in the same situation where your native language and keyboard\n"
-"do not match. In either case, this installation step will allow you to\n"
-"select an appropriate keyboard from a list.\n"
-"\n"
-"Click on the \"More \" button to be presented with the complete list of\n"
+"you may not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may have a Swiss\n"
+"keyboard. Or if you speak English but are located in Quebec, you may find\n"
+"yourself in the same situation where your native language and keyboard do\n"
+"not match. In either case, this installation step will allow you to select\n"
+"an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"%s\" button to be presented with the complete list of\n"
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
@@ -1770,13 +1741,13 @@ msgstr ""
 "В зависимости от языка по умолчанию, который вы выбрали в разделе , DrakX\n"
 "автоматически подберет определенную конфигурацию клавиатуры. Однако, у вас\n"
 "может и не быть клавиатуры, которая точно соответствует вашему языку:\n"
-"например, если швейцарец, говорящий по-английски, у вас может быть\n"
+"например, если вы швейцарец, говорящий по-английски, у вас может быть\n"
 "швейцарская клавиатура. Или вы говорите по-английски, но живете в Квебеке,\n"
-"вы можете попасть в подобную в ситуацию, когда ваш родной язык и клавиатура\n"
-"не совпадают. В любом случае, этот шаг установки позволит вам выбрать\n"
-"подходящую клавиатуру из списка.\n"
+"тогда вы можете попасть в подобную в ситуацию, когда ваш родной язык и\n"
+"клавиатура не совпадают. В любом случае, этот шаг установки позволит вам\n"
+"выбрать подходящую клавиатуру из списка.\n"
 "\n"
-"Нажмите кнопку \"Больше\" чтобы получить полный список поддерживаемых\n"
+"Нажмите кнопку \"%s\" чтобы получить полный список поддерживаемых\n"
 "клавиатур.\n"
 "\n"
 "Если вы выбираете раскладку клавиатуры, основанную на не-латинском\n"
@@ -1787,65 +1758,64 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"Reboot\" to reboot the system. The first thing\n"
-"you should see after your computer has finished doing its hardware tests is\n"
-"the bootloader menu, giving you the choice of which operating system to\n"
-"start.\n"
+"ready to use. Just click \"%s\" to reboot the system. The first thing you\n"
+"should see after your computer has finished doing its hardware tests is the\n"
+"bootloader menu, giving you the choice of which operating system to start.\n"
 "\n"
-"The \"Advanced\" button shows two more buttons to:\n"
+"The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"that will automatically perform a whole installation without the help of an\n"
-"operator, similar to the installation you just configured.\n"
+" * \"%s\": to create an installation floppy disk that will automatically\n"
+"perform a whole installation without the help of an operator, similar to\n"
+"the installation you just configured.\n"
 "\n"
 "   Note that two different options are available after clicking the button:\n"
 "\n"
-"    * \"Replay\". This is a partially automated installation. The\n"
-"partitioning step is the only interactive procedure.\n"
+"    * \"%s\". This is a partially automated installation. The partitioning\n"
+"step is the only interactive procedure.\n"
 "\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
+"    * \"%s\". Fully automated installation: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
 "   This feature is very handy when installing a number of similar machines.\n"
 "See the Auto install section on our web site for more information.\n"
 "\n"
-" * \"Save packages selection\"(*): saves a list of the package selected in\n"
-"this installation. To use this selection with another installation, insert\n"
-"the floppy and start the installation. At the prompt, press the [F1] key\n"
-"and type >>linux defcfg=\"floppy\" <<.\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key and type >>linux\n"
+"defcfg=\"floppy\" <<.\n"
 "\n"
 "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
 "\"mformat a:\")"
 msgstr ""
-"И вот вы здесь. Инсталляция теперь завершена и ваша система GNU/Linux\n"
-"готова к использованию. Просто нажмите \"Далее ->\", чтобы перезагрузить\n"
-"систему. Первое, что вы увидите после того, как ваш компьютер закончит\n"
-"тестирование оборудования, это меню начального загрузчика, предоставляющее\n"
-"вам выбор какую операционную систему загрузить.\n"
+"И вот вы здесь. Инсталляция завершена и ваша система GNU/Linux готова к\n"
+"использованию. Просто нажмите \"%s\", чтобы перезагрузить систему. Первое,\n"
+"что вы увидите после того, как ваш компьютер закончит тестирование\n"
+"оборудования, это меню начального загрузчика, предоставляющее вам выбор\n"
+"какую операционную систему загрузить.\n"
 "\n"
-"Кнопка \"Дополнительно\" откроет еще две кнопки:\n"
+"Кнопка \"%s\" откроет еще две кнопки:\n"
 "\n"
-" * \"Создать дискету автоматической установки\": чтобы создать\n"
-"инсталляционную дискету, с помощью которой можно автоматически провести\n"
-"инсталляцию, подобную только что проведенной, без участия оператора.\n"
+" * \"%s\": чтобы создать инсталляционную дискету, с помощью которой можно\n"
+"автоматически провести инсталляцию, подобную только что проведенной, без\n"
+"участия оператора.\n"
 "\n"
 "   Обратите внимание, что после нажатия на кнопку доступны два различных\n"
 "варианта:\n"
 "\n"
-"    * \"Повторить\". Это частично автоматизированная инсталляция, в которой\n"
-"только шаг разбиения диска (и только он один) требует участия.\n"
+"    * \"%s\". Это частично автоматизированная инсталляция, в которой только\n"
+"шаг разметки диска (и только он один) требует участия.\n"
 "\n"
-"    * \"Автоматический\". полностью автоматическая инсталляция: жесткий\n"
-"диск полностью перезаписывается и все данные теряются .\n"
+"    * \"%s\". полностью автоматическая инсталляция: жесткий диск полностью\n"
+"перезаписывается и все данные теряются .\n"
 "\n"
 "   Эта возможность очень удобна, когда нужно повторять инсталляцию на\n"
 "большом числе одинаковых машин. Смотрите раздел Auto install на нашем web\n"
 "сайте, чтобы получить больше информации.\n"
 "\n"
-" * \"Сохранить выбор пакетов\" (*): сохраняет выбор пакетов, сделанный в\n"
-"данной инсталляции. Для использования этого выбора в другой установке,\n"
-"вставьте дискету в дисковод и запустите установку. В приглашении нажмите\n"
-"[F1] и наберите >>linux defcfg=\"floppy\"<<.\n"
+" * \"%s\" (*): сохраняет выбор пакетов, сделанный в данной инсталляции. Для\n"
+"использования своей выборки пакетов для другой установки, вставьте дискету\n"
+"в дисковод и запустите установку. В приглашении нажмите [F1] и наберите\n"
+">>linux defcfg=\"floppy\"<<.\n"
 "\n"
 "(*) Вам потребуется форматированная в FAT дискета (для создания такой под\n"
 "GNU/Linux наберите \"mformat a:\")"
@@ -1855,7 +1825,7 @@ msgstr ""
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
-"defined, either from a previous installation of GNU/Linux or from another\n"
+"defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
 "\n"
@@ -1865,43 +1835,40 @@ msgid ""
 "\n"
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
-" * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard drive\n"
 "\n"
-" * \"Auto allocate\": this option enables you to automatically create ext3\n"
-"and swap partitions in free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext3 and swap\n"
+"partitions in the free space of your hard drive\n"
 "\n"
-"\"More\": gives access to additional features:\n"
+"\"%s\": gives access to additional features:\n"
 "\n"
-" * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery, if necessary. It is strongly\n"
-"recommended that you perform this step.\n"
+" * \"%s\": saves the partition table to a floppy. Useful for later\n"
+"partition-table recovery if necessary. It is strongly recommended that you\n"
+"perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows you to restore a previously saved\n"
-"partition table from a floppy disk.\n"
+" * \"%s\": allows you to restore a previously saved partition table from a\n"
+"floppy disk.\n"
 "\n"
-" * \"Rescue partition table\": if your partition table is damaged, you can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"doesn't always work.\n"
+" * \"%s\": if your partition table is damaged, you can try to recover it\n"
+"using this option. Please be careful and remember that it doesn't always\n"
+"work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and reloads the\n"
-"partition table that was originally on the hard drive.\n"
+" * \"%s\": discards all changes and reloads the partition table that was\n"
+"originally on the hard drive.\n"
 "\n"
-" * \"Removable media automounting\": unchecking this option will force\n"
-"users to manually mount and unmount removable medias such as floppies and\n"
-"CD-ROMs.\n"
+" * \"%s\": unchecking this option will force users to manually mount and\n"
+"unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good\n"
-"understanding of partitioning.\n"
+" * \"%s\": use this option if you wish to use a wizard to partition your\n"
+"hard drive. This is recommended if you do not have a good understanding of\n"
+"partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes.\n"
+" * \"%s\": use this option to cancel your changes.\n"
 "\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information about the\n"
-"hard drive.\n"
+" * \"%s\": allows additional actions on partitions (type, options, format)\n"
+"and gives more information about the hard drive.\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1927,7 +1894,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Здесь вам предложат выбрать какие разделы будут использоваться для\n"
+"Здесь вам предложат выбрать, какие разделы будут использоваться для\n"
 "установки вашей системы Mandrake Linux. Если разделы были уже определены\n"
 "ранее, например предыдущей инсталляцией GNU/Linux или другой утилитой\n"
 "разбиения дисков, вы можете воспользоваться существующими разделами. В\n"
@@ -1937,47 +1904,44 @@ msgstr ""
 "выбрав ``hda'' для первого IDE устройства, ``hdb'' для второго, ``sda'' для\n"
 "первого SCSI устройства и так далее.\n"
 "\n"
-"Для разбиения выбранного жесткого диска вы можете использовать следующие\n"
+"Для разметки выбранного жесткого диска вы можете использовать следующие\n"
 "опции:\n"
 "\n"
-" * \"Очистить все\": эта опция удаляет все разделы на выбранном жестком\n"
-"диске\n"
+" * \"%s\": эта опция удаляет все разделы на выбранном жестком диске;\n"
 "\n"
-" * \"Разместить автоматически\": эта опция позволяет автоматически создать\n"
-"ext3 и swap разделы на свободном пространстве вашего жесткого диска\n"
+" * \"%s\": эта опция позволяет автоматически создать ext3 и swap разделы на\n"
+"свободном пространстве вашего жесткого диска.\n"
 "\n"
-"\"Больше\": дает доступ к дополнительным возможностям:\n"
+"\"%s\": открывает доступ к дополнительным возможностям:\n"
 "\n"
-" * \"Сохранить таблицу разделов\": сохраняет таблицу разделов на дискету.\n"
-"Полезно для восстановления таблицы разделов в будущем. Очень рекомендуется\n"
-"произвести этот шаг\n"
+" * \"%s\": сохраняет таблицу разделов на дискету. Полезно для\n"
+"восстановления таблицы разделов в будущем. Очень рекомендуется произвести\n"
+"этот шаг.\n"
 "\n"
-" * \"Восстановить таблицу разделов\": позволяет восстановить таблицу\n"
-"разделов, ранее сохраненную на дискету\n"
+" * \"%s\": позволяет восстановить таблицу разделов, ранее сохраненную на\n"
+"дискету.\n"
 "\n"
-" * \"Спасти таблицу разделов\": если ваша таблица разделов запорчена, вы\n"
-"можете попытаться ее восстановить, используя эту опцию. Пожалуйста, будьте\n"
-"осторожны и помните, что это может и не получиться\n"
+" * \"%s\": если ваша таблица разделов испорчена, вы можете попытаться ее\n"
+"восстановить, используя эту опцию. Пожалуйста, будьте осторожны и помните,\n"
+"что это может и не получиться.\n"
 "\n"
-" * \"Перезагрузить таблицу разделов\": отменяет все изменения и загружает\n"
-"исходную таблицу разделов\n"
+" * \"%s\": отменяет все изменения и загружает исходную таблицу разделов.\n"
 "\n"
-" * \"Автомонтирование съемных носителей\": если не выбрать эту опцию, то\n"
-"пользователи будут вынуждены вручную монтировать и размонтировать съемные\n"
-"носители типа дискет и CD-ROMов.\n"
+" * \"%s\": если не выбрать эту опцию, то пользователи будут вынуждены\n"
+"вручную монтировать и размонтировать съемные носители типа дискет и\n"
+"CD-ROMов.\n"
 "\n"
-" * \"Мастер\": используйте эту опцию если вы желаете провести разбиение\n"
-"диска с помощью мастера. Это рекомендуется тем, кто не имеет достаточного\n"
-"опыта в разбиении дисков\n"
+" * \"%s\": используйте эту опцию, если вы желаете провести разметку диска с\n"
+"помощью мастера. Это рекомендуется тем, кто не имеет достаточного опыта в\n"
+"разбиении дисков.\n"
 "\n"
-" * \"Отменить действие\": используйте эту опцию для отмены ваших изменений\n"
+" * \"%s\": используйте эту опцию для отмены ваших изменений.\n"
 "\n"
-" * \"Переключиться в нормальный/эксперта режим\": позволяет производить\n"
-"дополнительные действия над разделами (тип, опции, формат) и дает больше\n"
-"информации о жестком диске.\n"
+" * \"%s\": позволяет производить дополнительные действия над разделами\n"
+"(тип, опции, формат) и предоставляет больше информации о жестком диске.\n"
 "\n"
-" * \"Готово\": когда вы закончите разбиение своего жесткого диска, нажмите\n"
-"сюда чтобы сохранить изменения на диск.\n"
+" * \"%s\": когда вы закончите разметку своего жесткого диска, нажмите сюда\n"
+"чтобы сохранить изменения на диск.\n"
 "\n"
 "При определении размера раздела вы можете установить размер раздела,\n"
 "используя клавиши со стрелками на вашей клавиатуре.\n"
@@ -1987,14 +1951,14 @@ msgstr ""
 "\n"
 "Когда раздел выбран, вы можете использовать:\n"
 "\n"
-" * Ctrl-c для создания нового раздела (когда выбран пустой раздел) ;\n"
+" * Ctrl-c для создания нового раздела (когда выбран пустой раздел);\n"
 "\n"
 " * Ctrl-d для удаления раздела;\n"
 "\n"
 " * Ctrl-m для установки точки монтирования.\n"
 "\n"
 "Чтобы получить информацию о различных доступных файловых системах,\n"
-"пожалуйста почитайте главу ext2FS из ``Справочное руководство''.\n"
+"пожалуйста почитайте главу ext2FS из книги ``Справочное руководство''.\n"
 "\n"
 "Если вы производите инсталляцию на PPC машину, вам потребуется создать\n"
 "маленький HFS ``bootstrap'' раздел, не больше 1MB, который будет\n"
diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl
index 8efb5695c..7a152a867 100755
--- a/perl-install/share/po/help_xml2pm.pl
+++ b/perl-install/share/po/help_xml2pm.pl
@@ -4,7 +4,6 @@ use XML::Parser;
 use MDK::Common;
 use utf8;
 
-my $help;
 my $dir = "doc/manualB/modules";
 my $xsltproc = "/usr/bin/xsltproc";
 
@@ -34,51 +33,57 @@ save_help($base);
 
 foreach my $lang (keys %helps) {
     print "Now transforming: $lang\n";
-    local *F;
     my ($charset) = cat_("$lang.po") =~ /charset=([^\\]+)/ or die "missing charset in $lang.po\n";
-    open F, ">:encoding($charset)", "help-$lang.pot";
-    print F "\n";
+    open(my $F, ">:encoding($charset)", "help-$lang.pot");
+    print $F <<EOF;
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=$charset\\n"
+
+EOF
     foreach my $id (keys %{$helps{$lang}}) {
+#	warn "Writing id=$id in lang=$lang\n";
 	$base->{$id} or warn "$lang:$id doesn't exist in english\n", next;
-	print F qq(# DO NOT BOTHER TO MODIFY HERE, SEE:\n# cvs.mandrakesoft.com:/cooker/$dir/$lang/drakx-chapter.xml\n);
-	print F qq(msgid ""\n");
-	print F join(qq(\\n"\n"), split "\n", to_ascii($base->{$id}));
-	print F qq("\nmsgstr ""\n");
-	print F join(qq(\\n"\n"), split "\n", $helps{$lang}{$id});
-	print F qq("\n\n);
+	print $F qq(# DO NOT BOTHER TO MODIFY HERE, SEE:\n# cvs.mandrakesoft.com:/cooker/$dir/$lang/drakx-chapter.xml\n);
+	print_in_PO($F, to_ascii($base->{$id}[0]), $helps{$lang}{$id}[0]);
     }
 }
 unlink(".memdump");
 
+sub print_in_PO {
+    my ($F, $msgid, $msgstr) = @_;
+
+    print $F qq(msgid ""\n");
+    print $F join(qq(\\n"\n"), split "\n", $msgid);
+    print $F qq("\nmsgstr ""\n");
+    print $F join(qq(\\n"\n"), split "\n", $msgstr);
+    print $F qq("\n\n);
+}
+
 sub save_help {
-    my ($help) = @_;
-
-    #- HACK, don't let this one disappear
-    $help->{configureXxdm} = 
-'Finally, you will be asked whether you want to see the graphical interface
-at boot. Note this question will be asked even if you chose not to test the
-configuration. Obviously, you want to answer \"No\" if your machine is to
-act as a server, or if you were not successful in getting the display
-configured.';
-
-    local *F;
-    open F, ">:encoding(ascii)", "../../help.pm";
-    print F q{package help;
+    my ($help, $inside_strings) = @_;
+
+    open(my $F, ">:encoding(ascii)", "../../help.pm");
+    print $F <<'EOF';
+package help;
 use common;
 
 # IMPORTANT: Don't edit this File - It is automatically generated 
 #            from the manuals !!! 
 #            Write a mail to <documentation@mandrakesoft.com> if
 #            you want it changed.
-
-our %steps = (
-};
+EOF
     foreach (sort keys %$help) {
-	my $s = to_ascii($help->{$_});
+	my ($main, @inside) = map { '"' . to_ascii($_) . '"' } @{$help->{$_}};
+	my $s = join(', ', $main, map { qq(N($_)) } @inside);
 	print STDERR "Writing id=$_\n";
-	print F qq(\n$_ => \nN_("$s"),\n);
+	print $F <<EOF;
+sub $_ {
+    N($s);
+}
+EOF
+	my @nb = $main =~ /\%s/g; @nb == @inside or die "bad \%s in $_\n";
     }
-    print F ");\n";
 }
 
 # i don't like the default tree format given by XML::Parser,
@@ -119,6 +124,7 @@ sub find_tag {
     }
 }
 
+my $help;
 sub rewrite2 {
     my ($tree, $lang) = @_;
     our $i18ned_open_text_quote  = $ {{ 
@@ -147,11 +153,19 @@ sub rewrite2 {
     $help;
 }
 
+my @inside_strings;
 sub rewrite2_ {
     my ($tree, @parents) = @_;
     ref($tree) or return $tree;
     !$tree->{attr}{condition} || $tree->{attr}{condition} !~ /no-inline-help/ or return '';
 
+    my @prev_inside_strings;
+    my ($id) = $tree->{attr}{id} ? $tree->{attr}{id} =~ /drakxid-(.+)/ : ();
+    if ($id) {
+	@prev_inside_strings = @inside_strings;
+	@inside_strings = ();
+    }
+
     my $text = do {
 	my @l = map { rewrite2_($_, $tree, @parents) } @{$tree->{children}};
 	my $text = "";
@@ -164,8 +178,7 @@ sub rewrite2_ {
 	$text;
     };
 
-    if ($tree->{attr}{id} && $tree->{attr}{id} =~ /drakxid-(.+)/) {
-	my $id = $1;
+    if ($id) {
 	my $t = $text;
 	$t =~ s/^\s+//;
 
@@ -174,7 +187,8 @@ sub rewrite2_ {
 	    $s =~ s/^\s+//;
 	    "(*) $s";
 	} find_tag('footnote', $tree);
-	$help->{$id} = aerate($t . join('', @footnotes));
+	$help->{$id} = [ aerate($t . join('', @footnotes)), @inside_strings ];
+	unshift @inside_strings, @prev_inside_strings;
     }
 
     if (0) {
@@ -186,8 +200,12 @@ sub rewrite2_ {
     } elsif (member($tree->{tag}, 'quote', 'citetitle', 'foreignphrase')) {
 	$text =~ s/^\Q$i18ned_open_label_quote\E(.*)\Q$i18ned_close_label_quote\E$/$1/ if $i18ned_open_label_quote;
 	($i18ned_open_text_quote || "``") . $text . ($i18ned_close_text_quote || "''");
-    } elsif (member($tree->{tag}, 'guilabel', 'guibutton', 'guimenu', 'literal', 'filename')) {
+    } elsif (member($tree->{tag}, 'literal', 'filename')) {
 	($i18ned_open_label_quote || "\\\"") . $text . ($i18ned_close_label_quote || "\\\"");
+    } elsif (member($tree->{tag}, 'guilabel', 'guibutton', 'guimenu')) {
+	$text =~ s/\s+$//;
+	push @inside_strings, $text;
+	($i18ned_open_label_quote || "\\\"") . "%s" . ($i18ned_close_label_quote || "\\\"");
     } elsif ($tree->{tag} eq 'command') {
 	($i18ned_open_command_quote || "\\\"") . $text . ($i18ned_close_command_quote || "\\\"");
     } elsif ($tree->{tag} eq 'userinput') {