fixed various strings to proper English

8 files changed, 14 insertions, 14 deletions

diff --git a/common/Wizcommon.pm b/common/Wizcommon.pm
index 9e8722b1..3a6067c3 100644
--- a/common/Wizcommon.pm
+++ b/common/Wizcommon.pm
@@ -84,7 +84,7 @@ sub gtktext_get_log {
 			      });
   sub {
       if ($pid) {
-	  $::in->ask_yesorno('', N("The command is still running. Do you want to kill it and quit the Wizard ?")) or return;
+	  $::in->ask_yesorno('', N("The command is still running. Do you want to kill it and quit the Wizard?")) or return;
 	  kill 9, $pid+1;
 	  1;
       }
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index ee6a9bfb..a2ef0f66 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -112,7 +112,7 @@ $o->{pages} = {
 				next => 'config',
 			       },
 	       error_shell => {
-			       name => N("I can't find bash in list of shells! It seems you have modified it by hand ! Please correct."),
+			       name => N("I can't find bash in list of shells! It seems you have modified it by hand! Please correct."),
 			       no_back => 1,
 			       end => 1,
 			       next => 0,
@@ -188,7 +188,7 @@ sub check_dir {
 
 sub get_dir {
     my $file = "/etc/proftpd.conf";
-    die "no FTP configuration file found ! warning." if !-f $file;
+    die "no FTP configuration file found! warning." if !-f $file;
     local *NEW;
     open(NEW, "< $file") or die "error while opening $file: $!";
 
@@ -254,7 +254,7 @@ sub do_it {
     my $wiz_ftp_internal = $o->{var}{wiz_ftp_external} ? 1 : true $o->{var}{wiz_ftp_internal};
     my $wiz_ftp_external = true $o->{var}{wiz_ftp_external};
     my $file = "/etc/proftpd.conf";
-    die "no FTP configuration file found ! warning." if !-f $file;
+    die "no FTP configuration file found! warning." if !-f $file;
     MDK::Common::cp_af($file, $file . ".orig");
     my $allow;
     if ($wiz_ftp_internal && !$wiz_ftp_external) {
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index c95c2f21..78bfc547 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -55,7 +55,7 @@ $o->{pages} = {
 			   next => 'install_srv',
 			  },
 	       install_srv => {
-			       name => N("Install server configuration") . "\n\n" . N("Path to data: specify your source directory, should be base of an Mandrake installation.") . "\n\n" . N("Destination directory: copy file in which directory ?"),
+			       name => N("Install server configuration") . "\n\n" . N("Path to data: specify your source directory, should be base of an Mandrake installation.") . "\n\n" . N("Destination directory: copy file in which directory?"),
 			       pre => sub {
 				 $o->{var}{wiz_nfs} ||= 1;
 				 $o->{var}{wiz_http} ||= 1;
diff --git a/ldap_wizard/ldap.pm b/ldap_wizard/ldap.pm
index 63b8a886..fffe3427 100644
--- a/ldap_wizard/ldap.pm
+++ b/ldap_wizard/ldap.pm
@@ -180,7 +180,7 @@ $o->{pages} = {
 
                           },
                summary_add_user => {
-                                    name =>  N("Confirmation de l'utilisateur a creer"),
+                                    name =>  N("Confirmation of the user to create"),
                                     data => [
                                              {
                                               label => N("Name:"), type => 'field', fixed_val => \$o->{var}{sn} },
@@ -195,7 +195,7 @@ $o->{pages} = {
                                     next => 'endadd'
                                    },
                summary_set_srv => {
-                                   name =>  N("Confirmation de l'utilisateur a creer"),
+                                   name =>  N("Confirmation of the user to create"),
                                    data => [
                                             {
                                              label => N("LDAP Suffix:"), type => 'field', val => $o->{var}{suffix} },
diff --git a/nfs_wizard/NFS.pm b/nfs_wizard/NFS.pm
index bd4072f5..7f5d8130 100755
--- a/nfs_wizard/NFS.pm
+++ b/nfs_wizard/NFS.pm
@@ -92,8 +92,8 @@ $o->{pages} = {
       },
       data => [
             { label => N("Exported dir:"), fixed_val => \$o->{var}{wiz_nfs_dir} },
-            { label => N("Access :"), fixed_val => \$o->{var}{wiz_text_level} },
-            { label => N("Netmask :"), fixed_val => \$o->{var}{wiz_netmask} },
+            { label => N("Access:"), fixed_val => \$o->{var}{wiz_text_level} },
+            { label => N("Netmask:"), fixed_val => \$o->{var}{wiz_netmask} },
         ],
       post => \&do_it,
       next => 'end'
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index 13f3c5e0..6b27c171 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -82,7 +82,7 @@ $o->{pages} = {
 			   }
 				       },
 			   data => [
-				    { label => N("What do you want to do ?"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
+				    { label => N("What do you want to do?"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
 				   ],
 			   next => 'nis_server',
 			  },
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index 0de973d6..ffc36904 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -111,7 +111,7 @@ $o->{pages} = {
         },
         post => sub { return 'ask_netmask' if $o->{var}{wiz_level} == 2 },
         data => [
-            { label => N("Access level :"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
+            { label => N("Access level:"), val => \$o->{var}{wiz_level}, list => [ keys %level ], format => sub { $level{$_[0]} } },
             ],
         next => 'ask_services'
     },
@@ -172,7 +172,7 @@ $o->{pages} = {
         next => 'ask_dir'
     },
     ask_access => {
-        name => N("File permissions") . "\n\n" . N("Type users or group separated by a comma (groups must be preceded by a '\@') like this :\nroot, fred, \@users, \@wheel for each kind of permission.") . "\n\n",
+        name => N("File permissions") . "\n\n" . N("Type users or group separated by a comma (groups must be preceded by a '\@') like this:\nroot, fred, \@users, \@wheel for each kind of permission.") . "\n\n",
         pre => sub {
       	$o->{var}{wiz_read_list} ||= get_read();
       	$o->{var}{wiz_write_list} ||= get_write()
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index ae58661e..c1ea415d 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -87,7 +87,7 @@ $o->{pages} = {
 	    next => 'config'
 	  },
 	  ask_mod => {
-	      name => N("Modules :") . "\n\n" . N("* User module : allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward."),
+	      name => N("Modules:") . "\n\n" . N("* User module: allows users to have a directory in their home directories available on your http server via http://www.yourserver.com/~user, you will be asked for the name of this directory afterward."),
 	      pre => sub { $o->{var}{user_mod} = is_last_user_mod() },
 	      data => [
 		  { text => join("\n", warp_text(N("Allows users to get a directory in their homes directories 
@@ -100,7 +100,7 @@ available on your http server via http://www.yourserver.com/~user."), 70)), type
 	      name => N("Type the name of the directory users should create in their homes (without ~/) to get it available via http://www.yourserver.com/~user"),
 	      pre => sub { $o->{var}{user_dir} ||= 'public_html' },
 	      data => [
-		  { label => N("user http sub-directory : ~/"), help => N("Type the name of the directory users should create in their homes (without ~/) to get it available via http://www.yourserver.com/~user"), val => \$o->{var}{user_dir} },
+		  { label => N("user http sub-directory: ~/"), help => N("Type the name of the directory users should create in their homes (without ~/) to get it available via http://www.yourserver.com/~user"), val => \$o->{var}{user_dir} },
 		  ],
 	      next => 'ask_dir'
 	  },