english fixes thx to vincent meyer

6 files changed, 19 insertions, 17 deletions

diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 515b95395..e4593dfc4 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -197,7 +197,7 @@ static enum return_type try_with_device(char *dev_name)
 		return RETURN_ERROR;
 	}
 
-	results = ask_from_list_comments_auto("Please choose the partition where is copied the " DISTRIB_NAME " Distribution.",
+	results = ask_from_list_comments_auto("Please choose the partition where " DISTRIB_NAME " is copied.",
 					      parts, parts_comments, &choice, "partition", parts);
 	if (results != RETURN_OK)
 		return results;
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index c47657fff..3d3107ddf 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -384,7 +384,7 @@ static enum return_type setup_network_interface(struct interface_info * intf)
 		static char ** answers = NULL;
 		struct in_addr addr;
 
-		results = ask_from_entries_auto("Please enter the network information. (leave netmask void for Internet standard)",
+		results = ask_from_entries_auto("Please enter the network information. (leave netmask blank for Internet standard)",
 						questions, &answers, 16, questions_auto, static_ip_callback);
 		if (results != RETURN_OK)
 			return setup_network_interface(intf);
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 4370ebe1d..2c58a19a6 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -408,8 +408,8 @@ int main(int argc, char **argv, char **env)
 
 	if (IS_RESCUE && total_memory() < MEM_LIMIT_RESCUE) {
 		stg1_error_message("You are starting the rescue with a low memory configuration. "
-				   "From that point, experience showed us that the program may stop "
-				   "or crash at any point without immediate proper reason. Continue at "
+				   "Our experience shows that your system may crash at any point "
+				   "or lock up for no apparent reason. Continue at "
 				   "your own risk. Alternatively, you may reboot your system now.");
 	}
 
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7ca57f578..dd06a1f4f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -728,7 +728,7 @@ not cause any damage.", $l),
 	} else {
 	    @options = split ' ',
 	      $in->ask_from_entry('',
-_("You may now provide its options to module %s.
+_("You may now provide options to module %s.
 Options are in format ``name=value name2=value2 ...''.
 For instance, ``io=0x300 irq=7''", $l),
 				 _("Module options:"),
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index d9782f4ea..5bebf5c84 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -145,7 +145,7 @@ sub selectLanguage {
     $o->SUPER::selectLanguage;
   
     $o->ask_warn('',
-_("Your system is low on resource. You may have some problem installing
+_("Your system is low on resources. You may have some problem installing
 Mandrake Linux. If that occurs, you can try a text install instead. For this,
 press `F1' when booting on CDROM, then enter `text'.")) if $first_time && availableRamMB() < 60; # 60MB
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index bf9dbbafd..bf1c3c466 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -89,7 +89,7 @@ sub selectLanguage {
 
     if ($o->isa('interactive_gtk')) {
 	$o->ask_warn('', formatAlaTeX(
-"If you see this message it is because you choose a language for
+"If you see this message it is because you chose a language for
 which DrakX does not include a translation yet; however the fact
 that it is listed means there is some support for it anyway.
 
@@ -116,7 +116,7 @@ system and the different components of the Mandrake Linux distribution.
 
 1. License Agreement
 
-Please read carefully this document. This document is a license agreement between you and  
+Please read this document carefully. This document is a license agreement between you and  
 MandrakeSoft S.A. which applies to the Software Products.
 By installing, duplicating or using the Software Products in any manner, you explicitly 
 accept and fully agree to conform to the terms and conditions of this License. 
@@ -355,8 +355,8 @@ sub doPartitionDisks {
 	$warned = 1;
 	if ($o->ask_yesorno(_("Error"), 
 _("I can't read your partition table, it's too corrupted for me :(
-I can try to go on blanking bad partitions (ALL DATA will be lost!).
-The other solution is to disallow DrakX to modify the partition table.
+I can try to go on, erasing over bad partitions (ALL DATA will be lost!).
+The other solution is to not allow DrakX to modify the partition table.
 (the error is %s)
 
 Do you agree to loose all the partitions?
@@ -464,7 +464,7 @@ sub formatMountPartitions {
 		_("Creating and formatting file %s", $part->{loopback_file}) :
 		_("Formatting partition %s", $part->{device}));
     });
-    die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;
+    die _("Not enough swap space to fulfill installation, please add some") if availableMemory < 40 * 1024;
 }
 
 #------------------------------------------------------------------------------
@@ -493,7 +493,7 @@ sub choosePackages {
     require pkgs;
 
     my $min_size = pkgs::selectedSize($packages);
-    $min_size < $availableC or die _("Your system has not enough space left for installation or upgrade (%d > %d)", $min_size, $availableC);
+    $min_size < $availableC or die _("Your system does not have enough space left for installation or upgrade (%d > %d)", $min_size, $availableC);
 
     my $min_mark = $::expert ? 3 : 4;
     my $def_mark = 4; #-TODO: was 59, 59 is for packages that need gl hw acceleration.
@@ -841,7 +841,7 @@ sub configureNetwork {
 #------------------------------------------------------------------------------
 sub installCrypto {
     my $license =
-_("You have now the possibility to download software aimed for encryption.
+_("You now have the opportunity to download encryption software.
 
 WARNING:
 
@@ -879,11 +879,13 @@ sub installUpdates {
     $o->hasNetwork or return;
 
     is_empty_hash_ref($u) and $o->ask_yesorno('', 
-formatAlaTeX(_("You have now the possibility to download updated packages that have
-been released after the distribution has been made available.
+formatAlaTeX(
+_("You now have the opportunity to download updated packages. These packages
+have been released after the distribution was released. They may
+contain security or bug fixes.
 
-You will get security fixes or bug fixes, but you need to have an
-Internet connection configured to proceed.
+To download these packages, you will need to have a working Internet 
+connection.
 
 Do you want to install the updates ?"))) || return;