- add a third NTP server server

- fix layout of various wizards
- remove sambaprint wizard (user should now use draksambashare)
- fix ftp default port to 21
- disable kolab and inn wizards (don't know how to use/fix them, help
  welcome)

1 files changed, 3 insertions, 3 deletions

diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index ad35c822..1a2da921 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -104,7 +104,7 @@ $o->{pages} = {
 			       # detect old Samba type
 			       my ($old_type) = $data =~ /type=(\d)/;
 			       $o->{var}{wiz_type} = chomp_($old_type);
-			     } else { $o->{var}{wiz_type} = 2 }
+			     } else { $o->{var}{wiz_type} = 3 }
 			   },
 			   post => sub {
                              if ($o->{var}{wiz_type} == 2) {
@@ -320,7 +320,7 @@ $o->{pages} = {
 			      next => 'ask_log',
 			     },
 	       ask_log => {
-			   name => N("Samba Log") . "\n\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."),
+			   name => N("Samba Log") . "\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."),
 			   pre => sub {
 			     $o->{var}{wiz_log_file} ||= $samba->{global}{'log file'};
 			     $o->{var}{wiz_log_level} ||= $samba->{global}{'log level'};
@@ -334,7 +334,7 @@ $o->{pages} = {
 			   next => 'summary',
 			  },
 	       summary => {
-			   name =>  N("Configuring Samba") . "\n\n" . N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."),
+			   name =>  N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."),
 			   pre => sub {
 			     $o->{var}{wiz_sambatype} = $type{$o->{var}{wiz_type}};
 			   },