no_comment

9 files changed, 353 insertions, 186 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 0627717ad..260391894 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -161,7 +161,7 @@ sub cardConfiguration(;$$) {
     $card->{type} = undef unless $card->{server}; #- bad type as we can't find the server
 
     add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto;
-    $card->{type} = $in->ask_from_list('', _("Choose a graphic card"), ['Unlisted', keys %cards]) unless $card->{type} || $card->{server};
+    $card->{type} = $in->ask_from_list('', _("Select a graphic card"), ['Unlisted', keys %cards]) unless $card->{type} || $card->{server};
     $card->{type} = undef, $card->{server} = $in->ask_from_list('', _("Choose a X server"), \@allservers) if $card->{type} eq "Unlisted";
 
     add2hash($card, $cards{$card->{type}}) if $card->{type};
@@ -205,8 +205,8 @@ at which the whole screen is refreshed, and most importantly the horizontal
 sync rate, which is the rate at which scanlines are displayed.
 
 It is VERY IMPORTANT that you do not specify a monitor type with a sync range
-that is beyond the capabilities of your monitor. If in doubt, choose a
-conservative setting."),
+that is beyond the capabilities of your monitor: you may damage your monitor.
+ If in doubt, choose a conservative setting."),
 				  [ _("Horizontal refresh rate"), _("Vertical refresh rate") ],
 				  [ { val => \$monitor->{hsyncrange}, list => \@hsyncranges },
 				    { val => \$monitor->{vsyncrange}, list => \@vsyncranges }, ]);
@@ -317,7 +317,7 @@ sub testFinalConfig($;$) {
 	    $time-- or Gtk->main_quit;
 	});
 
-	exit (interactive_gtk->new->ask_yesorno('', [ _("Is this ok?"), $text ], 0) ? 0 : 222);
+	exit (interactive_gtk->new->ask_yesorno('', [ _("Is this correct?"), $text ], 0) ? 0 : 222);
     };
     my $rc = close F;
     my $err = $?;
@@ -334,7 +334,7 @@ sub autoResolutions($;$) {
     my $card = $o->{card};
 
     $nowarning || $in->ask_okcancel(_("Automatic resolutions"),
-_("To find the available resolutions i will try different ones.
+_("To find the available resolutions I will try different ones.
 Your screen will blink...
 You can switch if off if you want, you'll hear a beep when it's over"), 1) or return;
 
@@ -484,7 +484,7 @@ sub resolutionsConfiguration($%) {
 	unless ($options{noauto}) {
 	    if ($options{nowarning} || $in->ask_okcancel(_("Automatic resolutions"),
 _("I can try to find the available resolutions (eg: 800x600).
-Alas it can freeze sometimes
+Sometimes, though, it may hang the machine.
 Do you want to try?"), 1)) {
 		autoResolutions($o, $options{nowarning});
 		is_empty_hash_ref($card->{depth}) and $in->ask_warn('',
@@ -680,7 +680,7 @@ sub show_info {
     $info .= _("Monitor HorizSync: %s\n", $o->{monitor}{hsyncrange}) if $::expert;
     $info .= _("Monitor VertRefresh: %s\n", $o->{monitor}{vsyncrange}) if $::expert;
     $info .= _("Graphic card: %s\n", $o->{card}{type});
-    $info .= _("Graphic memory: %s KB\n", $o->{card}{memory}) if $o->{card}{memory};
+    $info .= _("Graphic memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory};
     $info .= _("XFree86 server: %s\n", $o->{card}{server});
 
     $in->ask_warn('', $info);
@@ -731,8 +731,8 @@ Would you like X to start when you reboot?"), 1);
 
 	$in->ask_warn(_("X successfully configured"),
 _("Configuration file has been written. Take a look at it before running 'startx'.
-Within the server press ctrl, alt and '+' simultaneously to cycle video resolutions.
-Pressing ctrl, alt and backspace simultaneously immediately exits the server
+Within the server, press Ctrl, Alt and '+' simultaneously to cycle through video resolutions.
+Pressing Ctrl, Alt and Backspace simultaneously immediately exits the server
 For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.")) unless $::auto;
     }
 }
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 193eb84e6..5a31ac17b 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -54,13 +54,13 @@ $resolution_wanted = "1024x768";
 }
 
 %videomemory = (
-    __("256 kb") => 256,
-    __("512 kb") => 512,
-    __("1 mb") => 1024,
-    __("2 mb") => 2048,
-    __("4 mb") => 4096,
-    __("8 mb") => 8192,
-    __("16 mb or more") => 16384,
+    __("256 kB") => 256,
+    __("512 kB") => 512,
+    __("1 MB") => 1024,
+    __("2 MB") => 2048,
+    __("4 MB") => 4096,
+    __("8 MB") => 8192,
+    __("16 MB or more") => 16384,
 );
 
 %standard_monitors = (
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 614fa833c..604124b20 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -7,7 +7,7 @@ selectLanguage =>
  __("Choose preferred language for install and system usage."),
 
 selectKeyboard =>
- __("Choose on the list of keyboards, the one corresponding to yours"),
+ __("Choose the layout corresponding to your keyboard from the list above"),
 
 selectPath =>
  __("Choose \"Installation\" if there are no previous versions of Linux
@@ -20,8 +20,9 @@ Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
 selectInstallClass =>
  __("Select:
 
-  - Beginner: If you have not installed Linux before, or wish to install
-the distribution elected \"Product of the year\" for 1999, click here.
+  - Beginner: If you have never installed Linux before, and wish to
+install the distribution elected \"Product of the year\" for 1999,
+click here.
 
   - Developer: If you are familiar with Linux and will be using the
 computer primarily for software development, you will find happiness
@@ -31,8 +32,8 @@ here.
 Linux distribution elected \"Distribution/Server\" for 1999, select
 this.
 
-  - Expert: If you know GNU/Linux and want to perform a highly
-customized installation, this Install Class is for you."),
+  - Expert: If you are fluent with GNU/Linux and want to perform
+a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
  __("Panoramix will attempt at first to look for one or more PCI
@@ -43,56 +44,99 @@ If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
-\"Yes\". You will then be asked which driver to try.
+\"Yes\". A list of drivers will then pop up, from which you will
+have to select one.
 
-In this case, you will be prompted on options to pass to the dri-
-ver (namely, I/O port and IRQ). Don't forget the information you
-could get from Windows, as suggested by the installation guide!"),
+After you have selected the driver, Panoramix will ask if you
+want to specify options for it. First, try and let the driver
+probe for the hardware: it usually works fine.
+
+If not, do not forget the information on your hardware that you
+could get from Windows (if you have it on your system), as
+suggested by the installation guide. These are the options
+you will need to provide to the driver."),
 
 partitionDisks =>
  __("At this point, hard drive partitions must be defined. (Unless you
 are overwriting a previous install of Linux and have already defined
-your hard drives partitions as desired.) This operation consists of
+your hard drive partitions as desired.) This operation consists of
 logically dividing the computer's hard drive capacity into separate
-areas for use. Two common partition are: \"root\" which is the point at
-which the filesystem's directory structure starts, and \"boot\", which
-contains those files necessary to start the operating system when the
-computer is first turned on. Because the effects of this process are
-usually irreversible, partitioning can be intimidating and stressful to
-the inexperienced. DiskDrake simplifies the process so that it need not
-be. Consult the documentation and take your time before proceeding."),
+areas for use.
+
+
+Two common partition are: the root partition (/), which is the starting
+point of the filesystem's directory hierarchy, and /boot, which contains
+all files necessary to start the operating system when the
+computer is first turned on.
+
+
+Because the effects of this process are usually irreversible, partitioning
+can be intimidating and stressful to the unexperienced. DiskDrake
+simplifies the process so that it need not be. Consult the documentation
+and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
-use. At this time, you may wish to re-format some pre-existing
-partitions to erase the data they contain. Note: it is not necessary to
-re-format pre-existing partitions, particularly if they contain files or
-data you wish to keep. Typically retained are: /home and /usr/local."),
+use (formatting meaning creating a filesystem). At this time, you may
+wish to re-format some already existing partitions to erase the data
+they contain. Note: it is not necessary to re-format pre-existing
+partitions, particularly if they contain files or data you wish to keep.
+Typically retained are /home and /usr/local."),
 
 choosePackages =>
  __("You may now select the packages you wish to install.
 
 
-Please note that some packages require the installation of others. These
-are referred to as package dependencies. The packages you select, and
-the packages they require will automatically be added to the
-installation configuration. It is impossible to install a package
-without installing all of its dependencies.
+Please note that some packages require the installation of others.
+These are referred to as package dependencies. The packages you select,
+and the packages they require will be automatically selected for
+install. It is impossible to install a package without installing all
+of its dependencies.
 
 
 Information on each category and specific package is available in the
-area titled \"Info\". This is located above the buttons: [confirmation]
-[selection] [unselection]."),
+area titled \"Info\",  located between list of packages and the five
+buttons \"Go\", \"Select more/less\" and \"Show more/less\"."),
 
 doInstallStep =>
  __("The packages selected are now being installed. This operation
 should only take a few minutes."),
 
 configureMouse =>
- __("Help"),
+ __("If Panoramix failed to find your mouse, or if you want to
+check what it has done, you will be presented the list of mice
+above.
+
+
+If you agree with Panoramix' settings, just jump to the section
+you want by clicking on it in the menu on the left. Otherwise,
+choose a mouse type in the menu which you think is the closest
+match for your mouse.
+
+In case of a serial mouse, you will also have to tell Panoramix
+which serial port it is connected to."),
 
 configureNetwork =>
- __("Help"),
+ __("This section is dedicated to configuring a local area network,
+or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+Ethernet adapter on your machine. PCI adapters should be found and
+initialized automatically. However, if your peripheral is ISA,
+autodetection will not work, and you will have to choose a driver
+from the list that will appear then.
+
+
+As for SCSI adapters, you can let the driver probe for the adapter
+in the first time, otherwise you will have to specify the options
+to the driver that you will have fetched from Windows' control
+panel.
+
+
+If you install a Linux-Mandrake system on a machine which is part
+of an already existing network, the network administrator will
+have given you all necessary information (IP address, network
+submask or netmask for short, and hostname). If you're setting
+up a private network at home for example, you should choose
+addresses "),
 
 configureTimezone =>
  __("Help"),
@@ -101,42 +145,75 @@ configureServices =>
  __("Help"),
 
 configurePrinter =>
- __("Help"),
+ __("Linux can deal with many types of printer. Each of these
+types require a different setup.
+
+
+If your printer is directly connected to your computer, select
+\"Local printer\". You will then have to tell which port your
+printer is connected to, and select the appropriate filter.
+
+
+If you want to access a printer located on a remote Unix machine,
+you will have to select \"Remote lpd queue\". In order to make
+it work, no username or password is required, but you will need
+to know the name of the printing queue on this server.
+
+
+If you want to access a SMB printer (which means, a printer located
+on a remote Windows 9x/NT machine), you will have to specify its
+SMB name (which is not its TCP/IP name), and possibly its IP address,
+plus the username, workgroup and password required in order to
+access the printer, and of course the name of the printer.
+
+
+The same goes for a NetWare printer, except that you need no
+workgroup information. As for SMB printers, keep in mind that
+the Netware name (which is the one you have to enter) is not
+the name as its TCP/IP name, therefore you may also want to
+enter the IP address of the print server as well."),
 
 setRootPassword =>
- __("An administrator password for your Linux system must now be
-assigned. The password must be entered twice to verify that both
+ __("You must now enter the root password for your Linux-Mandrake
+system. The password must be entered twice to verify that both
 password entries are identical.
 
 
-Choose this password carefully. Only persons with access to an
-administrator account can maintain and administer the system.
-Alternatively, unauthorized use of an administrator account can be
-extremely dangerous to the integrity of the system, the data upon it,
-and other systems with which it is interfaced. The password should be a
+Root is the administrator of the system, and is the only user
+allowed to modify the system configuration. Therefore, choose
+this password carefully! Unauthorized use of the root account can
+be extremely dangerous to the integrity of the system and its data,
+and other systems connected to it. The password should be a
 mixture of alphanumeric characters and a least 8 characters long. It
-should never be written down. Do not make the password too long or
-complicated that it will be difficult to remember.
+should *never* be written down. Do not make the password too long or
+complicated, though: you must be able to remember without too much
+effort."),
 
+addUser =>
+ __("You may now create one or more \"regular\" user account(s), as
+opposed to the \"priviledged\" user account, root. You can create
+one or more account(s) for each person you want to allow to use
+the computer. Note that each user account will have its own
+preferences (graphical environment, program settings, etc.)
+and its own \"home directory\", in which these preferences are
+stored.
 
-When you login as Administrator, at \"login\" type \"root\" and at
-\"password\", type the password that was created here."),
 
-addUser =>
- __("You can now authorize one or more people to use your Linux
-system. Each user account will have their own customizable environment.
+First of all, create an account for yourself! Even if you will be
+the only user of the machine, you may NOT connect as root for daily
+use of the system: it's a very high security risk. Making the
+system unusable is very often a typo away.
 
 
-It is very important that you create a regular user account, even if
-there will only be one principle user of the system. The administrative
-\"root\" account should not be used for day to day operation of the
-computer.  It is a security risk.  The use of a regular user account
-protects you and the system from yourself. The root account should only
-be used for administrative and maintenance tasks that can not be
-accomplished from a regular user account."),
+Therefore, you should connect to the system using the user account
+you will have created here, and login as root only for administration
+and maintenance purposes."),
 
 createBootdisk =>
- __("Help"),
+ __("Please, please, answer \"Yes\" here! Just for example, when you
+reinstall Windows, it will overwrite the boot sector. Unless you have
+made the bootdisk as suggested, you won't be able to boot into Linux
+any more!"),
 
 setupBootloader =>
  __("You need to indicate where you wish
@@ -144,13 +221,20 @@ to place the information required to boot to Linux.
 
 
 Unless you know exactly what you are doing, choose \"First sector of
-drive\"."),
+drive (MBR)\"."),
 
 configureX =>
- __("It is now time to configure the video card and monitor
-configuration for the X Window Graphic User Interface (GUI). First
-select your monitor. Next, you may test the configuration and change
-your selections if necessary."),
+ __("Now it's time to configure the X Window System, which is the
+core of the Linux GUI (Graphical User Interface). For this purpose,
+you must configure your video card and monitor. Most of these
+steps are automated, though, therefore your work may only consist
+of verifying what has been done and accept the settings :)
+
+When the configuration is over, X will be started (unless you
+ask Panoramix not to) so that you can check and see if the
+settings suit you. If they don't, you can come back and
+change them, as many times as necessary."),
+
 exitInstall =>
  __("Help"),
 );
@@ -161,7 +245,7 @@ selectLanguage =>
  __("Choose preferred language for install and system usage."),
 
 selectKeyboard =>
- __("Choose on the list of keyboards, the one corresponding to yours"),
+ __("Choose the layout corresponding to your keyboard from the list above"),
 
 selectPath =>
  __("Choose \"Installation\" if there are no previous versions of Linux
@@ -174,8 +258,9 @@ Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
 selectInstallClass =>
  __("Select:
 
-  - Beginner: If you have not installed Linux before, or wish to install
-the distribution elected \"Product of the year\" for 1999, click here.
+  - Beginner: If you have never installed Linux before, and wish to
+install the distribution elected \"Product of the year\" for 1999,
+click here.
 
   - Developer: If you are familiar with Linux and will be using the
 computer primarily for software development, you will find happiness
@@ -185,11 +270,11 @@ here.
 Linux distribution elected \"Distribution/Server\" for 1999, select
 this.
 
-  - Expert: If you know GNU/Linux and want to perform a highly
-customized installation, this Install Class is for you."),
+  - Expert: If you are fluent with GNU/Linux and want to perform
+a highly customized installation, this Install Class is for you."),
 
 setupSCSI =>
-__("Panoramix will attempt at first to look for one or more PCI
+ __("Panoramix will attempt at first to look for one or more PCI
 SCSI adapter(s). If it finds it (or them)  and knows which driver(s)
 to use, it will insert it (them)  automatically.
 
@@ -197,57 +282,99 @@ If your SCSI adapter is ISA, or is PCI but Panoramix doesn't know
 which driver to use for this card, or if you have no SCSI adapters
 at all, you will then be prompted on whether you have one or not.
 If you have none, answer \"No\". If you have one or more, answer
-\"Yes\". You will then be asked which driver to try.
+\"Yes\". A list of drivers will then pop up, from which you will
+have to select one.
 
-In this case, you will be prompted on options to pass to the dri-
-ver (namely, I/O port and IRQ). Don't forget the information you
-could get from Windows, as suggested by the installation guide!"),
+After you have selected the driver, Panoramix will ask if you
+want to specify options for it. First, try and let the driver
+probe for the hardware: it usually works fine.
 
+If not, do not forget the information on your hardware that you
+could get from Windows (if you have it on your system), as
+suggested by the installation guide. These are the options
+you will need to provide to the driver."),
 
 partitionDisks =>
  __("At this point, hard drive partitions must be defined. (Unless you
 are overwriting a previous install of Linux and have already defined
-your hard drives partitions as desired.) This operation consists of
+your hard drive partitions as desired.) This operation consists of
 logically dividing the computer's hard drive capacity into separate
-areas for use. Two common partition are: \"root\" which is the point at
-which the filesystem's directory structure starts, and \"boot\", which
-contains those files necessary to start the operating system when the
-computer is first turned on. Because the effects of this process are
-usually irreversible, partitioning can be intimidating and stressful to
-the inexperienced. DiskDrake simplifies the process so that it need not
-be. Consult the documentation and take your time before proceeding."),
+areas for use.
+
+
+Two common partition are: the root partition (/), which is the starting
+point of the filesystem's directory hierarchy, and /boot, which contains
+all files necessary to start the operating system when the
+computer is first turned on.
+
+
+Because the effects of this process are usually irreversible, partitioning
+can be intimidating and stressful to the unexperienced. DiskDrake
+simplifies the process so that it need not be. Consult the documentation
+and take your time before proceeding."),
 
 formatPartitions =>
  __("Any partitions that have been newly defined must be formatted for
-use. At this time, you may wish to re-format some pre-existing
-partitions to erase the data they contain. Note: it is not necessary to
-re-format pre-existing partitions, particularly if they contain files or
-data you wish to keep. Typically retained are: /home and /usr/local."),
+use (formatting meaning creating a filesystem). At this time, you may
+wish to re-format some already existing partitions to erase the data
+they contain. Note: it is not necessary to re-format pre-existing
+partitions, particularly if they contain files or data you wish to keep.
+Typically retained are /home and /usr/local."),
 
 choosePackages =>
  __("You may now select the packages you wish to install.
 
 
-Please note that some packages require the installation of others. These
-are referred to as package dependencies. The packages you select, and
-the packages they require will automatically be added to the
-installation configuration. It is impossible to install a package
-without installing all of its dependencies.
+Please note that some packages require the installation of others.
+These are referred to as package dependencies. The packages you select,
+and the packages they require will be automatically selected for
+install. It is impossible to install a package without installing all
+of its dependencies.
 
 
 Information on each category and specific package is available in the
-area titled \"Info\". This is located above the buttons: [confirmation]
-[selection] [unselection]."),
+area titled \"Info\",  located between list of packages and the five
+buttons \"Go\", \"Select more/less\" and \"Show more/less\"."),
 
 doInstallStep =>
  __("The packages selected are now being installed. This operation
 should only take a few minutes."),
 
 configureMouse =>
- __("Help"),
+ __("If Panoramix failed to find your mouse, or if you want to
+check what it has done, you will be presented the list of mice
+above.
+
+
+If you agree with Panoramix' settings, just jump to the section
+you want by clicking on it in the menu on the left. Otherwise,
+choose a mouse type in the menu which you think is the closest
+match for your mouse.
+
+In case of a serial mouse, you will also have to tell Panoramix
+which serial port it is connected to."),
 
 configureNetwork =>
- __("Help"),
+ __("This section is dedicated to configuring a local area network,
+or LAN. If you answer \"Yes\" here, Panoramix will try to find an
+Ethernet adapter on your machine. PCI adapters should be found and
+initialized automatically. However, if your peripheral is ISA,
+autodetection will not work, and you will have to choose a driver
+from the list that will appear then.
+
+
+As for SCSI adapters, you can let the driver probe for the adapter
+in the first time, otherwise you will have to specify the options
+to the driver that you will have fetched from Windows' control
+panel.
+
+
+If you install a Linux-Mandrake system on a machine which is part
+of an already existing network, the network administrator will
+have given you all necessary information (IP address, network
+submask or netmask for short, and hostname). If you're setting
+up a private network at home for example, you should choose
+addresses "),
 
 configureTimezone =>
  __("Help"),
@@ -256,42 +383,75 @@ configureServices =>
  __("Help"),
 
 configurePrinter =>
- __("Help"),
+ __("Linux can deal with many types of printer. Each of these
+types require a different setup.
+
+
+If your printer is directly connected to your computer, select
+\"Local printer\". You will then have to tell which port your
+printer is connected to, and select the appropriate filter.
+
+
+If you want to access a printer located on a remote Unix machine,
+you will have to select \"Remote lpd queue\". In order to make
+it work, no username or password is required, but you will need
+to know the name of the printing queue on this server.
+
+
+If you want to access a SMB printer (which means, a printer located
+on a remote Windows 9x/NT machine), you will have to specify its
+SMB name (which is not its TCP/IP name), and possibly its IP address,
+plus the username, workgroup and password required in order to
+access the printer, and of course the name of the printer.
+
+
+The same goes for a NetWare printer, except that you need no
+workgroup information. As for SMB printers, keep in mind that
+the Netware name (which is the one you have to enter) is not
+the name as its TCP/IP name, therefore you may also want to
+enter the IP address of the print server as well."),
 
 setRootPassword =>
- __("An administrator password for your Linux system must now be
-assigned. The password must be entered twice to verify that both
+ __("You must now enter the root password for your Linux-Mandrake
+system. The password must be entered twice to verify that both
 password entries are identical.
 
 
-Choose this password carefully. Only persons with access to an
-administrator account can maintain and administer the system.
-Alternatively, unauthorized use of an administrator account can be
-extremely dangerous to the integrity of the system, the data upon it,
-and other systems with which it is interfaced. The password should be a
+Root is the administrator of the system, and is the only user
+allowed to modify the system configuration. Therefore, choose
+this password carefully! Unauthorized use of the root account can
+be extremely dangerous to the integrity of the system and its data,
+and other systems connected to it. The password should be a
 mixture of alphanumeric characters and a least 8 characters long. It
-should never be written down. Do not make the password too long or
-complicated that it will be difficult to remember.
+should *never* be written down. Do not make the password too long or
+complicated, though: you must be able to remember without too much
+effort."),
 
+addUser =>
+ __("You may now create one or more \"regular\" user account(s), as
+opposed to the \"priviledged\" user account, root. You can create
+one or more account(s) for each person you want to allow to use
+the computer. Note that each user account will have its own
+preferences (graphical environment, program settings, etc.)
+and its own \"home directory\", in which these preferences are
+stored.
 
-When you login as Administrator, at \"login\" type \"root\" and at
-\"password\", type the password that was created here."),
 
-addUser =>
- __("You can now authorize one or more people to use your Linux
-system. Each user account will have their own customizable environment.
+First of all, create an account for yourself! Even if you will be
+the only user of the machine, you may NOT connect as root for daily
+use of the system: it's a very high security risk. Making the
+system unusable is very often a typo away.
 
 
-It is very important that you create a regular user account, even if
-there will only be one principle user of the system. The administrative
-\"root\" account should not be used for day to day operation of the
-computer.  It is a security risk.  The use of a regular user account
-protects you and the system from yourself. The root account should only
-be used for administrative and maintenance tasks that can not be
-accomplished from a regular user account."),
+Therefore, you should connect to the system using the user account
+you will have created here, and login as root only for administration
+and maintenance purposes."),
 
 createBootdisk =>
- __("Help"),
+ __("Please, please, answer \"Yes\" here! Just for example, when you
+reinstall Windows, it will overwrite the boot sector. Unless you have
+made the bootdisk as suggested, you won't be able to boot into Linux
+any more!"),
 
 setupBootloader =>
  __("You need to indicate where you wish
@@ -299,13 +459,20 @@ to place the information required to boot to Linux.
 
 
 Unless you know exactly what you are doing, choose \"First sector of
-drive\"."),
+drive (MBR)\"."),
 
 configureX =>
- __("It is now time to configure the video card and monitor
-configuration for the X Window Graphic User Interface (GUI). First
-select your monitor. Next, you may test the configuration and change
-your selections if necessary."),
+ __("Now it's time to configure the X Window System, which is the
+core of the Linux GUI (Graphical User Interface). For this purpose,
+you must configure your video card and monitor. Most of these
+steps are automated, though, therefore your work may only consist
+of verifying what has been done and accept the settings :)
+
+When the configuration is over, X will be started (unless you
+ask Panoramix not to) so that you can check and see if the
+settings suit you. If they don't, you can come back and
+change them, as many times as necessary."),
+
 exitInstall =>
  __("Help"),
 );
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index fbf52a641..5dd74dbb9 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -28,7 +28,7 @@ use printer;
 use modules;
 use detect_devices;
 use modparm;
-#use install_steps_graphical;
+use install_steps_graphical;
 use run_program;
 
 #-######################################################################################
@@ -52,7 +52,7 @@ my @installSteps = (
   configurePrinter   => [ __("Configure printer"), 1, 0, "doInstallStep" ],
   setRootPassword    => [ __("Set root password"), 1, 1, "formatPartitions" ],
   addUser            => [ __("Add a user"), 1, 1, "doInstallStep" ],
-  createBootdisk     => [ __("Create bootdisk"), 1, 0, "doInstallStep" ],
+  createBootdisk     => [ __("Create a bootdisk"), 1, 0, "doInstallStep" ],
   setupBootloader    => [ __("Install bootloader"), 1, 1, "doInstallStep" ],
   configureX         => [ __("Configure X"), 1, 0, "formatPartitions" ],
   exitInstall        => [ __("Exit install"), 0, 0 ],
@@ -75,7 +75,7 @@ $installSteps{first} = $installSteps[0];
 #-#####################################################################################
 #-INTERN CONSTANT
 #-#####################################################################################
-my @install_classes = (__("beginner"), __("developer"), __("server"), __("expert"));
+my @install_classes = (__("Beginner"), __("Developer"), __("Server"), __("Expert"));
 
 #-#####################################################################################
 #-Default value
@@ -266,7 +266,7 @@ sub selectPath {
 	my $selected_partition;
 	do {
 	    if ($selected_partition->{mntpoint} && !$selected_partition->{currentMntpoint}) {
-		$o->ask_warn(_("Information"), "$selected_partition->{device}" . _(" : This is not a root partition, try again."))
+		$o->ask_warn(_("Information"), "$selected_partition->{device}" . _(" : This is not a root partition, please select another one."))
 		  unless $::beginner;
 		log::l("umounting non root partition $selected_partition->{device}");
 		eval { fs::umount_part($selected_partition); };
@@ -382,7 +382,7 @@ I'll try to go on blanking bad partitions"));
 
     $o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}) ];
 
-    fsedit::get_root($o->{fstab}) or die _("partitioning failed: no root filesystem");
+    fsedit::get_root($o->{fstab}) or die _("Partitioning failed: no root filesystem");
 }
 
 sub formatPartitions {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6c144e873..545fa9677 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -64,7 +64,7 @@ sub leavingStep($$) {
     while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) {
 	eval { &$f() };
 	$o->ask_warn(_("Error"), [
-_("An error occurred, i don't know how to handle it nicely,
+_("An error occurred, but I don't know how to handle it nicely,
 so continue at your own risk :("), $@ ]) if $@;
     }
 }
@@ -275,7 +275,7 @@ sub createBootdisk($) {
 
     my @l = detect_devices::floppies();
 
-    $dev = shift @l || die _("no floppy available")
+    $dev = shift @l || die _("No floppy drive available")
       if $dev eq "1"; #- special case meaning autochoose
 
     return if $::testing;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 7136726e9..db357c342 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -60,7 +60,7 @@ sub selectKeyboard($) {
     my ($o) = @_;
     $o->{keyboard} =
       keyboard::text2keyboard($o->ask_from_list_("Keyboard",
-						 _("Which keyboard do you have?"),
+						 _("What is your keyboard layout?"),
 						 [ keyboard::list() ],
 						 keyboard::keyboard2text($o->{keyboard})));
     $o->{keyboard_force} = 1;
@@ -81,7 +81,7 @@ sub selectRootPartition($@) {
     my ($o,@partitions) = @_;
     $o->{upgradeRootPartition} =
       $o->ask_from_list_(_("Root Partition"),
-			 _("What is the root partition of your system?"),
+			 _("What is the root partition (/) of your system?"),
 			 [ @partitions ], $o->{upgradeRootPartitions});
 #- TODO check choice, then mount partition in $o->{prefix} and autodetect.
 #-    install_steps::selectRootPartition($o);
@@ -91,7 +91,7 @@ sub selectInstallClass($@) {
     my ($o, @classes) = @_;
     $o->{installClass} =
       $o->ask_from_list_(_("Install Class"),
-			 _("What type of user will you have?"),
+			 _("What installation class do you want?"),
 			 [ @classes ], $o->{installClass});
     install_steps::selectInstallClass($o);
 }
@@ -102,11 +102,11 @@ sub selectMouse {
 
     my $name = $o->{mouse}{FULLNAME};
     if (!$name || $::expert || $force) {
-	$name = $o->ask_from_list_('', _("Which mouse do you have"), [ mouse::names() ], $name);
+	$name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name);
 	$o->{mouse} = mouse::name2mouse($name);
     }
     my $b = $o->{mouse}{nbuttons} < 3;
-    $o->{mouse}{XEMU3} = 'yes' if $::expert && $o->ask_yesorno('', _("Emulate third button"), $b) || $b;
+    $o->{mouse}{XEMU3} = 'yes' if $::expert && $o->ask_yesorno('', _("Emulate third button?"), $b) || $b;
 
     $o->{mouse}{device} = mouse::serial_ports_names2dev(
 	$o->ask_from_list(_("Mouse Port"),
@@ -151,7 +151,7 @@ sub formatPartitions {
 #------------------------------------------------------------------------------
 sub setPackages {
     my ($o, $install_classes) = @_;
-    my $w = $o->wait_message('', _("Searching for available packages"));
+    my $w = $o->wait_message('', _("Looking for available packages"));
     $o->SUPER::setPackages($install_classes);
 }
 #------------------------------------------------------------------------------
@@ -169,16 +169,16 @@ sub configureNetwork($) {
 	    my @l = (
 		     __("Keep the current IP configuration"),
 		     __("Reconfigure network now"),
-		     __("Don't set up networking"),
+		     __("Do not set up networking"),
 		    );
 	    $r = $o->ask_from_list_(_("Network Configuration"),
-				    _("LAN networking has already been configured. Do you want to:"),
+				    _("Local networking has already been configured. Do you want to:"),
 				    [ @l ]);
 	    $r ||= "Don't";
 	}
     } else {
 	$o->ask_yesorno(_("Network Configuration"),
-			_("Do you want to configure LAN (not dialup) networking for your installed system?")) or $r = "Don't";
+			_("Do you want to configure LAN (not dialup) networking for your system?")) or $r = "Don't";
     }
 
     if ($r =~ /^Don\'t/) {
@@ -243,7 +243,7 @@ sub configureNetworkNet {
 _("Please enter your host name.
 Your host name should be a fully-qualified host name,
 such as ``mybox.mylab.myco.com''.
-Also give the gateway if you have one"),
+You may also enter the IP address of the gateway if you have one"),
 			     [_("Host name:"), _("DNS server:"), _("Gateway:"), !$::beginner ? _("Gateway device:") : ()],
 			     [(map { \$netc->{$_}} qw(HOSTNAME dnsServer GATEWAY)),
 				      {val => \$netc->{GATEWAYDEV}, list => \@devices}]
@@ -256,7 +256,7 @@ sub timeConfig {
 
     $o->{timezone}{GMT} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{GMT});
     $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
-    $o->{timezone}{timezone} = $o->ask_from_list('', _("In which timezone are you"), [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
+    $o->{timezone}{timezone} = $o->ask_from_list('', _("Which is your timezone?"), [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
     install_steps::timeConfig($o,$f);
 }
 
@@ -283,7 +283,7 @@ sub printerConfig($) {
     if ($::expert) {
 	#std info
 	#Don't wait, if the user enter something, you must remember it
-	$o->ask_from_entries_ref(_("Standard Printer Options"),
+	$o->ask_from_entries_ref(_("Local Printer Options"),
 				 _("Every print queue (which print jobs are directed to) needs a
 name (often lp) and a spool directory associated with it. What
 name and directory should be used for this queue?"),
@@ -320,7 +320,7 @@ name and directory should be used for this queue?"),
 	    $o->{printer}{DEVICE}    = $port;
 	    my $descr = common::bestMatchSentence2($parport[0]{val}{DESCRIPTION}, @printer::entry_db_description);
 	    $o->{printer}{DBENTRY} = $printer::descr_to_db{$descr};
-	    $str = _("I have detected a %s on ", $parport[0]{val}{DESCRIPTION}) . $port;
+	    $str = _("A printer, model \"%s\", has been detected on ", $parport[0]{val}{DESCRIPTION}) . $port;
 	    @port = map { $_->{port}} @parport;
 	} else {
 	    @port = detect_devices::whatPrinterPort();
@@ -345,10 +345,10 @@ on that server which jobs should be placed in."),
 
     } elsif ($o->{printer}{TYPE} eq "SMB") {
 	return if !$o->ask_from_entries_ref(
-	    _("SMB/Windows 95/NT Printer Options"),
+	    _("SMB (Windows 9x/NT) Printer Options"),
 	    _("To print to a SMB printer, you need to provide the
-SMB host name (this is not always the same as the machines
-TCP/IP hostname) and possibly the IP address of the print server, as
+SMB host name (Note! It may be different from its
+TCP/IP hostname!) and possibly the IP address of the print server, as
 well as the share name for the printer you wish to access and any
 applicable user name, password, and workgroup information."),
 	    [_("SMB server host:"), _("SMB server IP:"),
@@ -370,8 +370,8 @@ applicable user name, password, and workgroup information."),
     } else {#($o->{printer}{TYPE} eq "NCP") {
 	return if !$o->ask_from_entries_ref(_("NetWare Printer Options"),
 	    _("To print to a NetWare printer, you need to provide the
-NetWare print server name (this is not always the same as the machines
-TCP/IP hostname) as well as the print queue name for the printer you
+NetWare print server name (Note! it may be different from its
+TCP/IP hostname!) as well as the print queue name for the printer you
 wish to access and any applicable user name and password."),
 	    [_("Printer Server:"), _("Print Queue Name:"),
 	     _("User name:"), _("Password:")],
@@ -417,7 +417,7 @@ wish to access and any applicable user name and password."),
 
     $o->{printer}{CRLF} = $db_entry{DESCR} =~ /HP/;
     $o->{printer}{CRLF}= $o->ask_yesorno(_("CRLF"),
-					 _("Fix stair-stepping of text?"),
+					 _("Fix stair-stepping text?"),
 					 $o->{printer}{CRLF});
 
 
@@ -434,7 +434,7 @@ wish to access and any applicable user name and password."),
 		$o->{printer}{BITSPERPIXEL} =
 		  $col_to_depth{$o->ask_from_list_
 				(_("Configure Uniprint Driver"),
-				 _("You may now configure the uniprint options for this printer."),
+				 _("You may now set the Uniprint driver options for this printer."),
 				 \@col,
 				 $depth_to_col{$o->{printer}{BITSPERPIXEL}},
 				)};
@@ -466,11 +466,11 @@ sub setRootPassword($) {
 
     $o->ask_from_entries_ref(_("Set root password"),
 			 _("Set root password"),
-			 [_("Password"), _("Password (again)")],
+			 [_("Password:"), _("Password (again):")],
 			 [{ val => \$sup->{password},  hidden => 1},
 			  { val => \$sup->{password2}, hidden => 1}],
 			 complete => sub {
-			     $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("You must enter the same password"), _("Please try again") ]), return (1,1);
+			     $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,1);
 			     (length $sup->{password} < 6) and $o->ask_warn('', _("This password is too simple")), return (1,0);
 			     return 0
 			 }
@@ -502,7 +502,7 @@ sub addUser($) {
 	    }
 	},
         complete => sub {
-	    $u->{password} eq $u->{password2} or $o->ask_warn('', [ _("You must enter the same password"), _("Please try again") ]), return (1,3);
+	    $u->{password} eq $u->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,3);
 	    #(length $u->{password} < 6) and $o->ask_warn('', _("This password is too simple")), return (1,2);
 	    $u->{name} or $o->ask_warn('', _("Please give a user name")), return (1,0);
 	    $u->{name} =~ /^[a-z0-9_-]+$/ or $o->ask_warn('', _("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0);
@@ -526,7 +526,7 @@ sub createBootdisk {
 	$o->ask_yesorno('',
 			_("A custom bootdisk provides a way of booting into your Linux system without
 depending on the normal bootloader. This is useful if you don't want to install
-lilo on your system, or another operating system removes lilo, or lilo doesn't
+LILO on your system, or another operating system removes LILO, or LILO doesn't
 work with your hardware configuration. A custom bootdisk can also be used with
 the Mandrake rescue image, making it much easier to recover from severe system
 failures. Would you like to create a bootdisk for your system?"), $o->{mkbootdisk}) or return;
@@ -557,22 +557,22 @@ sub setupBootloader {
     my $b = $o->{bootloader};
 
     if ($::beginner && !$more) {
-	my @l = (__("First sector of drive"), __("First sector of boot partition"));
+	my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition"));
 
 	my $boot = $o->{hds}[0]{device};
 	my $onmbr = "/dev/$boot" eq $b->{boot};
 	$b->{boot} = "/dev/$boot" if !$onmbr &&
-	  $o->ask_from_list_(_("Lilo Installation"),
+	  $o->ask_from_list_(_("LILO Installation"),
 			     _("Where do you want to install the bootloader?"),
 			     \@l, $l[!$onmbr]) eq $l[0];
     } else {
-	$::expert and $o->ask_yesorno('', _("Do you want to use lilo?"), 1) || return;
+	$::expert and $o->ask_yesorno('', _("Do you want to use LILO?"), 1) || return;
     
 	my @l = (
 _("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } @{$o->{hds}}, @{$o->{fstab}} ], not_edit => !$::expert },
 _("Linear (needed for some SCSI drives)") => { val => \$b->{linear}, type => "bool", text => _("linear") },
 _("Compact") => { val => \$b->{compact}, type => "bool", text => _("compact") },
-_("Delay before choosing default choice") => \$b->{timeout},
+_("Delay before booting default image") => \$b->{timeout},
 _("Video mode") => { val => \$b->{vga}, list => [ keys %lilo::vga_modes ], not_edit => $::beginner },
 _("Password") => { val => \$b->{password}, hidden => 1 },
 _("Restrict command line options") => { val => \$b->{restricted}, type => "bool", text => _("restrict") },
@@ -581,7 +581,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
 
 	$b->{vga} ||= 'Normal';
 	$o->ask_from_entries_ref('',
-				 _("Lilo main options"), 
+				 _("LILO main options"), 
 				 [ grep_index { even($::i) } @l ],
 				 [ grep_index {  odd($::i) } @l ],
 				 complete => sub {
@@ -594,7 +594,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
 
     until ($::beginner && !$more) {
 	my $c = $o->ask_from_list_('', 
-_("Here are the following entries in lilo
+_("Here are the following entries in LILO.
 You can add some more or change the existent ones."),
 		[ (sort @{[map_each { "$::b->{label} ($::a)" . ($b->{default} eq $::b->{label} && "  *") } %{$b->{entries}}]}), __("Add"), __("Done") ],
 	);
@@ -648,7 +648,7 @@ _("Default") => { val => \$default, type => 'bool' },
     eval { $o->SUPER::setupBootloader };
     if ($@) {
 	$o->ask_warn('', 
-		     [ _("Lilo failed. The following error occured:"),
+		     [ _("Installation of LILO failed. The following error occured:"),
 		       grep { !/^Warning:/ } cat_("$o->{prefix}/tmp/.error") ]);
 	die "already displayed";
     }
@@ -659,16 +659,16 @@ sub exitInstall {
     my ($o, $alldone) = @_;
 
     return $o->{step} = '' unless $alldone || $o->ask_yesorno('', 
-_("Some steps are not completed
+_("Some steps are not completed.
 Do you really want to quit now?"), 0);
 
     $o->ask_warn('',
 _("Congratulations, installation is complete.
 Remove the boot media and press return to reboot.
-For information on fixes which are available for this release of Linux Mandrake,
+For information on fixes which are available for this release of Linux-Mandrake,
 consult the Errata available from http://www.linux-mandrake.com/.
 Information on configuring your system is available in the post
-install chapter of the Official Linux Mandrake User's Guide.")) if $alldone;
+install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone;
 }
 
 
@@ -680,7 +680,7 @@ sub loadModule {
     my @options;
 
     my $l = $o->ask_from_list('',
-			      _("What %s card have you?", $type),
+			      _("What %s card do you have?", $type),
 			      [ modules::text_of_type($type) ]) or return;
     my $m = modules::text2driver($l);
 
@@ -696,15 +696,15 @@ not cause any damage.", $l),
       ASK:
 	if (defined @names) {
 	    my @l = $o->ask_from_entries('',
-_("Here must give the different options for the module %s.", $l),
+_("You may now provide its options to module %s.", $l),
 					 \@names) or return;
 	    @options = modparm::get_options_result($m, @l);
 	} else {
 	    @options = split ' ',
 	      $o->ask_from_entry('',
-_("Here must give the different options for the module %s.
+_("You may now provide its options to module %s.
 Options are in format ``name=value name2=value2 ...''.
-For example you can have ``io=0x300 irq=7''", $l),
+For instance, ``io=0x300 irq=7''", $l),
 				 _("Module options:"),
 				);
 	}
@@ -712,7 +712,7 @@ For example you can have ``io=0x300 irq=7''", $l),
     eval { modules::load($m, $type, @options) };
     if ($@) {
 	$o->ask_yesorno('',
-_("Loading of module %s failed
+_("Loading module %s failed.
 Do you want to try again with other parameters?", $l), 1) or return;
 	goto ASK;
     }
@@ -734,7 +734,7 @@ sub load_thiskind {
 #------------------------------------------------------------------------------
 sub setup_thiskind {
     my ($o, $type, $auto, $at_least_one) = @_;
-    my @l = $o->load_thiskind($type) unless $::expert && $o->ask_yesorno('', _("Skip %s pci probe", $type), 1);
+    my @l = $o->load_thiskind($type) unless $::expert && $o->ask_yesorno('', _("Skip %s PCI probing", $type), 1);
     return if $auto && (@l || !$at_least_one);
     while (1) {
 	my $msg = @l ?
diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm
index 651f3ba16..1dbf94dae 100644
--- a/perl-install/install_steps_stdio.pm
+++ b/perl-install/install_steps_stdio.pm
@@ -18,7 +18,7 @@ use log;
 
 sub enteringStep($$$) {
     my ($o, $step) = @_;
-    print _("Starting step `%s'\n", $o->{steps}{$step}{text});
+    print _("Entering step `%s'\n", $o->{steps}{$step}{text});
 }
 sub leavingStep {
     my ($o) = @_;
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 27ba9690e..0af1c3d8b 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -44,22 +44,22 @@ my %keyboards = (
 #-"ge_la"=>[__("Georgian ("\Latin\" layout)","ge_la-georgian_academy","ge_la"],
  "gr" => [ __("Greek"),          "gr-8859_7",   "gr" ],
  "hu" => [ __("Hungarian"),      "hu-latin2",   "hu" ],
- "il" => [ __("Israelian"),      "il-8859_8",   "il" ],
+ "il" => [ __("Israeli"),      "il-8859_8",   "il" ],
  "is" => [ __("Icelandic"),      "is-latin1",   "is" ],
  "it" => [ __("Italian"),        "it-latin1",   "it" ],
  "la" => [ __("Latin American"), "la-latin1",   "la" ],
  "nl" => [ __("Dutch"),          "nl-latin1",   "nl" ],
  "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
  "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
- "lt_p" => [ __("Lithuanian \"phonétic\" QWERTY"), "ltp-latin7", "lt_p" ],
+ "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
  "no" => [ __("Norwegian"),      "no-latin1",   "no" ],
  "pl" => [ __("Polish"),         "pl-latin2",   "pl" ],
  "pt" => [ __("Portuguese"),     "pt-latin1",   "pt" ],
  "qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
  "ru" => [ __("Russian"),        "ru-koi8",     "ru" ],
  "se" => [ __("Swedish"),        "se-latin1",   "se_SE" ],
- "sf" => [ __("Swiss (french layout)"), "sf-latin1", "fr_CH" ],
- "sg" => [ __("Swiss (german layout)"), "sg-latin1", "de_CH" ],
+ "sf" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
+ "sg" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ],
  "si" => [ __("Slovenian"),      "si-latin1",   "si" ],
  "sk" => [ __("Slovakian"),      "sk-latin2",   "czsk" ],
 #- the xmodmap.th has to be fixed to use tis620 keymaps
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index b11dd3a3f..1f0670a57 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -343,7 +343,7 @@ sub _create_window($$) {
 
 sub ask_warn       { my $w = my_gtk->new(shift @_); $w->_ask_warn(@_); main($w); }
 sub ask_yesorno    { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Yes"), _("No")); main($w); }
-sub ask_okcancel   { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Is it ok?"), _("Ok"), _("Cancel")); main($w); }
+sub ask_okcancel   { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Is this correct?"), _("Ok"), _("Cancel")); main($w); }
 sub ask_from_entry { my $w = my_gtk->new(shift @_); $w->_ask_from_entry(@_); main($w); }
 sub ask_from_list  { my $w = my_gtk->new(shift @_); $w->_ask_from_list(@_); main($w); }
 sub ask_file       { my $w = my_gtk->new(''); $w->_ask_file(@_); main($w); }