correction after bug-report from Arnaud

1 files changed, 8 insertions, 8 deletions

diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 0bee21ce..d7870129 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -42,7 +42,7 @@ my $o = {
 		 wiz_ftp_resume => '',
 		 wiz_ftp_fxp => '',
 		},
-	 needed_rpm => [ 'proftpd', 'proftpd-anonymous' ],
+	 needed_rpm => [ 'proftpd' ],
 	 defaultimage => "$ENV{__WIZ_HOME__}ftp_wizard/images/FTP.png"
 	};
 
@@ -75,7 +75,7 @@ $o->{pages} = {
 			   next => 'config'
 			  },
 	       config => {
-			  name => N("FTP Server") . "\n\n" . N("Your server can act as an FTP Server toward your internal network (intranet) and as an FTP Server for the Internet.") . "\n\n" . N("Select the kind of FTP service you want to activate:") . "\n\n" . N("Don't check any box if you don't want to activate your FTP Server."),
+			  name => N("FTP Server") . "\n\n" . N("Your server can act as an FTP Server toward your internal network (intranet) and as an FTP Server for the Internet.") . "\n\n" . N("Select the kind of FTP service you want to activate:"),
 			  pre => sub {
 			    $o->{var}{wiz_ftp_internal} ||= 1;
 			    $o->{var}{wiz_ftp_external} ||= 0;
@@ -95,16 +95,16 @@ $o->{pages} = {
 			     $o->{var}{wiz_ftp_fxp} ||= 0;
 			   },
 			   data => [
-				    { label => N("Admin email"), val => \$o->{var}{wiz_server_admin} },
-				    { label => N("Permit root Login"), type => 'bool', val => \$o->{var}{wiz_root_login} },
-				    { label => N("Chroot Home user"), type => 'bool', val => \$o->{var}{wiz_default_root} },
-				    { label => N("Allow FTP resume"), type => 'bool', val => \$o->{var}{wiz_ftp_resume} },
-				    { label => N("Allow FXP"), type => 'bool', val => \$o->{var}{wiz_ftp_fxp} },
+				    { label => N("Admin email:"), val => \$o->{var}{wiz_server_admin} },
+				    { label => N("Permit root Login:"), type => 'bool', val => \$o->{var}{wiz_root_login} },
+				    { label => N("Chroot Home user:"), type => 'bool', val => \$o->{var}{wiz_default_root} },
+				    { label => N("Allow FTP resume:"), type => 'bool', val => \$o->{var}{wiz_ftp_resume} },
+				    { label => N("Allow FXP:"), type => 'bool', val => \$o->{var}{wiz_ftp_fxp} },
 				   ],
 			   next => 'summary',
 			  },
 	      warning_dhcp => {
-		name => N("Warning.") . "\n\n" . N("Warning\nYou are in dhcp, server may not work with your configuration."),
+		name => N("Warning.") . "\n\n" . N("You are in dhcp, server may not work with your configuration."),
 		ignore => 1,
 	        next => 'config'
 	      },