better english (writing style rather than spoken one)

10 files changed, 26 insertions, 26 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 49850d1fa..a29f80cdd 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -35,7 +35,7 @@ sub get_wizard {
                        name => N("Connect to the Internet") . "\n\n" .
                        N("The most common way to connect with adsl is pppoe.
 Some connections use PPTP, a few use DHCP.
-If you don't know, choose 'use PPPoE'"),
+If you do not know, choose 'use PPPoE'"),
                        data =>  [
                                  {
                                   label => N("ADSL connection type:"), val => \$wiz->{var}{adsl}{type}, list => [ sort values %l ] },
@@ -151,7 +151,7 @@ sync
                   speedtouch =>
                   {
                    modules => [ qw(speedtch) ],
-                   #- won't call pppd since we've just written ONBOOT=no, only runs modem_run
+                   #- will not call pppd since we've just written ONBOOT=no, only runs modem_run
                    start => '/usr/bin/speedtouch-start --boot',
                    overide_script => 1,
                    server => {
@@ -331,7 +331,7 @@ user "$adsl->{login}"
                     s/DNS2=.*\n/DNS2=$netc->{dnsServer3}\n/;
                 } "$::prefix/etc/ppp/pppoe.conf";
             } else {
-                log::l("can't find pppoe.conf, make sure the rp-pppoe package is installed");
+                log::l("can not find pppoe.conf, make sure the rp-pppoe package is installed");
             }
         }
 
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 13e61f9f4..ec037fff2 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -131,7 +131,7 @@ sub configure_eth_aliases {
     my @pcmcia = detect_devices::pcmcia_probe();
     foreach my $card (get_eth_cards($modules_conf)) {
         if (any { $_->{device} eq $card->[0] } @pcmcia) {
-            #- don't write aliases for pcmcia cards, or cardmgr won't be loaded
+            #- do not write aliases for pcmcia cards, or cardmgr will not be loaded
             $modules_conf->remove_alias($card->[0]);
         } else {
             $modules_conf->set_alias($card->[0], $card->[1]);
diff --git a/perl-install/network/ipsec.pm b/perl-install/network/ipsec.pm
index bc6706c50..c0ee6e2fb 100644
--- a/perl-install/network/ipsec.pm
+++ b/perl-install/network/ipsec.pm
@@ -373,7 +373,7 @@ sub write_racoon_conf {
 		}
 	}
 
-open(my $ADD, "> $racoon_conf") or die "Can't open the $racoon_conf file for writing";
+open(my $ADD, "> $racoon_conf") or die "Can not open the $racoon_conf file for writing";
 	print $ADD "$display\n";
 
 }
@@ -509,7 +509,7 @@ sub read_ipsec_conf {
 	local $_;
 	if ($kernel_version < 2.5) {
 	#- kernel 2.4 part -------------------------------
-		open(my $LIST, "< $ipsec_conf"); #or die "Can't open the $ipsec_conf file for reading";
+		open(my $LIST, "< $ipsec_conf"); #or die "Can not open the $ipsec_conf file for reading";
 		while (<$LIST>) {
         		chomp($_);
 				$line = $_;
@@ -551,7 +551,7 @@ sub read_ipsec_conf {
 	#- kernel 2.6 part -------------------------------
 		my @mylist;
 		my $myline = "";
-		open(my $LIST, "< $ipsec_conf"); #or die "Can't open the $ipsec_conf file for reading";
+		open(my $LIST, "< $ipsec_conf"); #or die "Can not open the $ipsec_conf file for reading";
 			while (<$LIST>) {
 		        	chomp($_);
 				$myline = $_;
@@ -591,7 +591,7 @@ sub write_ipsec_conf {
     my ($ipsec_conf, $ipsec, $kernel_version) = @_;
 	if ($kernel_version < 2.5) {
 	#- kernel 2.4 part -------------------------------
-		open(my $ADD, "> $ipsec_conf") or die "Can't open the $ipsec_conf file for writing";
+		open(my $ADD, "> $ipsec_conf") or die "Can not open the $ipsec_conf file for writing";
 			foreach my $key1 (ikeys %$ipsec) {
 				print $ADD "$ipsec->{$key1}\n" if ! $ipsec->{$key1}{1};
 				foreach my $key2 (ikeys %{$ipsec->{$key1}}) {
@@ -624,7 +624,7 @@ sub write_ipsec_conf {
 						$ipsec->{$key1}{level} . ";\n"
 			}; 
 		}
-		open(my $ADD, "> $ipsec_conf") or die "Can't open the $ipsec_conf file for writing";
+		open(my $ADD, "> $ipsec_conf") or die "Can not open the $ipsec_conf file for writing";
 			print $ADD $display;
 		}
 }
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index b1439bbf7..f631c5c49 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -165,7 +165,7 @@ sub get_cards_by_type {
 
 sub get_cards() {
     my %buses = (
-                 isa => N("ISA / PCMCIA") . "/" . N("I don't know"),
+                 isa => N("ISA / PCMCIA") . "/" . N("I do not know"),
                  pci => N("PCI"),
                  usb => N("USB"),
                 );
@@ -191,7 +191,7 @@ sub get_capi_card {
 
     #- check if the capi driver is available
     unless (is_module_installed($capi_card->{driver}) || ($capi_card->{packages} = $in->do_pkgs->check_kernel_module_packages("$capi_card->{driver}-kernel"))) {
-        log::explanations("a capi driver ($capi_card->{driver}) exists to replace $isdn->{driver}, but it isn't installed and no packages provide it");
+        log::explanations("a capi driver ($capi_card->{driver}) exists to replace $isdn->{driver}, but it is not installed and no packages provide it");
         return;
     }
 
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 18755d0cb..871019159 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -73,7 +73,7 @@ sub ppp_configure {
         $dev =~ s!^/dev/!!;
         any::devfssymlinkf({ device => $dev }, 'modem');
         #- add a specific udev script in addition to the udev rules file
-        #- (ttySL0 is a symlink, udev won't be called when it's created)
+        #- (ttySL0 is a symlink, udev will not be called when it's created)
         my $udev_conf = "$::prefix/etc/udev/conf.d/modem.conf";
         output_p($udev_conf, "ln -sf $dev /dev/modem\n");
         chmod 0755, $udev_conf;
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 5d2df0a9f..54afc5add 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -342,7 +342,7 @@ sub real_main {
                             $netcnx->{isdn_external}{device} = network::modem::first_modem($netc);
                             network::isdn::read_config($netcnx->{isdn_external});
                             #- FIXME: seems to be specific to ZyXEL Adapter Omni.net/TA 128/Elite 2846i
-                            #- it doesn't even work with TA 128 modems
+                            #- it does not even work with TA 128 modems
                             #- http://bugs.mandrakelinux.com/query.php?bug=1033
                             $netcnx->{isdn_external}{special_command} = 'AT&F&O2B40';
                             require network::modem;
@@ -385,7 +385,7 @@ sub real_main {
                       isdn_ask_step_1:
                         my $e = $in->ask_from_list_(N("ISDN Configuration"),
                                                     $label . "\n" . N("What kind of card do you have?"),
-                                                    [ N_("ISA / PCMCIA"), N_("PCI"), N_("USB"), N_("I don't know") ]
+                                                    [ N_("ISA / PCMCIA"), N_("PCI"), N_("USB"), N_("I do not know") ]
                                                    ) or return;
                       isdn_ask_step_1b:
                         if ($e =~ /PCI/) {
@@ -450,7 +450,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
 
                    isdn_db =>
                    {
-                    name => N("ISDN Configuration") . "\n\n" . N("Select your provider.\nIf it isn't listed, choose Unlisted."),
+                    name => N("ISDN Configuration") . "\n\n" . N("Select your provider.\nIf it is not listed, choose Unlisted."),
                     data => sub {
                         [ { label => N("Provider:"), type => "list", val => \$provider, separator => '|',
                             list => [ N("Unlisted - edit manually"), network::isdn::read_providers_backend() ] } ];
@@ -467,7 +467,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
 
                    no_supported_winmodem =>
                    {
-                    name => N("Warning") . "\n\n" . N("Your modem isn't supported by the system.
+                    name => N("Warning") . "\n\n" . N("Your modem is not supported by the system.
 Take a look at http://www.linmodems.org"),
                     end => 1,
                    },
@@ -803,7 +803,7 @@ and copy the mgmt.o in /usr/share/speedtouch", 'http://prdownloads.sourceforge.n
                     name => N("Connect to the Internet") . "\n\n" .
                     N("The most common way to connect with adsl is pppoe.
 Some connections use PPTP, a few use DHCP.
-If you don't know, choose 'use PPPoE'"),
+If you do not know, choose 'use PPPoE'"),
                     data =>  [
                               { text => N("ADSL connection type:"), val => \$adsl_type, type => "list",
                                 list => [ sort { $adsl_types{$a} cmp $adsl_types{$b} } keys %adsl_types ],
@@ -1129,7 +1129,7 @@ See iwpriv(8) man page for further information."),
                                                         "ENABLE_$ethntf->{DEVICE}" => "y"
                                                        });
                                 my $wlan_ssid_file = "$::prefix/etc/wlan/wlancfg-$ethntf->{WIRELESS_ESSID}";
-                                #- copy default settings for this ESSID if config file doesn't exist
+                                #- copy default settings for this ESSID if config file does not exist
                                 -f $wlan_ssid_file or cp_f("$::prefix/etc/wlan/wlancfg-DEFAULT", $wlan_ssid_file);
                                 #- enable/disable encryption
                                 $update_vars_in_wlan->($wlan_ssid_file,
@@ -1327,7 +1327,7 @@ It is not necessary on most networks."),
                     name => sub {
                         $up ? N("The system is now connected to the Internet.") .
                           if_($::isInstall, N("For security reasons, it will be disconnected now.")) :
-                            N("The system doesn't seem to be connected to the Internet.
+                            N("The system does not seem to be connected to the Internet.
 Try to reconfigure your connection.");
                     },
                     no_back => 1,
@@ -1346,7 +1346,7 @@ Try to reconfigure your connection.");
 "), if_($::isStandalone && $in->isa('interactive::gtk'),
         N("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."))) : 
           N("Problems occurred during configuration.
-Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration.");
+Test your connection via net_monitor or mcc. If your connection does not work, you might want to relaunch the configuration.");
                     },
                            end => 1,
                    },
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index febaa632d..ed5fa646d 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -461,7 +461,7 @@ sub configureNetwork2 {
         } else {
             #- disable zeroconf
             require services;
-            #- write blank hostname so that drakconnect doesn't assume zeroconf is enabled
+            #- write blank hostname so that drakconnect does not assume zeroconf is enabled
             -f "$etc/tmdns.conf" and write_zeroconf("$etc/tmdns.conf", '');
             if (-f "$etc/rc.d/init.d/tmdns") {
                 services::stop("tmdns");
diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index 57eba8234..af201fe68 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -157,7 +157,7 @@ sub write_smb_conf {
     my ($domain) = @_;
 
     #- was going to just have a canned config in samba-winbind
-    #- and replace the domain, but sylvestre/buchan didn't bless it yet
+    #- and replace the domain, but sylvestre/buchan did not bless it yet
 
     my $f = "$::prefix/etc/samba/smb.conf";
     rename $f, "$f.orig";
@@ -188,7 +188,7 @@ sub write_smb_ads_conf {
     my ($domain, $realm) = @_;
 
     #- was going to just have a canned config in samba-winbind
-    #- and replace the domain, but sylvestre/buchan didn't bless it yet
+    #- and replace the domain, but sylvestre/buchan did not bless it yet
 
     my $f = "$::prefix/etc/samba/smb.conf";
     rename $f, "$f.orig";
diff --git a/perl-install/network/test.pm b/perl-install/network/test.pm
index 7c25fce05..cc043b19c 100644
--- a/perl-install/network/test.pm
+++ b/perl-install/network/test.pm
@@ -19,7 +19,7 @@ sub test_synchronous {
     $o->{done} = 1;
 }
 
-#- launch asynchronous test, won't hang
+#- launch asynchronous test, will not hang
 sub start {
     my ($o) = @_;
     $o->{done} = 0;
@@ -95,7 +95,7 @@ sub update_status {
     my ($o) = @_;
     if ($o->{kid}) {
         my $fd = $o->{kid}{fd};
-        fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can't fcntl F_SETFL: $!";
+        fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!";
         local $| = 1;
         if (defined(my $output = <$fd>)) {
             ($o->{address}, $o->{ping}) = $output =~ /^([\d\.]+)\|([\d\.,]+)*$/;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 8167c9cee..e82afd16f 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -110,7 +110,7 @@ sub connected_bg__raw {
     local $| = 1;
     if (ref($kid_pipe) && ref($$kid_pipe)) {
 	my $fd = $$kid_pipe->{fd};
-	fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can't fcntl F_SETFL: $!";
+	fcntl($fd, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!";
 	my $a  = <$fd>;
      $$status = $a if defined $a;
     } else { $$kid_pipe = check_link_beat() }