From 4b9d142bd37dcdc94b7bcdbdb3f7109d7a915e25 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 13 Dec 2004 15:56:00 +0000
Subject: better english (writing style rather than spoken one)

---
 perl-install/Xconfig/card.pm  | 8 ++++----
 perl-install/Xconfig/parse.pm | 2 +-
 perl-install/Xconfig/xfree.pm | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'perl-install/Xconfig')

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 86b9d42bd..1c0e36715 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -166,7 +166,7 @@ sub card_config__not_listed {
 
     log::l("Xconfig::card: $r manually chosen");
 
-    $r eq "Vendor|$card->{BoardName}" and return 1; #- it is unchanged, don't modify $card
+    $r eq "Vendor|$card->{BoardName}" and return 1; #- it is unchanged, do not modify $card
 
     my ($kind, $s) = $r =~ /(.*?)\|(.*)/;
 
@@ -205,7 +205,7 @@ sub configure_auto_install {
 	if ($card->{card_name}) {
 	    #- try to get info from given card_name
 	    add_to_card__using_Cards($card, $card->{card_name});
-	    undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can't find the driver
+	    undef $card->{card_name} if !$card->{Driver}; #- bad card_name as we can not find the driver
 	}
 	return if $card->{Driver};
     }
@@ -256,7 +256,7 @@ sub configure {
 
     eval { install_server($card, $options, $do_pkgs) };
     if ($@) {
-	$in->ask_warn('', N("Can't install Xorg package: %s", $@));
+	$in->ask_warn('', N("Can not install Xorg package: %s", $@));
 	goto card_config__not_listed;
     }
     
@@ -424,7 +424,7 @@ sub set_glx_restrictions {
     my ($card) = @_;
 
     #- 3D acceleration configuration for XFree 4 using DRI, this is enabled by default
-    #- but for some there is a need to specify VideoRam (else it won't run).
+    #- but for some there is a need to specify VideoRam (else it will not run).
     if ($card->{use_DRI_GLX}) {
 	$card->{needVideoRam} = 1 if $card->{description} =~ /Matrox.* G[245][05]0/;
 	($card->{needVideoRam}, $card->{VideoRam}) = (1, 16384)
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
index ab2838b43..d8c8057c6 100644
--- a/perl-install/Xconfig/parse.pm
+++ b/perl-install/Xconfig/parse.pm
@@ -44,7 +44,7 @@ sub raw_from_file { #- internal
     my ($comment, $obj, @objs);
 
     my $attach_comment = sub {
-	$obj || @objs or warn "$file:$line: can't attach comment\n";
+	$obj || @objs or warn "$file:$line: can not attach comment\n";
 	if ($comment) {
 	    $comment =~ s/\n+$/\n/;
 	    ($obj || $objs[0])->{$_[0] . '_comment'} = $comment;
diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm
index ba2c2cedf..a29713269 100644
--- a/perl-install/Xconfig/xfree.pm
+++ b/perl-install/Xconfig/xfree.pm
@@ -35,7 +35,7 @@ sub write {
 	    if (-l $_) {
 		unlink $_;
 	    } else {
-		rename $_, "$_.old"; #- there won't be any XF86Config-4 anymore, we want this!
+		rename $_, "$_.old"; #- there will not be any XF86Config-4 anymore, we want this!
 	    }
 	}
 	symlinkf 'XF86Config', $xorg;
@@ -508,7 +508,7 @@ EndSection
 Section "ServerFlags"
     #DontZap # disable <Crtl><Alt><BS> (server abort)
     #DontZoom # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
-    AllowMouseOpenFail # allows the server to start up even if the mouse doesn't work
+    AllowMouseOpenFail # allows the server to start up even if the mouse does not work
 EndSection
 END
 
-- 
cgit v1.2.1